From d784906ea03875bd6aed22a2bfa6d8e65f90c851 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Fri, 3 Apr 2015 14:49:11 +0200
Subject: [PATCH 001/159] Translation index.php et dependencies

---
 directory.php                        |  20 +++
 index.php                            | 124 +++++++++---------
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 2682 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 181 +++++++++++++++++++++++++++
 resource.php                         |   2 +-
 setuser.php                          |   2 +-
 templates/header.php                 |  12 +-
 user.php                             |   2 +-
 8 files changed, 272 insertions(+), 71 deletions(-)
 create mode 100644 locale/fr_FR/LC_MESSAGES/messages.mo
 create mode 100644 locale/fr_FR/LC_MESSAGES/messages.po

diff --git a/directory.php b/directory.php
index 7fa5363..288598f 100644
--- a/directory.php
+++ b/directory.php
@@ -162,4 +162,24 @@ function debug($value) {
   echo '<pre>'.print_r($value, true).'</pre>';
 }
 
+    // Verify the language of the browser
+
+    $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+
+    switch ($http_lang) {
+        case 'fr': 
+            $language = "fr_FR.utf8"; 
+        break;	
+        case 'en': 
+            $language = "en_US.utf8"; 
+        break;			
+        default: 
+            $language = "en_US.utf8"; 
+        break;
+    }
+    putenv("LC_ALL=$language");
+	setlocale(LC_ALL, $language);
+	bindtextdomain("messages", "./locale");
+	textdomain("messages");
+
 ?>
diff --git a/index.php b/index.php
index ddf11d8..88af542 100644
--- a/index.php
+++ b/index.php
@@ -55,8 +55,8 @@
     
 	<table class='noBorder'>
 	<tr><td style='text-align:left;width:75px;' align='left'>
-	<span style='font-size:130%;font-weight:bold;'>Search</span><br />
-	<a href='javascript:void(0)' class='newSearch'>new search</a>
+	<span style='font-size:130%;font-weight:bold;'><?= _("Search");?></span><br />
+	<a href='javascript:void(0)' class='newSearch'><?= _("new search");?></a>
 	</td>
 	<td><div id='div_feedback'>&nbsp;</div>
 	</td></tr>
@@ -65,11 +65,11 @@
 	<table class='borderedFormTable' style="width:150px">
 
 	<tr>
-	<td class='searchRow'><label for='searchName'><b>Name (contains)</b></label>
+	<td class='searchRow'><label for='searchName'><b><?= _("Name (contains)");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('name', $search['name']); ?>
 	<br />
-	<div id='div_searchName' style='<?php if (!$search['name']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='go!' class='searchButton' /></div>
+	<div id='div_searchName' style='<?php if (!$search['name']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='<?= _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
@@ -80,27 +80,27 @@
 	<br />
 	<?php echo Html::text_search_field_tag('resourceISBNOrISSN', $search['resourceISBNOrISSN']); ?>
 	<br />
-	<div id='div_searchISBNOrISSN' style='<?php if (!$search['resourceISBNOrISSN']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='go!' class='searchButton' /></div>
+	<div id='div_searchISBNOrISSN' style='<?php if (!$search['resourceISBNOrISSN']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='<?= _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchFund'><b>Fund</b></label>
+	<td class='searchRow'><label for='searchFund'><b><?= _("Fund");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('fund', $search['fund']); ?><br />
-	<div id='div_searchFund' style='<?php if (!$search['fund']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchFund' value='go!' class='searchButton' /></div>
+	<div id='div_searchFund' style='<?php if (!$search['fund']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchFund' value='<?= _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAcquisitionTypeID'><b>Acquisition Type</b></label>
+	<td class='searchRow'><label for='searchAcquisitionTypeID'><b><?= _("Acquisition Type");?></b></label>
 	<br />
 	<select name='search[acquisitionTypeID]' id='searchAcquisitionTypeID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		$display = array();
@@ -120,10 +120,10 @@
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchStatusID'><b>Status</b></label>
+	<td class='searchRow'><label for='searchStatusID'><b><?= _("Status");?></b></label>
 	<br />
 	<select name='search[statusID]' id='searchStatusID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		$display = array();
@@ -151,10 +151,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchCreatorLoginID'><b>Creator</b></label>
+	<td class='searchRow'><label for='searchCreatorLoginID'><b><?= _("Creator");?></b></label>
 	<br />
 	<select name='search[creatorLoginID]' id='searchCreatorLoginID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 
 	<?php
 
@@ -183,10 +183,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceFormatID'><b>Resource Format</b></label>
+	<td class='searchRow'><label for='searchResourceFormatID'><b><?= _("Resource Format");?></b></label>
 	<br />
 	<select name='search[resourceFormatID]' id='searchResourceFormatID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		$display = array();
@@ -207,17 +207,17 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceTypeID'><b>Resource Type</b></label>
+	<td class='searchRow'><label for='searchResourceTypeID'><b><?= _("Resource Type");?></b></label>
 	<br />
 	<select name='search[resourceTypeID]' id='searchResourceTypeID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 
 	<?php
 
 		if ($search['resourceTypeID'] == "none"){
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 
@@ -239,26 +239,26 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceID'><b>Record ID</b></label>
+	<td class='searchRow'><label for='searchResourceID'><b><?= _("Record ID");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('resourceID', ''); ?>
 	<br />
-	<div id='div_searchID' style='<?php if (!$search['resourceID']) echo "display:none;"; ?>margin-left:123px;'><input type='button' value='go!' id='searchResourceIDButton' /></div>
+	<div id='div_searchID' style='<?php if (!$search['resourceID']) echo "display:none;"; ?>margin-left:123px;'><input type='button' value='<?= _("go!");?>' id='searchResourceIDButton' /></div>
 	</td>
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchGeneralSubjectID'><b>General Subject</b></label>
+	<td class='searchRow'><label for='searchGeneralSubjectID'><b><?= _("General Subject");?></b></label>
 	<br />
 	<select name='search[generalSubjectID]' id='searchGeneralSubjectID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 
 	<?php
 
 		if ($search['generalSubjectID'] == "none"){
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 
@@ -279,17 +279,17 @@
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchDetailedSubjectID'><b>Detailed Subject</b></label>
+	<td class='searchRow'><label for='searchDetailedSubjectID'><b><?= _("Detailed Subject");?></b></label>
 	<br />
 	<select name='search[detailedSubjectID]' id='searchDetailedSubjectID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 
 	<?php
 
 		if ($search['detailedSubjectID'] == "none"){
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 
@@ -310,7 +310,7 @@
 	</tr>
 	
 	<tr>
-	<td class='searchRow'><label for='searchFirstLetter'><b>Starts with</b></label>
+	<td class='searchRow'><label for='searchFirstLetter'><b><?= _("Starts with");?></b></label>
 	<br />
 	<?php
 	$resource = new Resource();
@@ -336,21 +336,21 @@
 
 	</table>
 
-	<div id='hideShowOptions'><a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'>more options...</a></div>
+	<div id='hideShowOptions'><a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'><?= _("more options...");?></a></div>
 	<div id='div_additionalSearch' style='display:none;'>
 	<table class='borderedFormTable' style="width:150px">
 
 	<tr>
-	<td class='searchRow'><label for='searchNoteTypeID'><b>Note Type</b></label>
+	<td class='searchRow'><label for='searchNoteTypeID'><b><?= _("Note Type");?></b></label>
 	<br />
 	<select name='search[noteTypeID]' id='searchNoteTypeID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		if ($search['noteTypeID'] == "none") {
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 		$display = array();
@@ -371,11 +371,11 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceNote'><b>Note (contains)</b></label>
+	<td class='searchRow'><label for='searchResourceNote'><b><?= _("Note (contains)");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('resourceNote', $search['resourceNote']); ?>
 	<br />
-	<div id='div_searchResourceNote' style='<?php if (!$search['resourceNote']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='go!' class='searchButton' /></div>
+	<div id='div_searchResourceNote' style='<?php if (!$search['resourceNote']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='<?= _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
@@ -383,32 +383,32 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='createDate'><b>Date Created Between</b></label><br />
+	<td class='searchRow'><label for='createDate'><b><?= _("Date Created Between");?></b></label><br />
 	  <?php echo Html::text_search_field_tag('createDateStart', $search['createDateStart'], array('class' => 'date-pick', 'width' => '65px')); ?>
-	&nbsp;&nbsp;<b>and</b>
+	&nbsp;&nbsp;<b><?= _("and");?></b>
 	</td>
 	</tr>
 	<tr>
 	<td style="border-top:0px;padding-top:0px;">
 	  <?php echo Html::text_search_field_tag('createDateEnd', $search['createDateEnd'], array('class' => 'date-pick', 'width' => '65px')); ?>
 	<br />
-	<div id='div_searchCreateDate' style='display:none;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='button' class='searchButton' value='go!' /></div>
+	<div id='div_searchCreateDate' style='display:none;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='button' class='searchButton' value='<?= _("go!");?>' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchPurchaseSiteID'><b>Purchase Site</b></label>
+	<td class='searchRow'><label for='searchPurchaseSiteID'><b><?= _("Purchase Site");?></b></label>
 	<br />
 	<select name='search[purchaseSiteID]' id='searchPurchaseSiteID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		if ($search['purchaseSiteID'] == "none"){
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 		$display = array();
@@ -431,16 +431,16 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAuthorizedSiteID'><b>Authorized Site</b></label>
+	<td class='searchRow'><label for='searchAuthorizedSiteID'><b><?= _("Authorized Site");?></b></label>
 	<br />
 	<select name='search[authorizedSiteID]' id='searchAuthorizedSiteID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		if ($search['authorizedSiteID'] == "none") {
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 		$display = array();
@@ -463,16 +463,16 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAdministeringSiteID'><b>Administering Site</b></label>
+	<td class='searchRow'><label for='searchAdministeringSiteID'><b><?= _("Administering Site");?></b></label>
 	<br />
 	<select name='search[administeringSiteID]' id='searchAdministeringSiteID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		if ($search['administeringSiteID'] == "none") {
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 		$display = array();
@@ -493,16 +493,16 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAuthenticationTypeID'><b>Authentication Type</b></label>
+	<td class='searchRow'><label for='searchAuthenticationTypeID'><b><?= _("Authentication Type");?></b></label>
 	<br />
 	<select name='search[authenticationTypeID]' id='searchAuthenticationTypeID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 
 		if ($search['authenticationTypeID'] == "none") {
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 
@@ -523,15 +523,15 @@
 	</tr>
 	
 	<tr>
-	<td class='searchRow'><label for='searchCatalogingStatusID'><b>Cataloging Status</b></label>
+	<td class='searchRow'><label for='searchCatalogingStatusID'><b><?= _("Cataloging Status");?></b></label>
 	<br />
 	<select name='search[catalogingStatusID]' id='searchCatalogingStatusID' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 	  if ($search['catalogingStatusID'] == "none") {
-			echo "<option value='none' selected>(none)</option>";
+			echo "<option value='none' selected>"._("(none)")."</option>";
 		}else{
-			echo "<option value='none'>(none)</option>";
+			echo "<option value='none'>"._("(none)")."</option>";
 		}
 
 		$catalogingStatus = new CatalogingStatus();
@@ -550,10 +550,10 @@
 	</tr>
   
   <tr>
-	<td class='searchRow'><label for='searchStepName'><b>Routing Step</b></label>
+	<td class='searchRow'><label for='searchStepName'><b><?= _("Routing Step");?></b></label>
 	<br />
 	<select name='search[stepName]' id='searchStepName' style='width:150px'>
-	<option value=''>All</option>
+	<option value=''><?= _("All");?></option>
 	<?php
 	  $step = new Step();
     $stepNames = $step->allStepNames();
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..a381d1af38f0e83d5b5eb3b1c20a377e38600cd0
GIT binary patch
literal 2682
zcmai!O^g&p6vs<N(G~na5x;rs7rW8!nMF_-gs{xAu*tFxyX(qLite{F1wB<mb@eU~
z;sFz{p47y|aPXjOA_tGgn3yp!9=v0W9zE#6#G@Dezn+<$1rn`H&9Ce0)%&XV>$Xkr
zE3_BTpG2R%O{u-$<=gRx*0@8dyTFs+1K=s}PSAkcKnLQduHf$>@LlkJ@FVa+@N;l8
z_%--2_#G&6egZdvzk{;>Pf+&#)1Tjr#T4T$U;xj9cZ0uy<$iFB><2}UEl^74cY^nT
z6>uxKzdt_KUq9KO*PxttpxAdAycc|@KYkCC`#u1nlDgXGC;jzLLAmc5I0AkH{s`aw
z0E!(S;!pIt3f>2P2|faT3qoae9Tfe3>979*%KpDW(SIv0-vRCb#a|T=qSawg?wtl@
z-x7!;>NM!U7Wg)J9mG$)iA{3<X|RkJ_&CN_K#}t?D1P{&&#yp<<M*KG`!gtU{0kI4
zHo;hYs_mfYzY`RDB2e_(4NB_l1Lgh$pxi$NirfWI^k{-`m)eOgat2Lwq5eSh8#Iw2
za>Z7O$HpdlJ=dR*J4Em8=n_w{Rq|Sz==UhP+%HYy{tWuF=ue|d6P=$zms}OQB?i)-
zN0&D;Xiwln?1mZYG4xS%@rxR>&hogLOwJc3H^Dedix)erCeyaDy?>Jj_Qp18!2~R1
znVKv@i)}E8-f#eO&YMe|_V(3v(3xwN=YkGJuIiq3a9&O6z*G*f_XvkoW~-(+Xp_m|
z;>=l2f|@RDs*bT`ue0^Z<D6ygB~r&-o7L>pWP|F?T5K1+O-|MYT6O-M-0D2FbWXvv
zA=MQjCTe7?bEc%l$vH}#T{g|amo~)48VZh9VCnKj$~gqc$YV7tCfp<%lIo=hc!A<p
z&`H91PRr1rv`tB-J-1z8anzFbMxV)ePPduz4ku>WKqE-4XmN7o7Dd#Fi*&N!f>n8D
z3>)Aan~$qGUZr`?UEvcfV&MA&(rL=6n!}y6aleeqcs6hZ?%-Z<<~eabrI{%;kVeza
zw{;kf%Tx34TQ7p#Q46dgLoEdDLr$wEl;0BBg`)JpsDkyX=|&X-kCUqHJd^84bn-Zk
zm4(K6PfEi(33D`)Moa8-?5I&2Uery_M;fm$MrDFvI+Ap$(eCQR-l)1Ks=iDUdun@L
zeX%-Gtzu&|&nrmW|JgUI^AIh1ZSzc0uts&xwWrrw>@9TWOR=`WS>s|vQu~ShhnsDr
zW1P75p^;f_n+5cW7FoAzv_7uUvVUuOe&oc=iK9a!CgSP{k}}|ZMB>951-=j}oeU8?
zfYj3-$#w9J#p!6@aGz+l%sx756PLo_HQIN^gppHG?*Wu5Hyo!X&_w)7JW<6`ZyX&#
zP&+!bYE)U#zOuTyTB$p{naUtF;LZ$Lo<$PjyhgTD4)cS%4^Z#(;FzUDG%<c)D0QJs
zv3gJ28uip&zq6MK4cr=4YZQ;DF<m5u9amy7rMvX7nyi-)yfZHR#vy`6X+fwutQH;8
zX#I53{R~NkdC~=JH+gqW(k@Vn$J?tb1rrKNcdaM2EGe>B&WK>R-!l^PEaOynO^Qnf
zDbvoTlCLt|?5^4F8a$(pIC~Zbqp(aSNx>#lvs&td<qIOKEHsv>E&0#XK~-@DY2phV
zg9~F?*kv+WfeCP^?p_PD0=e?cFHu$s8WtL{_?8EcG6SE9)ihSt%yGKmx|o)R0vUxS
zX&Lq#N)N30?}F1^gGc_O;AqOE%%gy`Z>%513QDe&vwTo>+|5&@;k*Fn-dufp@nosW
z2!(`GQlo_`Gc$!xww{}~6`CVj2#pjV2{C*&yl)_6ICC^;$ucN~Yw<2ovk(>ujjFpg
xWF^R(6;8^OQPbLlQN=+m>CB|;M^VRcI6)9lf7mO$fgBTv>9A1E4UHU#{uiBCw}b!y

literal 0
HcmV?d00001

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..2bf5338
--- /dev/null
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -0,0 +1,181 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: messages\n"
+"POT-Creation-Date: 2015-04-03 14:47+0100\n"
+"PO-Revision-Date: 2015-04-03 14:47+0100\n"
+"Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
+"X-Poedit-Basepath: /var/www/Coral/resources\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: index.php:58
+msgid "Search"
+msgstr "Recherche"
+
+#: index.php:59
+msgid "new search"
+msgstr "Nouvelle recherche"
+
+#: index.php:68
+msgid "Name (contains)"
+msgstr "Nom (contains)"
+
+#: index.php:72 index.php:83 index.php:93 index.php:246 index.php:378
+#: index.php:395
+msgid "go!"
+msgstr "Valider!"
+
+#: index.php:90
+msgid "Fund"
+msgstr "Fonds"
+
+#: index.php:100
+msgid "Acquisition Type"
+msgstr "Type d'acquisition"
+
+#: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
+#: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
+#: index.php:469 index.php:499 index.php:529 index.php:556
+msgid "All"
+msgstr "Tous"
+
+#: index.php:123
+msgid "Status"
+msgstr "Stat"
+
+#: index.php:154
+msgid "Creator"
+msgstr "Créateur"
+
+#: index.php:186
+msgid "Resource Format"
+msgstr "Format de la ressource"
+
+#: index.php:210
+msgid "Resource Type"
+msgstr "Type de ressource"
+
+#: index.php:218 index.php:220 index.php:259 index.php:261 index.php:290
+#: index.php:292 index.php:351 index.php:353 index.php:409 index.php:411
+#: index.php:441 index.php:443 index.php:473 index.php:475 index.php:503
+#: index.php:505 index.php:532 index.php:534
+msgid "(none)"
+msgstr "(aucun)"
+
+#: index.php:242
+msgid "Record ID"
+msgstr "ID d'enregistrement"
+
+#: index.php:251
+msgid "General Subject"
+msgstr "Sujet général"
+
+#: index.php:282
+msgid "Detailed Subject"
+msgstr "Sujet détaillé"
+
+#: index.php:313
+msgid "Starts with"
+msgstr "Commence avec"
+
+#: index.php:339
+msgid "more options..."
+msgstr "plus des options..."
+
+#: index.php:344
+msgid "Note Type"
+msgstr "Type de note"
+
+#: index.php:374
+msgid "Note (contains)"
+msgstr "Note (contains)"
+
+#: index.php:386
+msgid "Date Created Between"
+msgstr "Date de création entre"
+
+#: index.php:388
+msgid "and"
+msgstr "et"
+
+#: index.php:402
+msgid "Purchase Site"
+msgstr "Site d'achat"
+
+#: index.php:434
+msgid "Authorized Site"
+msgstr "Site autorisé"
+
+#: index.php:466
+msgid "Administering Site"
+msgstr "Administration du site"
+
+#: index.php:496
+msgid "Authentication Type"
+msgstr "Type d'accès"
+
+#: index.php:526
+msgid "Cataloging Status"
+msgstr "Stat de catalogue "
+
+#: index.php:553
+msgid "Routing Step"
+msgstr "Etape de routage"
+
+#: resource.php:54
+msgid "Success!"
+msgstr "Fait!"
+
+#: resource.php:54
+msgid "New resource added"
+msgstr "Nouvelle ressource ajouté"
+
+#: setuser.php:44
+msgid ""
+"LDAP Connection is not working or has timed out.  Please check configuration."
+"ini to verify settings."
+msgstr ""
+"La connexion LDAP ne marche pas ou a expiré. S'il vous plaît vérifiez la "
+"configuration du configuration.ini."
+
+#: templates/header.php:77
+msgid "Hello, "
+msgstr "Bonjour, "
+
+#: templates/header.php:87
+msgid "logout"
+msgstr "Se decconecter"
+
+#: templates/header.php:98
+msgid "Home"
+msgstr "Accueil"
+
+#: templates/header.php:99
+msgid "New Resource"
+msgstr "Nouvelle ressource"
+
+#: templates/header.php:100
+msgid "My Queue"
+msgstr "Ma liste"
+
+#: templates/header.php:101
+msgid "Admin"
+msgstr "Administrateur"
+
+#: user.php:101
+msgid ""
+"Login is not working.  Check the .htaccess file and the "
+"remoteAuthVariableName specified in /admin/configuration.ini"
+msgstr ""
+"L'accès (login) ne marche pas. Vérifiez le fichier .htaccess et "
+"remoteAuthVariableName specifié en /admin/configuration.ini"
+
+#~ msgid "Valider!"
+#~ msgstr "Chercher"
diff --git a/resource.php b/resource.php
index 87b9e41..4dd3cde 100644
--- a/resource.php
+++ b/resource.php
@@ -51,7 +51,7 @@
 		<div style='vertical-align:top; width:100%; height:35px; margin-left:5px;padding:0;'>
 			<span class="headerText" id='span_resourceName' style='float:left;vertical-align:text-top;'><?php echo $resource->titleText; ?>&nbsp;</span>
 			<div id='div_new' style='float:left;vertical-align:bottom;font-weight:115%;margin-top:3px;' class='darkRedText'><?php if ($_GET['ref'] == 'new'){ ?>&nbsp;&nbsp;<img src='images/red_checkmark.gif' />
-				<span class='boldText'>Success!</span>&nbsp;&nbsp;New resource added<?php } ?>
+				<span class='boldText'><?= _("Success!");?></span>&nbsp;&nbsp;<?php echo _("New resource added"); } ?>
 			</div>
 		</div>
 
diff --git a/setuser.php b/setuser.php
index d2a6a62..9b3a71e 100644
--- a/setuser.php
+++ b/setuser.php
@@ -41,7 +41,7 @@
 			$user->firstName = $ldap->fname;
 		}
 	}catch(Exception $e) {
-		$errorMessage = "LDAP Connection is not working or has timed out.  Please check configuration.ini to verify settings.";
+		$errorMessage = _("LDAP Connection is not working or has timed out.  Please check configuration.ini to verify settings.");
 	}
 	$user->save();
 }
diff --git a/templates/header.php b/templates/header.php
index 90a6183..a69faa8 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -74,7 +74,7 @@
 <div style='margin-top:1px;'>
 <span class='smallText' style='color:#526972;'>
 <?php
-	echo "Hello, ";
+	echo _("Hello, ");
 	//user may not have their first name / last name set up
 	if ($user->lastName){
 		echo $user->firstName . " " . $user->lastName;
@@ -84,7 +84,7 @@
 
 ?>
 </span>
-<br /><?php if($config->settings->authModule == 'Y'){ echo "<a href='" . $coralURL . "auth/?logout'>logout</a>"; } ?>
+<br /><?php if($config->settings->authModule == 'Y'){ echo "<a href='" . $coralURL . "auth/?logout'>"._("logout")."</a>"; } ?>
 <?php if ($config->settings->testMode == 'Y') { ?>
   <br><span style="color:red;font-size:90%;">(Test)</span>
 <?php } ?>
@@ -95,10 +95,10 @@
 <tr style='vertical-align:top'>
 <td style='width:870px;height:19px;'>
 
-<a href='index.php'><span class="menubtn<?php if ($currentPage == 'index.php') { echo " active"; } ?>" id="firstmenubtn">Home</span></a><?php if ($user->isAdmin() || $user->canEdit()){ ?>
-<a href='ajax_forms.php?action=getNewResourceForm&height=503&width=775&resourceID=&modal=true' class='thickbox' id='newResourceForm'><span class="menubtn">New Resource</span></a><!--
---><a href='queue.php'><span class="menubtn<?php if ($currentPage == 'queue.php') { echo " active"; } ?>">My Queue</span></a><!--
---><?php if ($user->isAdmin()) { ?><a href='admin.php'><span class="menubtn<?php if ($currentPage == 'admin.php') { echo " active"; } ?>" id="lastmenubtn">Admin</span></a><?php } ?>
+<a href='index.php'><span class="menubtn<?php if ($currentPage == 'index.php') { echo " active"; } ?>" id="firstmenubtn"><?= _("Home");?></span></a><?php if ($user->isAdmin() || $user->canEdit()){ ?>
+<a href='ajax_forms.php?action=getNewResourceForm&height=503&width=775&resourceID=&modal=true' class='thickbox' id='newResourceForm'><span class="menubtn"><?= _("New Resource");?></span></a><!--
+--><a href='queue.php'><span class="menubtn<?php if ($currentPage == 'queue.php') { echo " active"; } ?>"><?= _("My Queue");?></span></a><!--
+--><?php if ($user->isAdmin()) { ?><a href='admin.php'><span class="menubtn<?php if ($currentPage == 'admin.php') { echo " active"; } ?>" id="lastmenubtn"><?= _("Admin");?></span></a><?php } ?>
 <?php } ?>
 
 </td>
diff --git a/user.php b/user.php
index 1b209a2..3bbbad6 100644
--- a/user.php
+++ b/user.php
@@ -98,7 +98,7 @@
 	include_once('setuser.php');
 }else{
 	$user = new User();
-	$errorMessage = "Login is not working.  Check the .htaccess file and the remoteAuthVariableName specified in /admin/configuration.ini";
+	$errorMessage = _("Login is not working.  Check the .htaccess file and the remoteAuthVariableName specified in /admin/configuration.ini");
 }
 
 

From 79e8995da7e5b02103062fe9487990d34cdbeac5 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Fri, 3 Apr 2015 17:23:56 +0200
Subject: [PATCH 002/159] Translate admin.php and dependencies

---
 admin.php                            |  56 +++---
 admin/classes/common/DBService.php   |   2 +-
 admin/classes/common/LdapPerson.php  |   2 +-
 admin/classes/common/Object.php      |   4 +-
 admin/classes/common/Utility.php     |   6 +-
 index.php                            |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2682 -> 5674 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 278 +++++++++++++++++++++++----
 resources/cataloging.php             |  36 ++--
 resources/cataloging_edit.php        |   8 +-
 10 files changed, 297 insertions(+), 97 deletions(-)

diff --git a/admin.php b/admin.php
index 73c103c..d3d309a 100644
--- a/admin.php
+++ b/admin.php
@@ -48,48 +48,48 @@
 		<tr>
 		<td style='width:170px;vertical-align:top;'>
 			<table class='adminMenuTable' style='width:170px;'>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='UserAdminLink'>Users</a></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='WorkflowAdminLink'>Workflow / User Group</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AccessMethod' class='AdminLink'>Access Method</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ExternalLoginType' class='AdminLink'>Account Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AcquisitionType' class='AdminLink'>Acquisition Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AdministeringSite' class='AdminLink'>Administering Site</div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='UserAdminLink'><?= _("Users");?></a></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='WorkflowAdminLink'><?= _("Workflow / User Group");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AccessMethod' class='AdminLink'><?= _("Access Method");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ExternalLoginType' class='AdminLink'><?= _("Account Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AcquisitionType' class='AdminLink'><?= _("Acquisition Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AdministeringSite' class='AdminLink'><?= _("Administering Site");?></div></td></tr>
 				<?php if ($config->settings->enableAlerts == 'Y'){ ?>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='AlertAdminLink'>Alert Settings</div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='AlertAdminLink'><?= _("Alert Settings");?></div></td></tr>
 				<?php } ?>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AliasType' class='AdminLink'>Alias Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AttachmentType' class='AdminLink'>Attachment Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthenticationType' class='AdminLink'>Authentication Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthorizedSite' class='AdminLink'>Authorized Site</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingStatus' class='AdminLink'>Cataloging Status</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingType' class='AdminLink'>CatalogingType</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ContactRole' class='AdminLink'>Contact Role</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='CurrencyLink'>Currency</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'>License Status</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'>Note Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'>Order Type</div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AliasType' class='AdminLink'><?= _("Alias Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AttachmentType' class='AdminLink'><?= _("Attachment Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthenticationType' class='AdminLink'><?= _("Authentication Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthorizedSite' class='AdminLink'><?= _("Authorized Site");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingStatus' class='AdminLink'><?= _("Cataloging Status");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingType' class='AdminLink'><?= _("Cataloging Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ContactRole' class='AdminLink'><?= _("Contact Role");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='CurrencyLink'><?= _("Currency");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'><?= _("License Status");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'><?= _("Note Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'><?= _("Order Type");?></div></td></tr>
 				<?php
 
 				//For Organizations links
 				//if the org module is not installed, display provider list for updates
 				if ($config->settings->organizationsModule == 'N'){ ?>
 
-					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrganizationRole' class='AdminLink'>Organization Role</div></td></tr>
-					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='Organization' class='AdminLink'>Organizations</div></td></tr>
+					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrganizationRole' class='AdminLink'><?= _("Organization Role");?></div></td></tr>
+					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='Organization' class='AdminLink'><?= _("Organizations");?></div></td></tr>
 
 				<?php } ?>
 
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='PurchaseSite' class='AdminLink'>Purchasing Site</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceFormat' class='AdminLink'>Resource Format</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceType' class='AdminLink'>Resource Type</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='StorageLocation' class='AdminLink'>Storage Location</div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='SubjectsAdminLink'>Subjects</div></td></tr>				
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='UserLimit' class='AdminLink'>User Limit</div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='PurchaseSite' class='AdminLink'><?= _("Purchasing Site");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceFormat' class='AdminLink'><?= _("Resource Format");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceType' class='AdminLink'><?= _("Resource Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='StorageLocation' class='AdminLink'><?= _("Storage Location");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='SubjectsAdminLink'><?= _("Subjects");?></div></td></tr>				
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='UserLimit' class='AdminLink'><?= _("User Limit");?></div></td></tr>
 			</table>
 		</td>
 		<td class='adminRightPanel' style='width:530px;margin:0;'>
 			<div style='margin-top:5px;' id='div_AdminContent'>
-			<img src = "images/circle.gif" />Loading...
+			<img src = "images/circle.gif" /><?= _("Loading...");?>
 			</div>
 			<div style='margin-top:5px;' class='smallDarkRedText' id='div_error'></div>
 
@@ -112,7 +112,7 @@
 
 //end else for admin
 }else{
-	echo "You do not have permissions to access this screen.";
+	echo _("You do not have permissions to access this screen.");
 }
 
 include 'templates/footer.php';
diff --git a/admin/classes/common/DBService.php b/admin/classes/common/DBService.php
index 6718a3a..e6dd74a 100644
--- a/admin/classes/common/DBService.php
+++ b/admin/classes/common/DBService.php
@@ -36,7 +36,7 @@ protected function dealloc() {
 
 	protected function checkForError() {
 		if ($this->error = mysql_error($this->db)) {
-			throw new Exception("There was a problem with the database: " . $this->error);
+			throw new Exception(_("There was a problem with the database: ") . $this->error);
 		}
 	}
 
diff --git a/admin/classes/common/LdapPerson.php b/admin/classes/common/LdapPerson.php
index 7d933fe..c4c928d 100644
--- a/admin/classes/common/LdapPerson.php
+++ b/admin/classes/common/LdapPerson.php
@@ -31,7 +31,7 @@ public function __construct($userKey) {
 			$ds = ldap_connect($config->ldap->host);
 
 			//may need ldap_bind( $ds, $username, $password )
-			$bd = ldap_bind($ds) or die("<br /><h3>Could not connect to " . $config->ldap->host . "</h3>");
+			$bd = ldap_bind($ds) or die("<br /><h3>"._("Could not connect to ") . $config->ldap->host . "</h3>");
 
 			if ($bd){
 				$filter = $config->ldap->search_key . "=" . $userKey;
diff --git a/admin/classes/common/Object.php b/admin/classes/common/Object.php
index 5f30ba9..4a9e208 100644
--- a/admin/classes/common/Object.php
+++ b/admin/classes/common/Object.php
@@ -60,7 +60,7 @@ protected function setValueForKey($key, $value) {
 		if (property_exists($this, $key)) {
 			$this->$key = $value;
 		} else {
-			throw new Exception("Cannot set value for undefined key ($key).");
+			throw new Exception(_("Cannot set value for undefined key (").$key.").");
 		}
 	}
 
@@ -69,7 +69,7 @@ protected function valueForKey($key) {
 		if (property_exists($this, $key)) {
 			return $this->$key;
 		} else {
-			throw new Exception("Cannot get value for undefined key ($key).");
+			throw new Exception(_("Cannot set value for undefined key (").$key.").");
 		}
 	}
 
diff --git a/admin/classes/common/Utility.php b/admin/classes/common/Utility.php
index 87e7c28..8aeed4a 100644
--- a/admin/classes/common/Utility.php
+++ b/admin/classes/common/Utility.php
@@ -118,7 +118,7 @@ public function createMessageFromTemplate($messageType, $resourceID, $resourceTi
 				$defaultMessage .= $buffer;
 			}
 			if (!feof($fh)) {
-				return "Error: unexpected fgets() fail\n";
+				return _("Error: unexpected fgets() fail")."\n";
 			}
 
 			fclose($fh);
@@ -130,7 +130,7 @@ public function createMessageFromTemplate($messageType, $resourceID, $resourceTi
 				$resourceTitleInURL = str_replace('+', '%20', $resourceTitleInURL);
 
 				$completionLink = str_replace('<ResourceTitle>', $resourceTitleInURL, $config->settings->completionLink);
-				$defaultMessage .= "Edit DDW facet/term selections at: " . $completionLink;
+				$defaultMessage .= _("Edit DDW facet/term selections at: ") . $completionLink;
 			}
 
 
@@ -145,7 +145,7 @@ public function createMessageFromTemplate($messageType, $resourceID, $resourceTi
 			return $defaultMessage;
 
 		}else{
-			return 'Email template file not found: ' . $templateFile;
+			return _('Email template file not found: ') . $templateFile;
 		}
 
 
diff --git a/index.php b/index.php
index 88af542..050c487 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@
 include_once 'directory.php';
 
 //print header
-$pageTitle='Home';
+$pageTitle=_('Home');
 include 'templates/header.php';
 
 //used for creating a "sticky form" for back buttons
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index a381d1af38f0e83d5b5eb3b1c20a377e38600cd0..376370ae1e5e0ef5a86f5e1509151b23e041dd5f 100644
GIT binary patch
literal 5674
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
CbFg3l

delta 1194
zcmYk5O-NKx6vwYMrQ^)xcVk-m#;nmWgfRM~6vYTyXxhip$D5}<()V=Udqp4#25wti
zDhNWTg(+lFyNDnRq(!tUj6Rk@wFp|esoxo&)nU&4-LH4f|J-|Lv2Cq-`b%Z(ro#5(
zJMl9`N*#n#n`p4U%}Q;B{jeNfgj=8kE1?JZsTrCoI19_*9asSuVKICTtKlmsaX!G9
zQq$@?9r@rVl#RdF7gRB;ImSsCz)4sFzrw<Pn3Vlcgd|ZV^NlbL+hGbGiN>d*_5Nty
zgh}!%kB(G01rzXkG`;~P;Vp<JH5c)Iv_20d;Swx`FW?(a?=_S{ZqtacIk*izf!pCr
zh-S44Q{-2lqYXcxe6R+kf)v@)Fb(C%+99!3CzQm!Q1+dNe4>V+2S?#GxC;5H3v3br
zL$GjVu#WKzoR&a$>Bvz&jQ9-7U9Lb;{1M7s{(>STM!9rV4U{8pgi_IdC;|^ac|M1s
z2sj2sKo69-15kvFlyd%@m}<l&(1wW^BN~Xn4U-@eSgMsP`QJoXb2K4IM0gD@S1Q%Y
z;}#QvwYUh7_gA?4Cc3-v2ARV|^)6gqtW+-7AhrjWf69i{(~-(4NbSHgxSWh?aXr^=
zRbAF(==e_Hc&;&cb;4F%xpBu`Zyi6d^EzIVC>qlzOS0*}9P>sTcf=S7%pmktciuJw
zFRxSate%fI>38vAeXjJ8ZcEgr`@+06YWlV@-~_fhYg=AEXPoZQj}sjYfte3{<BAiE
zswmPxXj!)JXO!vYbTXCIy{Y4|j-wri^lYlR(0RI)8ZN49F+(eKTa_p^a#{1Aczv%d
zdt%T-)!#L1`GKz_y<vvPbo}LoLOvsB8<trpCbSKzSY9v#JIw2E<@@w}MT`DaF`>Q6
o6@96yUcax(=wx+IeYZD0Zo3w-F56ZijOsO=AfxO+zpd%~14}8ap#T5?

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 2bf5338..3419ef3 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-03 14:47+0100\n"
-"PO-Revision-Date: 2015-04-03 14:47+0100\n"
+"POT-Creation-Date: 2015-04-03 17:18+0100\n"
+"PO-Revision-Date: 2015-04-03 17:18+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -15,6 +15,146 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
+#: admin.php:51
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: admin.php:52
+msgid "Workflow / User Group"
+msgstr "Flux de travail / Group utilisateur"
+
+#: admin.php:53
+msgid "Access Method"
+msgstr "Mèthode d'accès"
+
+#: admin.php:54
+msgid "Account Type"
+msgstr "Type d'account"
+
+#: admin.php:55 index.php:100
+msgid "Acquisition Type"
+msgstr "Type d'acquisition"
+
+#: admin.php:56 index.php:466
+msgid "Administering Site"
+msgstr "Administration du site"
+
+#: admin.php:58
+msgid "Alert Settings"
+msgstr "Configuration des alertes"
+
+#: admin.php:60
+msgid "Alias Type"
+msgstr "Type d'alias"
+
+#: admin.php:61
+msgid "Attachment Type"
+msgstr "Type de fixation"
+
+#: admin.php:62 index.php:496
+msgid "Authentication Type"
+msgstr "Type d'accès"
+
+#: admin.php:63 index.php:434
+msgid "Authorized Site"
+msgstr "Site autorisé"
+
+#: admin.php:64 index.php:526
+msgid "Cataloging Status"
+msgstr "Statut de catalogue "
+
+#: admin.php:65
+msgid "Cataloging Type"
+msgstr "Type de catalogue "
+
+#: admin.php:66
+msgid "Contact Role"
+msgstr "Contact Rôle"
+
+#: admin.php:67
+msgid "Currency"
+msgstr "Concurrence"
+
+#: admin.php:68
+msgid "License Status"
+msgstr "Statut de la licence"
+
+#: admin.php:69 index.php:344
+msgid "Note Type"
+msgstr "Type de note"
+
+#: admin.php:70
+msgid "Order Type"
+msgstr "Type d'ordre"
+
+#: admin.php:77
+msgid "Organization Role"
+msgstr "Rôle dans l'organisation"
+
+#: admin.php:78
+msgid "Organizations"
+msgstr "Organisation"
+
+#: admin.php:82
+msgid "Purchasing Site"
+msgstr "Site d'achat"
+
+#: admin.php:83 index.php:186
+msgid "Resource Format"
+msgstr "Format de la ressource"
+
+#: admin.php:84 index.php:210
+msgid "Resource Type"
+msgstr "Type de ressource"
+
+#: admin.php:85
+msgid "Storage Location"
+msgstr "Lieu de stockage"
+
+#: admin.php:86
+msgid "Subjects"
+msgstr "Sujets"
+
+#: admin.php:87
+msgid "User Limit"
+msgstr "Limit d'utilisateurs"
+
+#: admin.php:92
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: admin.php:115
+msgid "You do not have permissions to access this screen."
+msgstr "Vous n'avez pas la permission d'accèder dans cette page."
+
+#: admin/classes/common/DBService.php:39
+msgid "There was a problem with the database: "
+msgstr "Il y avait un problème avec la base de données: "
+
+#: admin/classes/common/LdapPerson.php:34
+msgid "Could not connect to "
+msgstr "Ne pouvait pas se connecter à "
+
+#: admin/classes/common/Object.php:63 admin/classes/common/Object.php:72
+msgid "Cannot set value for undefined key ("
+msgstr "Ne peut pas asigner une clé indefini ("
+
+#: admin/classes/common/Utility.php:121
+msgid "Error: unexpected fgets() fail"
+msgstr "Erreur: inattendu échoue fgets()"
+
+#: admin/classes/common/Utility.php:133
+msgid "Edit DDW facet/term selections at: "
+msgstr "Modifier selections DDW facet/term à: "
+
+#: admin/classes/common/Utility.php:148
+msgid "Email template file not found: "
+msgstr "Le fichier template pour l'email est introuvable: "
+
+#: index.php:26 templates/header.php:98
+msgid "Home"
+msgstr "Accueil"
+
 #: index.php:58
 msgid "Search"
 msgstr "Recherche"
@@ -36,10 +176,6 @@ msgstr "Valider!"
 msgid "Fund"
 msgstr "Fonds"
 
-#: index.php:100
-msgid "Acquisition Type"
-msgstr "Type d'acquisition"
-
 #: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
 #: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
 #: index.php:469 index.php:499 index.php:529 index.php:556
@@ -48,20 +184,12 @@ msgstr "Tous"
 
 #: index.php:123
 msgid "Status"
-msgstr "Stat"
+msgstr "Statut"
 
 #: index.php:154
 msgid "Creator"
 msgstr "Créateur"
 
-#: index.php:186
-msgid "Resource Format"
-msgstr "Format de la ressource"
-
-#: index.php:210
-msgid "Resource Type"
-msgstr "Type de ressource"
-
 #: index.php:218 index.php:220 index.php:259 index.php:261 index.php:290
 #: index.php:292 index.php:351 index.php:353 index.php:409 index.php:411
 #: index.php:441 index.php:443 index.php:473 index.php:475 index.php:503
@@ -89,10 +217,6 @@ msgstr "Commence avec"
 msgid "more options..."
 msgstr "plus des options..."
 
-#: index.php:344
-msgid "Note Type"
-msgstr "Type de note"
-
 #: index.php:374
 msgid "Note (contains)"
 msgstr "Note (contains)"
@@ -109,22 +233,6 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: index.php:434
-msgid "Authorized Site"
-msgstr "Site autorisé"
-
-#: index.php:466
-msgid "Administering Site"
-msgstr "Administration du site"
-
-#: index.php:496
-msgid "Authentication Type"
-msgstr "Type d'accès"
-
-#: index.php:526
-msgid "Cataloging Status"
-msgstr "Stat de catalogue "
-
 #: index.php:553
 msgid "Routing Step"
 msgstr "Etape de routage"
@@ -137,6 +245,98 @@ msgstr "Fait!"
 msgid "New resource added"
 msgstr "Nouvelle ressource ajouté"
 
+#: resources/cataloging.php:103
+msgid "Cataloging"
+msgstr "Catalogage"
+
+#: resources/cataloging.php:106
+msgid "edit order information"
+msgstr "modifier l'order de l'information"
+
+#: resources/cataloging.php:114
+msgid "Identifier:"
+msgstr "Identifiant:"
+
+#: resources/cataloging.php:120
+msgid "Source URL:"
+msgstr "Source URL: "
+
+#: resources/cataloging.php:121
+msgid "Visit Source URL"
+msgstr "Source URL de visite"
+
+#: resources/cataloging.php:128
+msgid "Cataloging Type:"
+msgstr "Type de catalogage:"
+
+#: resources/cataloging.php:136
+msgid "Cataloging Status:"
+msgstr "Stat de catalogage:"
+
+#: resources/cataloging.php:142
+msgid "# Records Available:"
+msgstr "# Enregistrements disponibles"
+
+#: resources/cataloging.php:148
+msgid "# Records Loaded:"
+msgstr "# Enregistrements chargées"
+
+#: resources/cataloging.php:153
+msgid "OCLC Holdings:"
+msgstr "OCLC Holdings:"
+
+#: resources/cataloging.php:154
+msgid "Yes"
+msgstr "Oui"
+
+#: resources/cataloging.php:154
+msgid "No"
+msgstr "Non"
+
+#: resources/cataloging.php:159
+msgid "No cataloging information available."
+msgstr "Le catalogue d'information n'est pas disponible."
+
+#: resources/cataloging.php:165
+msgid "edit cataloging details"
+msgstr "modifier les détails du catalogage"
+
+#: resources/cataloging.php:209
+msgid "Additional Notes"
+msgstr "Notes additionales"
+
+#: resources/cataloging.php:212 resources/cataloging.php:231
+msgid "add new note"
+msgstr "ajouter une note"
+
+#: resources/cataloging.php:220
+msgid "edit note"
+msgstr "modifier une note"
+
+#: resources/cataloging.php:220
+msgid "remove note"
+msgstr "effacer une note"
+
+#: resources/cataloging.php:223
+msgid " by "
+msgstr " par "
+
+#: resources/cataloging_edit.php:15
+msgid "Edit Cataloging"
+msgstr "Modifier le catalogage"
+
+#: resources/cataloging_edit.php:24
+msgid "Record Set"
+msgstr "jeu d'enregistrement"
+
+#: resources/cataloging_edit.php:102
+msgid "submit"
+msgstr "Confirmer"
+
+#: resources/cataloging_edit.php:103
+msgid "cancel"
+msgstr "Annuler"
+
 #: setuser.php:44
 msgid ""
 "LDAP Connection is not working or has timed out.  Please check configuration."
@@ -153,10 +353,6 @@ msgstr "Bonjour, "
 msgid "logout"
 msgstr "Se decconecter"
 
-#: templates/header.php:98
-msgid "Home"
-msgstr "Accueil"
-
 #: templates/header.php:99
 msgid "New Resource"
 msgstr "Nouvelle ressource"
@@ -177,5 +373,9 @@ msgstr ""
 "L'accès (login) ne marche pas. Vérifiez le fichier .htaccess et "
 "remoteAuthVariableName specifié en /admin/configuration.ini"
 
+#, fuzzy
+#~ msgid "CatalogingType"
+#~ msgstr "Stat de catalogue "
+
 #~ msgid "Valider!"
 #~ msgstr "Chercher"
diff --git a/resources/cataloging.php b/resources/cataloging.php
index 183e449..e96db1a 100644
--- a/resources/cataloging.php
+++ b/resources/cataloging.php
@@ -100,10 +100,10 @@
 <table class='linedFormTable' style='width:460px;'>
   <tr>
     <th colspan='2' style='vertical-align:bottom;'>
-      <span style='float:left;vertical-align:bottom;'>Cataloging</span>
+      <span style='float:left;vertical-align:bottom;'><?= _("Cataloging");?></span>
 
       <?php if ($user->canEdit()){ ?>
-      	<span style='float:right;vertical-align:bottom;'><a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='edit order information'></a></span>
+      	<span style='float:right;vertical-align:bottom;'><a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='<?= _("edit order information");?>'></a></span>
       <?php } ?>
 
     </th>
@@ -111,21 +111,21 @@
   <?php if ($resource->hasCatalogingInformation()) { ?>
     <?php if ($resource->recordSetIdentifier) { ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'>Identifier:</td>
+    	<td style='vertical-align:top;width:130px;'><?= _("Identifier:");?></td>
     	<td style='width:350px;'><?php echo $resource->recordSetIdentifier ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->bibSourceURL) { ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'>Source URL:</td>
-    	<td style='width:350px;'><?php echo $resource->bibSourceURL ?><?php if ($resource->bibSourceURL) { ?> &nbsp;&nbsp;<a href='<?php echo $resource->bibSourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Source URL' title='Visit Source URL' style='vertical-align:top;'></a><?php } ?></td>
+    	<td style='vertical-align:top;width:130px;'><?= _("Source URL:");?></td>
+    	<td style='width:350px;'><?php echo $resource->bibSourceURL ?><?php if ($resource->bibSourceURL) { ?> &nbsp;&nbsp;<a href='<?php echo $resource->bibSourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Source URL' title='<?= _("Visit Source URL");?>' style='vertical-align:top;'></a><?php } ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->catalogingTypeID) { 
       $catalogingType = new CatalogingType(new NamedArguments(array('primaryKey' => $resource->catalogingTypeID)));
       ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'>Cataloging Type:</td>
+    	<td style='vertical-align:top;width:130px;'><?= _("Cataloging Type:");?></td>
     	<td style='width:350px;'><?php echo $catalogingType->shortName ?></td>
   	</tr>
   	<?php } ?>
@@ -133,36 +133,36 @@
       $catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $resource->catalogingStatusID)));
       ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'>Cataloging Status:</td>
+    	<td style='vertical-align:top;width:130px;'><?= _("Cataloging Status:");?></td>
     	<td style='width:350px;'><?php echo $catalogingStatus->shortName ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsAvailable) { ?>
   	<tr title="Number of Records Available">
-    	<td style='vertical-align:top;width:130px;'># Records Available:</td>
+    	<td style='vertical-align:top;width:130px;'><?= _("# Records Available:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsAvailable ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsLoaded) { ?>
   	<tr title="Number of Records Loaded">
-    	<td style='vertical-align:top;width:130px;'># Records Loaded:</td>
+    	<td style='vertical-align:top;width:130px;'><?= _("# Records Loaded:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsLoaded ?></td>
   	</tr>
   	<?php } ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'>OCLC Holdings:</td>
-    	<td style='width:350px;'><?php echo $resource->hasOclcHoldings ? 'Yes' : 'No' ?></td>
+    	<td style='vertical-align:top;width:130px;'><?= _("OCLC Holdings:");?></td>
+    	<td style='width:350px;'><?php echo $resource->hasOclcHoldings ? _('Yes') : _('No') ?></td>
   	</tr>
   <?php } else { ?>
     <tr>
       <td colspan="2">
-        <em>No cataloging information available.</em>
+        <em><?= _("No cataloging information available.");?></em>
       </td>
     </tr>
   <?php } ?>
 </table>
 <?php if ($user->canEdit()){ ?>
-<a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit cataloging details</a><br />
+<a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?= _("edit cataloging details");?></a><br />
 <?php } ?>
 
 <br />
@@ -206,10 +206,10 @@
 ?>
 <table class='linedFormTable' style='width:460px;max-width:460px;'>
 	<tr>
-	<th>Additional Notes</th>
+	<th><?= _("Additional Notes");?></th>
 	<th>
 	<?php if ($user->canEdit()){?>
-		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 	<?php } ?>
 	</th>
 	</tr>
@@ -217,10 +217,10 @@
 		<tr>
 		<td style='width:130px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 		<?php if ($user->canEdit()){?>
-		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Cataloging'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='<?= _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Cataloging'><img src='images/cross.gif' alt='remove note' title='<?= _("remove note");?>'></a>
 		<?php } ?>
 		</td>
-		<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+		<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 		</tr>
 	<?php } ?>
 </table>
@@ -228,7 +228,7 @@
 }else{
 if ($user->canEdit()){
 ?>
-	<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+	<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 <?php
 }
 }
diff --git a/resources/cataloging_edit.php b/resources/cataloging_edit.php
index b83caa7..538636b 100644
--- a/resources/cataloging_edit.php
+++ b/resources/cataloging_edit.php
@@ -12,7 +12,7 @@
 <form id='catalogingForm' method="post" action="resources/cataloging_update.php">
 <input type='hidden' name='resourceID' id='resourceID' value='<?php echo $resourceID; ?>'>
 
-<div class='formTitle' style='width:715px; margin-bottom:5px;'><span class='headerText'>Edit Cataloging</span></div>
+<div class='formTitle' style='width:715px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Cataloging");?></span></div>
 
 <span class='smallDarkRedText' id='span_errors'></span>
 
@@ -21,7 +21,7 @@
 <td style='vertical-align:top;' colspan='2'>
 
 
-<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b>Record Set</b></label>&nbsp;&nbsp;</span>
+<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?= _("Record Set");?></b></label>&nbsp;&nbsp;</span>
 
 <table class='surroundBox' style='width:710px;'>
 <tr>
@@ -99,8 +99,8 @@
 
 <table class='noBorderTable' style='width:125px;'>
 <tr>
-	<td style='text-align:left'><input type='submit' value='submit' name='submitCatalogingChanges' id ='submitCatalogingChanges'></td>
-	<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+	<td style='text-align:left'><input type='submit' value='<?= _("submit");?>' name='submitCatalogingChanges' id ='submitCatalogingChanges'></td>
+	<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 </tr>
 </table>
 

From 8e04df3464d73004b6647b9a1519ab4a1dbb977f Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 7 Apr 2015 14:34:41 +0200
Subject: [PATCH 003/159] Translate ajax_forms.php and update
 cataloging_edit.php

---
 ajax_forms.php                       | 358 ++++++++---------
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 5674 -> 12774 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 580 ++++++++++++++++++++++++++-
 resources/cataloging_edit.php        |   6 +-
 4 files changed, 741 insertions(+), 203 deletions(-)

diff --git a/ajax_forms.php b/ajax_forms.php
index fea946b..ef7f2a8 100644
--- a/ajax_forms.php
+++ b/ajax_forms.php
@@ -44,7 +44,7 @@
 		<input type='hidden' name='editResourceNoteID' id='editResourceNoteID' value='<?php echo $resourceNoteID; ?>'>
 		<input type='hidden' name='tab' id='tab' value='<?php echo $tabName; ?>'>
 
-		<div class='formTitle' style='width:395px;'><span class='headerText' style='margin-left:7px;'><?php if ($resourceNoteID){ echo "Edit Note"; } else { echo "Add Note"; } ?></span></div>
+		<div class='formTitle' style='width:395px;'><span class='headerText' style='margin-left:7px;'><?php if ($resourceNoteID){ echo _("Edit Note"); } else { echo _("Add Note"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -54,7 +54,7 @@
 
 			<table class='noBorder' style='width:360px; margin:10px 15px;'>
 			<tr>
-			<td style='vertical-align:top;text-align:left;border:0px;'><label for='noteTypeID'><b>Note Type:</b></label></td>
+			<td style='vertical-align:top;text-align:left;border:0px;'><label for='noteTypeID'><b><?= _("Note Type:");?></b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 
 			<select name='noteTypeID' id='noteTypeID'>
@@ -74,7 +74,7 @@
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='noteText'><b>Notes:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='noteText'><b><?= _("Notes:");?></b></label></td>
 			<td><textarea rows='5' id='noteText' name='noteText' style='width:270px'><?php echo $resourceNote->noteText; ?></textarea><span class='smallDarkRedText' id='span_error_noteText'></span></td>
 			</td>
 			</tr>
@@ -87,8 +87,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitResourceNoteForm' id ='submitResourceNoteForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitResourceNoteForm' id ='submitResourceNoteForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove()"></td>
 			</tr>
 		</table>
 
@@ -185,14 +185,14 @@
 
 		<input type='hidden' id='organizationID' value='<?php echo $orgID; ?>' />
 		<input type='hidden' id='editResourceID' value='<?php echo $resourceID; ?>' />
-		<div class='formTitle' style='width:745px;'><span class='headerText'><?php if ($resourceID) { echo "Edit Saved Resource"; }else{ echo "Add New Resource"; } ?></span></div>
-		<div class='smallDarkRedText' style='height:14px;margin:3px 0px 0px 0px;'>&nbsp;* required fields</div>
+		<div class='formTitle' style='width:745px;'><span class='headerText'><?php if ($resourceID) { echo _("Edit Saved Resource"); }else{ echo _("Add New Resource"); } ?></span></div>
+		<div class='smallDarkRedText' style='height:14px;margin:3px 0px 0px 0px;'>&nbsp;<?= _("* required fields");?></div>
 
 		<table class='noBorder'>
 		<tr style='vertical-align:top;'>
 		<td style='vertical-align:top; padding-right:35px;'>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b>Product</b>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b><?= _("Product");?></b>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -201,17 +201,17 @@
 				<table class='noBorder' style='width:310px; margin:5px 15px;'>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='titleText'>Name:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='titleText'><?= _("Name:");?>&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 					<td><input type='text' id='titleText' style='width:220px;' class='changeInput' value="<?php echo $resource->titleText; ?>" /><span id='span_error_titleText' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='descriptionText'>Description:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><?= _("Description:");?></label></td>
 					<td><textarea rows='3' id='descriptionText' style='width:223px'><?php echo $resource->descriptionText; ?></textarea></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='providerText'>Provider:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='providerText'><?= _("Provider:");?></label></td>
 					<td><input type='text' id='providerText' style='width:220px;' class='changeInput' value='<?php echo $providerText; ?>' /><span id='span_error_providerText' class='smallDarkRedText'></span></td>
 					</tr>
 
@@ -232,7 +232,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Format</b></label>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Format");?></b></label>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -276,7 +276,7 @@
 			</table>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b>Acquisition Type</b>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b><?= _("Acquisition Type");?></b>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -323,7 +323,7 @@
 		</td>
 		<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Initial Cost</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Initial Cost");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -332,9 +332,9 @@
 
 				<table class='noBorder smallPadding newPaymentTable' style='width:320px;margin:7px 15px 0px 15px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Fund:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan='2'>Price:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Type:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?= _("Fund:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan='2'><?= _("Price:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?= _("Type:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -379,7 +379,7 @@
 
 
 				<td style='vertical-align:center;text-align:left;width:37px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt='add this payment' title='add payment'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt='<?= _("add this payment");?>' title='<?= _("add payment");?>'></a>
 				</td>
 				</tr>
 
@@ -443,7 +443,7 @@
 
 
 						<td style='vertical-align:top;text-align:center;width:37px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this payment' title='remove this payment' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove this payment");?>' title='<?= _("remove this payment");?>' class='remove' /></a>
 						</td>
 						</tr>
 
@@ -463,7 +463,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceTypeID'><b>Resource Type</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceTypeID'><b><?= _("Resource Type");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -509,7 +509,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Notes</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Notes");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -518,7 +518,7 @@
 				<table class='noBorder smallPadding' style='width:320px; margin:7px 15px;'>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><span class='smallGreyText'>Include any additional information</span><br />
+					<td style='vertical-align:top;text-align:left;'><span class='smallGreyText'><?= _("Include any additional information");?></span><br />
 					<textarea rows='5' id='noteText' name='noteText' style='width:310px'><?php echo $resourceNote->noteText; ?></textarea></td>
 					</tr>
 				</table>
@@ -534,9 +534,9 @@
 
 		<table class='noBorderTable' style='width:175px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='save' class='submitResource' id ='save'></td>
-				<td style='text-align:left'><input type='button' value='submit' class='submitResource' id ='progress'></td>
-				<td style='text-align:left'><input type='button' value='cancel' onclick="kill(); tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("save");?>' class='submitResource' id ='save'></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' class='submitResource' id ='progress'></td>
+				<td style='text-align:left'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove()"></td>
 			</tr>
 		</table>
 
@@ -623,7 +623,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:715px; margin-bottom:5px;position:relative;'><span class='headerText'>Edit Resource</span></div>
+		<div class='formTitle' style='width:715px; margin-bottom:5px;position:relative;'><span class='headerText'><?= _("Edit Resource");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -632,7 +632,7 @@
 		<td style='vertical-align:top;position:relative;' colspan='2'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Product</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Product");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:710px;'>
 			<tr>
@@ -642,12 +642,12 @@
 				<td style='width:360px;'>
 					<table>
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'>Name:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'><?= _("Name:");?></label></td>
 					<td><input type='text' id='titleText' name='titleText' value = "<?php echo $resource->titleText; ?>" style='width:260px;' class='changeInput' /><span id='span_error_titleText' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='descriptionText'>Description:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='descriptionText'><?= _("Description:");?></label></td>
 					<td><textarea rows='4' id='descriptionText' name='descriptionText' style='width:260px' class='changeInput' ><?php echo $resource->descriptionText; ?></textarea></td>
 					</tr>
 
@@ -669,7 +669,7 @@
 
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'>Parent:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'><?= _("Parent:");?></label></td>
 					<td>
 
 					<input type='text' id='parentResourceName' name='parentResourceName' value = '<?php echo $parentResource->titleText; ?>' style='width:180px;' class='changeInput' /><span id='span_error_parentResourceName' class='smallDarkRedText'></span></td>
@@ -685,7 +685,7 @@
 
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'>Format:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?= _("Format:");?></label></td>
 					<td>
 					<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
 					<option value=''></option>
@@ -704,7 +704,7 @@
 
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'>Type:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'><?= _("Type:");?></label></td>
 					<td>
 					<select name='resourceTypeID' id='resourceTypeID' style='width:100px;' class='changeSelect' >
 					<option value=''></option>
@@ -723,7 +723,7 @@
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='archiveInd'><b>Archived:</b></label></td>
+					<td style='text-align:left'><label for='archiveInd'><b><?= _("Archived:");?></b></label></td>
 					<td>
 					<input type='checkbox' id='archiveInd' name='archiveInd' <?php echo $archiveChecked; ?> />
 					</td>
@@ -744,7 +744,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Organizations</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Organizations");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:380px;'>
 			<tr>
@@ -752,8 +752,8 @@
 
 				<table class='noBorder smallPadding newOrganizationTable' style='width:330px;  margin:15px 20px 0px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:103px;'>Role:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:160px;'>Organization:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:103px;'><?= _("Role:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:160px;'><?= _("Organization:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -775,7 +775,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addOrganization' alt='add organization' title='add organization'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addOrganization' alt='<?= _("add organization");?>' title='<?= _("add organization");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -815,7 +815,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove organization' title='remove <?php echo $resourceOrganization['shortName']; ?> organization' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove organization");?>' title='<?= _("remove "). $resourceOrganization['shortName']. _(" organization");?>' class='remove' /></a>
 						</td>
 
 						</tr>
@@ -837,7 +837,7 @@
 		</td>
 		<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Aliases</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?= _("Aliases");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:300px;'>
 			<tr>
@@ -845,8 +845,8 @@
 
 				<table class='noBorder smallPadding newAliasTable' style='width:260px; margin:15px 20px 0px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:98px;'>Type:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:125px;'>Alias:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:98px;'><?= _("Type:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:125px;'><?= _("Alias:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -868,7 +868,7 @@
 				</td>
 
 				<td style='vertical-align:center;text-align:left;width:37px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addAlias' alt='add this alias' title='add alias'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addAlias' alt='<?= _("add this alias");?>' title='<?= _("add alias");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -909,7 +909,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:37px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this alias' title='remove this alias' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove this alias");?>' title='<?= _("remove this alias");?>' class='remove' /></a>
 						</td>
 						</tr>
 
@@ -938,8 +938,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitProductChanges' id ='submitProductChanges'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitProductChanges' id ='submitProductChanges'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -1026,7 +1026,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:740px; margin-bottom:5px;'><span class='headerText'>Edit Acquisitions Information</span></div>
+		<div class='formTitle' style='width:740px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Acquisitions Information");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -1035,14 +1035,14 @@
 		<td style='vertical-align:top; padding-right:35px;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='orderInformation'><b>Order</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='orderInformation'><b><?= _("Order");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:310px; margin:15px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='acquisitionTypeID'>Acquisition Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='acquisitionTypeID'><?= _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect'>
 				<option value=''></option>
@@ -1060,22 +1060,22 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='orderNumber'>Order Number:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='orderNumber'><?= _("Order Number:");?></label></td>
 				<td><input type='text' id='orderNumber' name='orderNumber' value = '<?php echo $resource->orderNumber; ?>' style='width:95px;' class='changeInput' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='systemNumber'>System Number:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='systemNumber'><?= _("System Number:");?></label></td>
 				<td><input type='text' id='systemNumber' name='systemNumber' value = '<?php echo $resource->systemNumber; ?>' style='width:95px;' class='changeInput' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='subscriptionStartDate'>Subscription Start:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='subscriptionStartDate'><?= _("Subscription Start:");?></label></td>
 				<td><input class='date-pick' id='subscriptionStartDate' name='subscriptionStartDate' value = '<?php echo $startDate; ?>' style='width:75px;' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='subscriptionEndDate'>Subscription End:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='subscriptionEndDate'><?= _("Subscription End:");?></label></td>
 				<td><input class='date-pick' id='subscriptionEndDate' name='subscriptionEndDate' value = '<?php echo $endDate; ?>' style='width:75px;' />
 				</td>
 				</tr>
@@ -1085,7 +1085,7 @@
 				<td style='vertical-align:top;text-align:left;font-weight:bold'>&nbsp;</td>
 				<td>
 				<div class="checkboxes" style='text-align:left;'>
-					<label><input id='subscriptionAlertEnabledInd' type='checkbox' style='text-align:bottom' value='1' <?php if($resource->subscriptionAlertEnabledInd == 1) { echo "checked"; } ?> />&nbsp;<span>Enable Alert</span></label>
+					<label><input id='subscriptionAlertEnabledInd' type='checkbox' style='text-align:bottom' value='1' <?php if($resource->subscriptionAlertEnabledInd == 1) { echo "checked"; } ?> />&nbsp;<span><?= _("Enable Alert");?></span></label>
 				</div>
 				</td>
 				</tr>
@@ -1101,7 +1101,7 @@
 		</td>
 		<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourcePayments'><b>Initial Cost</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourcePayments'><b><?= _("Initial Cost");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:340px;'>
 			<tr>
@@ -1109,9 +1109,9 @@
 
 				<table class='noBorder smallPadding newPaymentTable' style='width:320px;margin:7px 15px 0px 15px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Fund:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan='2'>Price:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Type:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?= _("Fund:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan='2'><?= _("Price:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?= _("Type:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -1154,7 +1154,7 @@
 				</td>
 
 				<td style='vertical-align:center;text-align:center;width:37px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt='add this payment' title='add payment'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt='<?= _("add this payment");?>' title='<?= _("add payment");?>'></a>
 				</td>
 				</tr>
 
@@ -1217,7 +1217,7 @@
 
 
 						<td style='vertical-align:top;text-align:center;width:37px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this payment' title='remove this payment' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove this payment");?>' title='<?= _("remove this payment");?>' class='remove' /></a>
 						</td>
 						</tr>
 
@@ -1244,7 +1244,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='sitePurchaserID'><b>Purchasing Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='sitePurchaserID'><b><?= _("Purchasing Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -1293,8 +1293,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitOrder' id ='submitOrder'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitOrder' id ='submitOrder'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -1361,7 +1361,7 @@
 		<form id='licenseForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:360px; margin-bottom:5px;'><span class='headerText'>Edit Licenses</span></div>
+		<div class='formTitle' style='width:360px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Licenses");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -1371,7 +1371,7 @@
 
 
 			<?php if ($config->settings->licensingModule == 'Y'){ ?>
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseRecords'><b>License Records</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseRecords'><b><?= _("License Records");?></b></label>&nbsp;&nbsp;</span>
 
 
 			<table class='surroundBox' style='width:350px;'>
@@ -1387,7 +1387,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();' class='addLicense'><img src='images/add.gif' class='addLicense' alt='add license' title='add license'></a>
+				<a href='javascript:void();' class='addLicense'><img src='images/add.gif' class='addLicense' alt='<?= _("add license");?>' title='<?= _("add license");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -1414,7 +1414,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove license link' title='remove <?php echo $license['license']; ?> license' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove license link");?>' title='<?= _("remove "). $license['license'] . _(" license");?>' class='remove' /></a>
 						</td>
 
 						</tr>
@@ -1439,7 +1439,7 @@
 
 			<?php } ?>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseStatus'><b>Licensing Status</b></label></span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseStatus'><b><?= _("Licensing Status");?></b></label></span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -1447,7 +1447,7 @@
 
 				<table class='noBorder smallPadding' style='width:310px; margin:15px 20px 0px 20px'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;width:60px;'>Status:</td>
+				<td style='vertical-align:top;text-align:left;width:60px;'><?= _("Status:");?></td>
 				<td style='vertical-align:top;text-align:left;'>
 				<select class='changeSelect' id='licenseStatusID'>
 				<option value=''></option>
@@ -1471,16 +1471,16 @@
 
 				<table class='noBorder' style='width:310px; margin:5px 15px;'>
 				<tr>
-				<td style='vertical-align:top;width:60px;'>History:</td>
+				<td style='vertical-align:top;width:60px;'><?= _("History:");?></td>
 				<td>
 
 				<?php
 				if (count($resourceLicenseStatusArray) > 0){
 					foreach ($resourceLicenseStatusArray as $licenseStatus){
-						echo $licenseStatus['licenseStatus'] . " - <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . " by " . $licenseStatus['changeName'] . "</i><br />";
+						echo $licenseStatus['licenseStatus'] . " - <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . _(" by ") . $licenseStatus['changeName'] . "</i><br />";
 					}
 				}else{
-					echo "<i>No license status information available.</i>";
+					echo "<i>"._("No license status information available.")."</i>";
 				}
 
 				?>
@@ -1502,8 +1502,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitLicense' id ='submitLicense'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitLicense' id ='submitLicense'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -1585,7 +1585,7 @@
 		<form id='accessForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'>Edit Access</span></div>
+		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Access");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -1594,14 +1594,14 @@
 		<td style='vertical-align:top;' colspan='2'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b>Access</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?= _("Access");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:610px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:570px; margin:15px 20px 10px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'>Authentication Type:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'><?= _("Authentication Type:");?></label></td>
 					<td>
 						<select name='authenticationTypeID' id='authenticationTypeID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -1616,11 +1616,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'>Username:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'><?= _("Username:");?></label></td>
 					<td><input type='text' id='authenticationUserName' name='authenticationUserName' value = '<?php echo $resource->authenticationUserName; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'>Access Method:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'><?= _("Access Method:");?></label></td>
 					<td>
 						<select name='accessMethodID' id='accessMethodID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -1635,11 +1635,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'>Password:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'><?= _("Password:");?></label></td>
 					<td><input type='text' id='authenticationPassword' name='authenticationPassword' value = '<?php echo $resource->authenticationPassword; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'>Storage Location:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'><?= _("Storage Location:");?></label></td>
 					<td>
 						<select name='storageLocationID' id='storageLocationID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -1654,7 +1654,7 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'>Simultaneous User Limit:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'><?= _("Simultaneous User Limit:");?></label></td>
 					<td>
 						<select name='userLimitID' id='userLimitID' style='width:100px;' class='changeSelect' >
 						<option value=''></option>
@@ -1671,7 +1671,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'>Coverage:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'><?= _("Coverage:");?></label></td>
 					<td colspan='3'>
 						<input type='text' id='coverageText' name='coverageText' value = "<?php echo $resource->coverageText; ?>" style='width:405px;' class='changeInput'  />
 					</td>
@@ -1689,7 +1689,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b>Authorized Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Authorized Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -1734,7 +1734,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b>Administering Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Administering Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -1777,8 +1777,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitAccessChanges' id ='submitAccessChanges'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAccessChanges' id ='submitAccessChanges'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -1823,7 +1823,7 @@
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 		<input type='hidden' name='editContactID' id='editContactID' value='<?php echo $contactID; ?>'>
 
-		<div class='formTitle' style='width:603px;'><span class='headerText' style='margin-left:7px;'><?php if ($contactID){ echo "Edit Contact"; } else { echo "Add Contact"; } ?></span></div>
+		<div class='formTitle' style='width:603px;'><span class='headerText' style='margin-left:7px;'><?php if ($contactID){ echo _("Edit Contact"); } else { echo _("Add Contact"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -1836,28 +1836,28 @@
 
 				<table class='noBorder'>
 					<tr>
-					<td style='text-align:left'><label for='contactName'><b>Name:</b></label></td>
+					<td style='text-align:left'><label for='contactName'><b><?= _("Name:");?></b></label></td>
 					<td>
 					<input type='text' id='contactName' name='contactName' value = '<?php echo $contact->name; ?>' style='width:150px' class='changeInput' /><span id='span_error_contactName' class='smallDarkRedText'>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='contactTitle'><b>Title:</b></label></td>
+					<td style='text-align:left'><label for='contactTitle'><b><?= _("Title:");?></b></label></td>
 					<td>
 					<input type='text' id='contactTitle' name='contactTitle' value = '<?php echo $contact->title; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='phoneNumber'><b>Phone:</b></label></td>
+					<td style='text-align:left'><label for='phoneNumber'><b><?= _("Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='phoneNumber' name='phoneNumber' value = '<?php echo $contact->phoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='altPhoneNumber'><b>Alt Phone:</b></label></td>
+					<td style='text-align:left'><label for='altPhoneNumber'><b><?= _("Alt Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='altPhoneNumber' name='altPhoneNumber' value = '<?php echo $contact->altPhoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
@@ -1878,14 +1878,14 @@
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='addressText'><b>Address:</b></label></td>
+					<td style='text-align:left'><label for='addressText'><b><?= _("Address:");?></b></label></td>
 					<td>
 					<textarea rows='3' id='addressText' style='width:150px'><?php echo $contact->addressText; ?></textarea>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='invalidInd'><b>Archived:</b></label></td>
+					<td style='text-align:left'><label for='invalidInd'><b><?= _("Archived:");?></b></label></td>
 					<td>
 					<input type='checkbox' id='invalidInd' name='invalidInd' <?php echo $invalidChecked; ?> />
 					</td>
@@ -1895,7 +1895,7 @@
 			<td>
 				<table class='noBorder'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b>Role(s):</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b><?= _("Role(s):");?></b></label></td>
 				<td>
 
 					<table>
@@ -1931,7 +1931,7 @@
 
 
 				<tr>
-				<td style='text-align:left'><label for='addressText'><b>Notes:</b></label></td>
+				<td style='text-align:left'><label for='addressText'><b><?= _("Notes:");?></b></label></td>
 				<td>
 				<textarea rows='3' id='noteText' style='width:220px'><?php echo $contact->noteText; ?></textarea>
 				</td>
@@ -1954,8 +1954,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitContactForm' id ='submitContactForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitContactForm' id ='submitContactForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -1992,7 +1992,7 @@
 		<input type='hidden' name='editExternalLoginID' id='editExternalLoginID' value='<?php echo $externalLoginID; ?>'>
 
 
-		<div class='formTitle' style='width:385px;'><span class='headerText' style='margin-left:7px;'><?php if ($externalLoginID){ echo "Edit Account"; } else { echo "Add Account"; } ?></span></div>
+		<div class='formTitle' style='width:385px;'><span class='headerText' style='margin-left:7px;'><?php if ($externalLoginID){ echo _("Edit Account"); } else { echo _("Add Account"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2002,7 +2002,7 @@
 
 			<table class='noBorder' style='width:350px; margin:10px 15px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b>Login Type:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b><?= _("Login Type:");?></b></label></td>
 				<td>
 				<select name='externalLoginTypeID' id='externalLoginTypeID' class='changeSelect'>
 				<?php
@@ -2026,21 +2026,21 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b>Registered Email:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Registered Email:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $externalLogin->emailAddress; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='username'><b>Username:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='username'><b><?= _("Username:");?></b></label></td>
 				<td>
 				<input type='text' id='username' name='username' value = '<?php echo $externalLogin->username; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='password'><b>Password:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='password'><b><?= _("Password:");?></b></label></td>
 				<td>
 				<input type='text' id='password' name='password' value = '<?php echo $externalLogin->password; ?>' style='width:200px' class='changeInput' />
 				</td>
@@ -2061,8 +2061,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -2095,7 +2095,7 @@
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 		<input type='hidden' name='editAttachmentID' id='editAttachmentID' value='<?php echo $attachmentID; ?>'>
 
-		<div class='formTitle' style='width:345px;'><span class='headerText' style='margin-left:7px;'><?php if ($attachmentID){ echo "Edit Attachment"; } else { echo "Add Attachment"; } ?></span></div>
+		<div class='formTitle' style='width:345px;'><span class='headerText' style='margin-left:7px;'><?php if ($attachmentID){ echo _("Edit Attachment"); } else { echo _("Add Attachment"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2106,7 +2106,7 @@
 			<table class='noBorder' style='width:310px; margin:10px 15px;'>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b>Name:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b><?= _("Name:");?></b></label></td>
 			<td>
 			<input type='text' class='changeInput' id='shortName' name='shortName' value = '<?php echo $attachment->shortName; ?>' style='width:230px' /><span id='span_error_shortName' class='smallDarkRedText'></span>
 			</td>
@@ -2114,7 +2114,7 @@
 
 			<tr>
 
-			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b>Type:</b></label></td>
+			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b><?= _("Type:");?></b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 
 			<select name='attachmentTypeID' id='attachmentTypeID'>
@@ -2134,13 +2134,13 @@
 			</tr>
 
 			<tr>
-			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b>File:</b></label></td>
+			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b><?= _("File:");?></b></label></td>
 			<td>
 			<?php
 
 			//if editing
 			if ($attachmentID){
-				echo "<div id='div_uploadFile'>" . $attachment->attachmentURL . "<br /><a href='javascript:replaceFile();'>replace with new file</a>";
+				echo "<div id='div_uploadFile'>" . $attachment->attachmentURL . "<br /><a href='javascript:replaceFile();'>"._("replace with new file")."</a>";
 				echo "<input type='hidden' id='upload_button' name='upload_button' value='" . $attachment->attachmentURL . "'></div>";
 
 			//if adding
@@ -2155,7 +2155,7 @@
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b>Details:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b><?= _("Details:");?></b></label></td>
 			<td><textarea rows='5' class='changeInput' id='descriptionText' name='descriptionText' style='width:230px'><?php echo $attachment->descriptionText; ?></textarea></td>
 			</td>
 			</tr>
@@ -2168,8 +2168,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove()"></td>
 			</tr>
 		</table>
 
@@ -2203,7 +2203,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2218,7 +2218,7 @@
 			<?php
 				if($className == 'ResourceType' && ($config->settings->usageModule == 'Y')){
 					if($instance->includeStats == 1){$stats = 'checked';}else{$stats='';}
-					echo "<tr><td><label for='stats'>Show stats button?</label>";
+					echo "<tr><td><label for='stats'>"._("Show stats button?")."</label>";
 					echo "<input type='checkbox' id='stats' ".$stats." /></td></tr>";
 				}
 			?>
@@ -2231,8 +2231,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -2276,7 +2276,7 @@
 
 		<input type='hidden' id='editCurrencyCode' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit Currency"; } else { echo "Add Currency"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit Currency"); } else { echo _("Add Currency"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2286,10 +2286,10 @@
 
 			<table class='noBorder' style='width:200px; margin:10px;'>
 			<tr>
-			<td>Code</td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
+			<td><?= _("Code");?></td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
 			</tr>
 			<tr>
-			<td>Name</td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
+			<td><?= _("Name");?></td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
 			</tr>
 			</table>
 
@@ -2300,8 +2300,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -2365,7 +2365,7 @@
 
 		<input type='hidden' id='editLoginID' value='<?php echo $loginID; ?>'>
 
-		<div class='formTitle' style='width:295px;'><span class='headerText' style='margin-left:7px;'><?php if ($loginID){ echo "Edit User"; } else { echo "Add New User"; } ?></span></div>
+		<div class='formTitle' style='width:295px;'><span class='headerText' style='margin-left:7px;'><?php if ($loginID){ echo _("Edit User"); } else { echo _("Add New User"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2376,11 +2376,11 @@
 			<table class='noBorder' style='width:260px; margin:10px;'>
 
 
-				<tr><td><label for='loginID'><b>Login ID</b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
-				<tr><td><label for='firstName'><b>First Name</b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='lastName'><b>Last Name</b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='emailAddress'><b>Email Address</b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='privilegeID'><b>Privilege</b></label</td>
+				<tr><td><label for='loginID'><b><?= _("Login ID");?></b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
+				<tr><td><label for='firstName'><b><?= _("First Name");?></b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='lastName'><b><?= _("Last Name");?></b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='emailAddress'><b><?= _("Email Address");?></b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='privilegeID'><b><?= _("Privilege");?></b></label</td>
 				<td>
 				<select id='privilegeID' style='width:155px'>
 				<?php
@@ -2398,7 +2398,7 @@
 				</td>
 				</tr>
 
-				<tr><td><label for='accountTab'><b>View Accounts</b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
+				<tr><td><label for='accountTab'><b><?= _("View Accounts");?></b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
 
 
 			</table>
@@ -2410,8 +2410,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -2483,7 +2483,7 @@
 
 		<input type='hidden' id='editAlertEmailAddressID' value='<?php echo $alertEmailAddressID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertEmailAddressID){ echo "Edit Alert Email Address"; } else { echo "Add Alert Email Address"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertEmailAddressID){ echo _("Edit Alert Email Address"); } else { echo _("Add Alert Email Address"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2503,8 +2503,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -2555,7 +2555,7 @@
 
 		<input type='hidden' id='editAlertDaysInAdvanceID' value='<?php echo $alertDaysInAdvanceID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertDaysInAdvanceID){ echo "Edit Alert Days In Advance"; } else { echo "Add Alert Days In Advance"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertDaysInAdvanceID){ echo _("Edit Alert Days In Advance"); } else { echo _("Add Alert Days In Advance"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2575,8 +2575,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -2652,7 +2652,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editWFID' id='editWFID' value='<?php echo $workflowID; ?>'>
 
-		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'>Edit Workflow</span></div>
+		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'><?= _("Edit Workflow");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2661,14 +2661,14 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>Resource Entry Requirements</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("Resource Entry Requirements");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:660px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'>Acquisition Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'><?= _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect' >
 				<?php
@@ -2684,7 +2684,7 @@
 				</td>
 
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'>Format:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?= _("Format:");?></label></td>
 				<td>
 				<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
 				<?php
@@ -2699,7 +2699,7 @@
 				</select>
 				</td>
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'>Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'><?= _("Type:");?></label></td>
 				<td>
 				<select name='resourceTypeID' id='resourceTypeID' style='width:100px;' class='changeSelect' >
 				<option value=''></option>
@@ -2724,7 +2724,7 @@
 			<div style='height:20px;'>&nbsp;</div>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b>Workflow Steps</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b><?= _("Workflow Steps");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
@@ -2733,9 +2733,9 @@
 				<table class='noBorder noMargin newStepTable' style='width:660px;  margin:15px 20px 0px 20px;'>
 				<tr>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;width:48px;'>&nbsp;</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'>Name:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'>Approval/Notification Group:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'>Parent Step</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'><?= _("Name:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'><?= _("Approval/Notification Group:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'><?= _("Parent Step");?></td>
 					<td style='vertical-align:top;text-align:center;width:40px;'>&nbsp;</td>
 				</tr>
 
@@ -2765,7 +2765,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:center;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt='add step' title='add step'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt='<?= _("add step");?>' title='<?= _("add step");?>'></a>
 				</td>
 
 				</tr>
@@ -2848,7 +2848,7 @@
 
 
 						<td style='vertical-align:top;text-align:center;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this step' title='remove this step' class='removeStep' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove this step");?>' title='<?= _("remove this step");?>' class='removeStep' /></a>
 						</td>
 
 						</tr>
@@ -2876,8 +2876,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -2912,7 +2912,7 @@
 		<form id='userGroupForm'>
 		<input type='hidden' name='editUserGroupID' id='editUserGroupID' value='<?php echo $userGroupID; ?>'>
 
-		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php if ($userGroupID){ echo "Edit User Group"; } else { echo "Add User Group"; } ?></span></div>
+		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php if ($userGroupID){ echo _("Edit User Group"); } else { echo _("Add User Group"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -2921,7 +2921,7 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>User Group</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("User Group");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -2929,14 +2929,14 @@
 
 				<table class='noBorder' style='width:235px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b>Group Name:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b><?= _("Group Name:");?></b></label></td>
 				<td>
 				<input type='text' id='groupName' name='groupName' value = '<?php echo $userGroup->groupName; ?>' style='width:110px' class='changeInput' /><span id='span_error_groupName' class='smallDarkRedText'></span>
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b>Email Address:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Email Address:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $userGroup->emailAddress; ?>' style='width:110px' class='changeInput' />
 				</td>
@@ -2953,7 +2953,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b>Assigned Users</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b><?= _("Assigned Users");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -2977,7 +2977,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt='add user' title='add user'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt='<?= _("add user");?>' title='<?= _("add user");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -3016,7 +3016,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove user from group' title='remove user from group' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove user from group");?>' title='<?= _("remove user from group");?>' class='remove' /></a>
 						</td>
 						</tr>
 					<?php
@@ -3042,8 +3042,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -3073,7 +3073,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -3095,8 +3095,8 @@
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
 
-				<td style='text-align:left'><input type='button' value='submit' name='submitGeneralSubjectForm' id ='submitGeneralSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitGeneralSubjectForm' id ='submitGeneralSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -3126,7 +3126,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -3148,8 +3148,8 @@
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
 
-				<td style='text-align:left'><input type='button' value='submit' name='submitDetailedSubjectForm' id ='submitDetailedSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitDetailedSubjectForm' id ='submitDetailedSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
@@ -3182,7 +3182,7 @@
 		<form id='detailedSubjectForm'>
 		<input type='hidden' name='editgeneralSubjectID' id='editgeneralSubjectID' value='<?php echo $generalSubjectID; ?>'>
 
-		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php echo "Add / Edit Subject Relationships"; ?></span></div>
+		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?= _("Add / Edit Subject Relationships"); ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -3191,7 +3191,7 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>General Subject</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("General Subject");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -3217,7 +3217,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='detailedSubjectID'><b>Detailed Subjects</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='detailedSubjectID'><b><?= _("Detailed Subjects");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -3239,7 +3239,7 @@
 						</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='adddetailedSubject' alt='add detail subject' title='add detail subject'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='adddetailedSubject' alt='<?= _("add detail subject");?>' title='<?= _("add detail subject");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -3269,9 +3269,9 @@
 							// Check to see if detail subject is in use.  If not allow removal.
 							$subjectObj = new DetailedSubject();
 							if ($subjectObj->inUse($dsSubject->detailedSubjectID, $generalSubject->generalSubjectID) == 0)  { ?>
-								<a href='javascript:void();'><img src='images/cross.gif' alt='remove detailed subject' title='remove detailed subject' class='remove' /></a>
+								<a href='javascript:void();'><img src='images/cross.gif' alt='<?= _("remove detailed subject");?>' title='<?= _("remove detailed subject");?>' class='remove' /></a>
 						<?php } else { ?>
-								<img src='images/do_not_enter.png' alt='subject in use' title='subject in use' />
+								<img src='images/do_not_enter.png' alt='<?= _("subject in use");?>' title='<?= _("subject in use");?>' />
 						<?php }  ?>
 						</td>
 						</tr>
@@ -3292,8 +3292,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitDetailSubjectForm' id ='submitDetailSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitDetailSubjectForm' id ='submitDetailSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
@@ -3315,15 +3315,15 @@
 
 	?>
 		<div id='div_updateForm'>
-		<div class='formTitle' style='width:403px;'><span class='headerText' style='margin-left:7px;'></span>Add General / Detail Subject Link</div>
+		<div class='formTitle' style='width:403px;'><span class='headerText' style='margin-left:7px;'></span><?= _("Add General / Detail Subject Link");?></div>
 
 	<?php
 		if (count($generalSubjectArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>General Subject Name</th>
-				<th>Detail Subject Name</th>
+				<th><?= _("General Subject Name");?></th>
+				<th><?= _("Detail Subject Name");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -3335,14 +3335,14 @@
 					echo "<tr>";
 					echo "<td>" . $generalSubject->shortName . "</td>";
 					echo "<td></td>";
-					echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . -1 . "'><img src='images/add.gif' alt='add' title='add'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . -1 . "'><img src='images/add.gif' alt='"._("add")."' title='"._("add")."'></a></td>";
 
 					foreach ($generalSubject->getDetailedSubjects() as $detailedSubjects){
 						echo "<tr>";
 						echo "<td></td>";
 						echo "<td>";
 						echo $detailedSubjects->shortName . "</td>";
-						echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . $detailedSubjects->detailedSubjectID . "'><img src='images/add.gif' alt='add' title='add'></a></td>";
+						echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . $detailedSubjects->detailedSubjectID . "'><img src='images/add.gif' alt='"._("add")."' title='"._("add")."'></a></td>";
 						echo "</tr>";
 					}
 					echo "</tr>";
@@ -3353,7 +3353,7 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 		?>
 
@@ -3371,7 +3371,7 @@
 
 
 	default:
-       echo "Action " . $action . " not set up!";
+       echo _("Action ") . $action . _(" not set up!");
        break;
 
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 376370ae1e5e0ef5a86f5e1509151b23e041dd5f..ec17db62798564bcaa5a72b513239b865b3bf842 100644
GIT binary patch
literal 12774
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
Xa0_mC>#UolRkIgS0Gx<3lo9+tyEfL$

delta 2845
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
IGV2oaZvh#`0RR91

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 3419ef3..9cb6fa1 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-03 17:18+0100\n"
-"PO-Revision-Date: 2015-04-03 17:18+0100\n"
+"POT-Creation-Date: 2015-04-07 14:30+0100\n"
+"PO-Revision-Date: 2015-04-07 14:31+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -31,7 +31,7 @@ msgstr "Mèthode d'accès"
 msgid "Account Type"
 msgstr "Type d'account"
 
-#: admin.php:55 index.php:100
+#: admin.php:55 ajax_forms.php:279 index.php:100
 msgid "Acquisition Type"
 msgstr "Type d'acquisition"
 
@@ -91,7 +91,7 @@ msgstr "Type d'ordre"
 msgid "Organization Role"
 msgstr "Rôle dans l'organisation"
 
-#: admin.php:78
+#: admin.php:78 ajax_forms.php:747
 msgid "Organizations"
 msgstr "Organisation"
 
@@ -103,7 +103,7 @@ msgstr "Site d'achat"
 msgid "Resource Format"
 msgstr "Format de la ressource"
 
-#: admin.php:84 index.php:210
+#: admin.php:84 ajax_forms.php:466 index.php:210
 msgid "Resource Type"
 msgstr "Type de ressource"
 
@@ -151,6 +151,548 @@ msgstr "Modifier selections DDW facet/term à: "
 msgid "Email template file not found: "
 msgstr "Le fichier template pour l'email est introuvable: "
 
+#: ajax_forms.php:47
+msgid "Edit Note"
+msgstr "Modifier une note"
+
+#: ajax_forms.php:47
+msgid "Add Note"
+msgstr "Ajouter une note"
+
+#: ajax_forms.php:57
+msgid "Note Type:"
+msgstr "Type de note:"
+
+#: ajax_forms.php:77 ajax_forms.php:1934
+msgid "Notes:"
+msgstr "Notes:"
+
+#: ajax_forms.php:90 ajax_forms.php:538 ajax_forms.php:941 ajax_forms.php:1296
+#: ajax_forms.php:1505 ajax_forms.php:1780 ajax_forms.php:1957
+#: ajax_forms.php:2064 ajax_forms.php:2171 ajax_forms.php:2234
+#: ajax_forms.php:2303 ajax_forms.php:2413 ajax_forms.php:2506
+#: ajax_forms.php:2578 ajax_forms.php:2879 ajax_forms.php:3045
+#: ajax_forms.php:3098 ajax_forms.php:3151 ajax_forms.php:3295
+#: resources/cataloging_edit.php:102
+msgid "submit"
+msgstr "Confirmer"
+
+#: ajax_forms.php:91 ajax_forms.php:539 ajax_forms.php:942 ajax_forms.php:1297
+#: ajax_forms.php:1506 ajax_forms.php:1781 ajax_forms.php:1958
+#: ajax_forms.php:2065 ajax_forms.php:2172 ajax_forms.php:2235
+#: ajax_forms.php:2304 ajax_forms.php:2414 ajax_forms.php:2507
+#: ajax_forms.php:2579 ajax_forms.php:2880 ajax_forms.php:3046
+#: ajax_forms.php:3099 ajax_forms.php:3152 ajax_forms.php:3296
+#: resources/cataloging_edit.php:103
+msgid "cancel"
+msgstr "Annuler"
+
+#: ajax_forms.php:188
+msgid "Edit Saved Resource"
+msgstr "Modifier ressource enregistré"
+
+#: ajax_forms.php:188
+msgid "Add New Resource"
+msgstr "Ajouter une nouvelle ressource"
+
+#: ajax_forms.php:189
+msgid "* required fields"
+msgstr "* champs obligatoires"
+
+#: ajax_forms.php:195 ajax_forms.php:635
+msgid "Product"
+msgstr "Produit"
+
+#: ajax_forms.php:204 ajax_forms.php:645 ajax_forms.php:1839
+#: ajax_forms.php:2109 ajax_forms.php:2736
+msgid "Name:"
+msgstr "Nom:"
+
+#: ajax_forms.php:209 ajax_forms.php:650
+msgid "Description:"
+msgstr "Description:"
+
+#: ajax_forms.php:214
+msgid "Provider:"
+msgstr "Fournisseur:"
+
+#: ajax_forms.php:235
+msgid "Format"
+msgstr "Format"
+
+#: ajax_forms.php:326 ajax_forms.php:1104
+msgid "Initial Cost"
+msgstr "Coût Initial"
+
+#: ajax_forms.php:335 ajax_forms.php:1112
+msgid "Fund:"
+msgstr "Fond:"
+
+#: ajax_forms.php:336 ajax_forms.php:1113
+msgid "Price:"
+msgstr "Prix:"
+
+#: ajax_forms.php:337 ajax_forms.php:707 ajax_forms.php:848
+#: ajax_forms.php:1114 ajax_forms.php:2117 ajax_forms.php:2702
+msgid "Type:"
+msgstr "Type:"
+
+#: ajax_forms.php:382 ajax_forms.php:1157
+msgid "add this payment"
+msgstr "ajouter ce payment"
+
+#: ajax_forms.php:382 ajax_forms.php:1157
+msgid "add payment"
+msgstr "ajouter un payment"
+
+#: ajax_forms.php:446 ajax_forms.php:1220
+msgid "remove this payment"
+msgstr "effacer ce payment"
+
+#: ajax_forms.php:512
+msgid "Notes"
+msgstr "Notes"
+
+#: ajax_forms.php:521
+msgid "Include any additional information"
+msgstr "Inclure quelque information additional"
+
+#: ajax_forms.php:537
+msgid "save"
+msgstr "Enregistrer"
+
+#: ajax_forms.php:626
+msgid "Edit Resource"
+msgstr "Modifier la ressource"
+
+#: ajax_forms.php:672
+msgid "Parent:"
+msgstr "Parent:"
+
+#: ajax_forms.php:688 ajax_forms.php:2687
+msgid "Format:"
+msgstr "Format:"
+
+#: ajax_forms.php:726 ajax_forms.php:1888
+msgid "Archived:"
+msgstr "Archivé:"
+
+#: ajax_forms.php:755
+msgid "Role:"
+msgstr "Rôle:"
+
+#: ajax_forms.php:756
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: ajax_forms.php:778
+msgid "add organization"
+msgstr "Ajouter une organisation"
+
+#: ajax_forms.php:818
+msgid "remove organization"
+msgstr "Supprimer une organisation"
+
+#: ajax_forms.php:818 ajax_forms.php:1417
+msgid "remove "
+msgstr "supprimer "
+
+#: ajax_forms.php:818
+msgid " organization"
+msgstr " organisation"
+
+#: ajax_forms.php:840
+msgid "Aliases"
+msgstr "Des alias:"
+
+#: ajax_forms.php:849
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ajax_forms.php:871
+msgid "add this alias"
+msgstr "ajouter cet alias"
+
+#: ajax_forms.php:871
+msgid "add alias"
+msgstr "ajouter alias"
+
+#: ajax_forms.php:912
+msgid "remove this alias"
+msgstr "effacer cet alias"
+
+#: ajax_forms.php:1029
+msgid "Edit Acquisitions Information"
+msgstr "modifier l'information des acquisitions"
+
+#: ajax_forms.php:1038
+msgid "Order"
+msgstr "Ordre"
+
+#: ajax_forms.php:1045 ajax_forms.php:2671
+msgid "Acquisition Type:"
+msgstr "Type d'acquisition:"
+
+#: ajax_forms.php:1063
+msgid "Order Number:"
+msgstr "Numero d'ordre:"
+
+#: ajax_forms.php:1068
+msgid "System Number:"
+msgstr "Nombre de système:"
+
+#: ajax_forms.php:1073
+msgid "Subscription Start:"
+msgstr "Début d'abonnement:"
+
+#: ajax_forms.php:1078
+msgid "Subscription End:"
+msgstr "Fin d'abonnement:"
+
+#: ajax_forms.php:1088
+msgid "Enable Alert"
+msgstr "Activer l'alerte"
+
+#: ajax_forms.php:1247
+msgid "Purchasing Site(s)"
+msgstr "Site d'achat(s)"
+
+#: ajax_forms.php:1364
+msgid "Edit Licenses"
+msgstr "Modifier les licences"
+
+#: ajax_forms.php:1374
+msgid "License Records"
+msgstr "Licences entregistrées"
+
+#: ajax_forms.php:1390
+msgid "add license"
+msgstr "ajouter une licence"
+
+#: ajax_forms.php:1417
+msgid "remove license link"
+msgstr "supprimer lien de la licence"
+
+#: ajax_forms.php:1417
+msgid " license"
+msgstr " licence"
+
+#: ajax_forms.php:1442
+msgid "Licensing Status"
+msgstr "Statut des licences"
+
+#: ajax_forms.php:1450
+msgid "Status:"
+msgstr "Statut:"
+
+#: ajax_forms.php:1474
+msgid "History:"
+msgstr "Historie:"
+
+#: ajax_forms.php:1480 resources/cataloging.php:223
+msgid " by "
+msgstr " par "
+
+#: ajax_forms.php:1483
+msgid "No license status information available."
+msgstr "L'information de statut de la licence n'est pas disponible."
+
+#: ajax_forms.php:1588
+msgid "Edit Access"
+msgstr "Modifier l'accès"
+
+#: ajax_forms.php:1597
+msgid "Access"
+msgstr "Acèss"
+
+#: ajax_forms.php:1604
+msgid "Authentication Type:"
+msgstr "Type d'accès:"
+
+#: ajax_forms.php:1619 ajax_forms.php:2036
+msgid "Username:"
+msgstr "Nom d'utilisateur:"
+
+#: ajax_forms.php:1623
+msgid "Access Method:"
+msgstr "Mèthode d'accès:"
+
+#: ajax_forms.php:1638 ajax_forms.php:2043
+msgid "Password:"
+msgstr "Mot de passe:"
+
+#: ajax_forms.php:1642
+msgid "Storage Location:"
+msgstr "Lieu de stockage:"
+
+#: ajax_forms.php:1657
+msgid "Simultaneous User Limit:"
+msgstr "Limite d'utilisateurs similtanées"
+
+#: ajax_forms.php:1674
+msgid "Coverage:"
+msgstr "Coverture:"
+
+#: ajax_forms.php:1692
+msgid "Authorized Site(s)"
+msgstr "Site(s) autorisé(s)"
+
+#: ajax_forms.php:1737
+msgid "Administering Site(s)"
+msgstr "Administration du site(s)"
+
+#: ajax_forms.php:1826
+msgid "Edit Contact"
+msgstr "Modifierl le contact"
+
+#: ajax_forms.php:1826
+msgid "Add Contact"
+msgstr "Ajouter un contact"
+
+#: ajax_forms.php:1846
+msgid "Title:"
+msgstr "Titre:"
+
+#: ajax_forms.php:1853
+msgid "Phone:"
+msgstr "Téléphone:"
+
+#: ajax_forms.php:1860
+msgid "Alt Phone:"
+msgstr "Alt Téléphone:"
+
+#: ajax_forms.php:1881
+msgid "Address:"
+msgstr "Adresse:"
+
+#: ajax_forms.php:1898
+msgid "Role(s):"
+msgstr "Rôle(s)"
+
+#: ajax_forms.php:1995
+msgid "Edit Account"
+msgstr "Modifier la compte"
+
+#: ajax_forms.php:1995
+msgid "Add Account"
+msgstr "Ajouter une compte"
+
+#: ajax_forms.php:2005
+msgid "Login Type:"
+msgstr "Type d'acèss (login):"
+
+#: ajax_forms.php:2029
+msgid "Registered Email:"
+msgstr "Email enregistré:"
+
+#: ajax_forms.php:2098
+msgid "Edit Attachment"
+msgstr "Modifier la fixation"
+
+#: ajax_forms.php:2098
+msgid "Add Attachment"
+msgstr "Ajouter fixation"
+
+#: ajax_forms.php:2137
+msgid "File:"
+msgstr "Fichier:"
+
+#: ajax_forms.php:2143
+msgid "replace with new file"
+msgstr "remplacer avec un nouveau fichier"
+
+#: ajax_forms.php:2158
+msgid "Details:"
+msgstr "Détails:"
+
+#: ajax_forms.php:2206 ajax_forms.php:3076 ajax_forms.php:3129
+msgid "Edit "
+msgstr "Modifier"
+
+#: ajax_forms.php:2206 ajax_forms.php:3076 ajax_forms.php:3129
+msgid "Add "
+msgstr "Ajouter"
+
+#: ajax_forms.php:2221
+msgid "Show stats button?"
+msgstr "Montrer les boutons de statistiques?"
+
+#: ajax_forms.php:2279
+msgid "Edit Currency"
+msgstr "Modifier la Concurrence"
+
+#: ajax_forms.php:2279
+msgid "Add Currency"
+msgstr "Ajouter Concurrence"
+
+#: ajax_forms.php:2289
+msgid "Code"
+msgstr "Code"
+
+#: ajax_forms.php:2292
+msgid "Name"
+msgstr "Nom"
+
+#: ajax_forms.php:2368
+msgid "Edit User"
+msgstr "Modifierl l'utilisateur"
+
+#: ajax_forms.php:2368
+msgid "Add New User"
+msgstr "Ajouter un nouveau utilisateur"
+
+#: ajax_forms.php:2379
+msgid "Login ID"
+msgstr "Identifiant d'accès"
+
+#: ajax_forms.php:2380
+msgid "First Name"
+msgstr "Prènom"
+
+#: ajax_forms.php:2381
+msgid "Last Name"
+msgstr "Nom"
+
+#: ajax_forms.php:2382
+msgid "Email Address"
+msgstr "Adresse email"
+
+#: ajax_forms.php:2383
+msgid "Privilege"
+msgstr "Privilège"
+
+#: ajax_forms.php:2401
+msgid "View Accounts"
+msgstr "Montrer les comptes"
+
+#: ajax_forms.php:2486
+msgid "Edit Alert Email Address"
+msgstr "Modifier l'alerte d'adresse email"
+
+#: ajax_forms.php:2486
+msgid "Add Alert Email Address"
+msgstr "Ajouter alerte d'adresse email"
+
+#: ajax_forms.php:2558
+msgid "Edit Alert Days In Advance"
+msgstr "Modifier l'alerte jours à l'avance"
+
+#: ajax_forms.php:2558
+msgid "Add Alert Days In Advance"
+msgstr "Ajouter alerte jours à l'avance"
+
+#: ajax_forms.php:2655
+msgid "Edit Workflow"
+msgstr "Modifier le flux de travail"
+
+#: ajax_forms.php:2664
+msgid "Resource Entry Requirements"
+msgstr "Conditions d'entrée des ressources"
+
+#: ajax_forms.php:2727
+msgid "Workflow Steps"
+msgstr "Étapes du Flux de travail"
+
+#: ajax_forms.php:2737
+msgid "Approval/Notification Group:"
+msgstr "Approbation/Notification de Groupe"
+
+#: ajax_forms.php:2738
+msgid "Parent Step"
+msgstr "Parent étape"
+
+#: ajax_forms.php:2768
+msgid "add step"
+msgstr "ajouter une étape"
+
+#: ajax_forms.php:2851
+msgid "remove this step"
+msgstr "effacer cet étape"
+
+#: ajax_forms.php:2915
+msgid "Edit User Group"
+msgstr "Modifier le groupe d'utilisateur"
+
+#: ajax_forms.php:2915
+msgid "Add User Group"
+msgstr "Ajouter groupé d'utilisateur"
+
+#: ajax_forms.php:2924
+msgid "User Group"
+msgstr "Group d'utilisateur"
+
+#: ajax_forms.php:2932
+msgid "Group Name:"
+msgstr "Nom du groupe"
+
+#: ajax_forms.php:2939
+msgid "Email Address:"
+msgstr "Adresse email"
+
+#: ajax_forms.php:2956
+msgid "Assigned Users"
+msgstr "Utilisateurs asignés"
+
+#: ajax_forms.php:2980
+msgid "add user"
+msgstr "Ajouter un utilisateur"
+
+#: ajax_forms.php:3019
+msgid "remove user from group"
+msgstr "Supprimer un utilisateur du groupe"
+
+#: ajax_forms.php:3185
+msgid "Add / Edit Subject Relationships"
+msgstr "Ajouter / Modifier la relation des objets"
+
+#: ajax_forms.php:3194 index.php:251
+msgid "General Subject"
+msgstr "Sujet général"
+
+#: ajax_forms.php:3220
+msgid "Detailed Subjects"
+msgstr "Objet détaillé"
+
+#: ajax_forms.php:3242
+msgid "add detail subject"
+msgstr "Ajouter detail d'objet"
+
+#: ajax_forms.php:3272
+msgid "remove detailed subject"
+msgstr "Supprimer objet détaillé"
+
+#: ajax_forms.php:3274
+msgid "subject in use"
+msgstr "Objet en utilisation"
+
+#: ajax_forms.php:3318
+msgid "Add General / Detail Subject Link"
+msgstr "Ajouter général / détail lien d'objet"
+
+#: ajax_forms.php:3325
+msgid "General Subject Name"
+msgstr "Nom général d'objet"
+
+#: ajax_forms.php:3326
+msgid "Detail Subject Name"
+msgstr "Détail du nom d'objet"
+
+#: ajax_forms.php:3338 ajax_forms.php:3345
+msgid "add"
+msgstr "ajouter"
+
+#: ajax_forms.php:3356
+msgid "(none found)"
+msgstr "(non trouvé)"
+
+#: ajax_forms.php:3374
+msgid "Action "
+msgstr "Action"
+
+#: ajax_forms.php:3374
+msgid " not set up!"
+msgstr " ne pas etabli!"
+
 #: index.php:26 templates/header.php:98
 msgid "Home"
 msgstr "Accueil"
@@ -201,10 +743,6 @@ msgstr "(aucun)"
 msgid "Record ID"
 msgstr "ID d'enregistrement"
 
-#: index.php:251
-msgid "General Subject"
-msgstr "Sujet général"
-
 #: index.php:282
 msgid "Detailed Subject"
 msgstr "Sujet détaillé"
@@ -317,25 +855,25 @@ msgstr "modifier une note"
 msgid "remove note"
 msgstr "effacer une note"
 
-#: resources/cataloging.php:223
-msgid " by "
-msgstr " par "
-
 #: resources/cataloging_edit.php:15
 msgid "Edit Cataloging"
 msgstr "Modifier le catalogage"
 
 #: resources/cataloging_edit.php:24
 msgid "Record Set"
-msgstr "jeu d'enregistrement"
+msgstr "Jeu d'enregistrement"
 
-#: resources/cataloging_edit.php:102
-msgid "submit"
-msgstr "Confirmer"
+#: resources/cataloging_edit.php:68
+msgid "# Records Available"
+msgstr "# Enregistrements disponibles"
 
-#: resources/cataloging_edit.php:103
-msgid "cancel"
-msgstr "Annuler"
+#: resources/cataloging_edit.php:75
+msgid "# Records Loaded"
+msgstr "# Enregistrements chargées"
+
+#: resources/cataloging_edit.php:82
+msgid "OCLC Holdings"
+msgstr "OCLC Holdings"
 
 #: setuser.php:44
 msgid ""
@@ -351,7 +889,7 @@ msgstr "Bonjour, "
 
 #: templates/header.php:87
 msgid "logout"
-msgstr "Se decconecter"
+msgstr "Se déconnecter"
 
 #: templates/header.php:99
 msgid "New Resource"
diff --git a/resources/cataloging_edit.php b/resources/cataloging_edit.php
index 538636b..dfc595e 100644
--- a/resources/cataloging_edit.php
+++ b/resources/cataloging_edit.php
@@ -65,21 +65,21 @@
 		<table>
     
       <tr>
-  		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('numberRecordsAvailable', '# Records Available'); ?></td>
+  		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('numberRecordsAvailable', _('# Records Available')); ?></td>
   		<td>
   		  <?php echo Html::text_field('numberRecordsAvailable', $resource, array('width' => '60px')) ?>
   		</td>
   		</tr>
 
   		<tr>
-  		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('numberRecordsLoaded', '# Records Loaded'); ?></td>
+  		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('numberRecordsLoaded', _('# Records Loaded')); ?></td>
   		<td>
   		  <?php echo Html::text_field('numberRecordsLoaded', $resource, array('width' => '60px')) ?>
   		</td>
   		</tr>
 		
 		<tr>
-		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('hasOclcHoldings', 'OCLC Holdings'); ?></td>
+		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('hasOclcHoldings', _('OCLC Holdings')); ?></td>
 		<td><input type='checkbox' value="1" id='hasOclcHoldings' name='hasOclcHoldings' <?php if ($resource->hasOclcHoldings) { echo 'checked'; } ?> /></td>
 		</tr>
 		</table>

From 3409a8eedfaf38b4e8f32b6b562490992e0b4703 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 7 Apr 2015 17:03:51 +0200
Subject: [PATCH 004/159] Translate ajax_htmldata.php

---
 ajax_htmldata.php                    | 498 +++++++++---------
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 12774 -> 12774 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 752 ++++++++++++++++++++++++---
 3 files changed, 917 insertions(+), 333 deletions(-)

diff --git a/ajax_htmldata.php b/ajax_htmldata.php
index b4748e6..4312bef 100644
--- a/ajax_htmldata.php
+++ b/ajax_htmldata.php
@@ -92,17 +92,17 @@
 			<th colspan='2' style='margin-top: 7px; margin-bottom: 5px;'>
 			<span style='float:left; vertical-align:top; max-width:400px; margin-left:3px;'><span style='font-weight:bold;font-size:120%;margin-right:8px;'><?php echo $resource->titleText; ?></span><span style='font-weight:normal;font-size:100%;'><?php echo $acquisitionType->shortName . " " . $resourceFormat->shortName . " " . $resourceType->shortName; ?></span></span>
 
-			<span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit resource'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='remove resource' title='remove resource'></a><?php } ?></span>
+			<span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit resource");?>'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?= _("remove resource");?>' title='<?= _("remove resource");?>'></a><?php } ?></span>
 			</th>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Record ID:</td>
+			<td style='vertical-align:top;width:115px;'><?= _("Record ID:");?></td>
 			<td style='width:345px;'><?php echo $resource->resourceID; ?></td>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Status:</td>
+			<td style='vertical-align:top;width:115px;'><?= _("Status:");?></td>
 			<td style='width:345px;'><?php echo $status->shortName; ?></td>
 			</tr>
 
@@ -112,7 +112,7 @@
 
 				<tr class='lightGrayBackground'>
 				<td>
-				Archived:
+				<?= _("Archived:");?>
 				</td>
 				<td>
 				<i>
@@ -121,9 +121,9 @@
 					echo format_date($resource->archiveDate);
 
 					if ($archiveUser->getDisplayName){
-						echo " by " . $archiveUser->getDisplayName;
+						echo _(" by ") . $archiveUser->getDisplayName;
 					}else if ($resource->archiveLoginID){
-						echo " by " . $resource->archiveLoginID;
+						echo _(" by ") . $resource->archiveLoginID;
 					}
 				?>
 
@@ -137,7 +137,7 @@
 
 			<tr>
 			<td>
-			Created:
+			<?= _("Created:");?>
 			</td>
 			<td>
 			<i>
@@ -146,9 +146,9 @@
 					echo format_date($resource->createDate);
 
 					if ($createUser->getDisplayName){
-						echo " by " . $createUser->getDisplayName;
+						echo _(" by ") . $createUser->getDisplayName;
 					}else if ($resource->createLoginID){
-						echo " by " . $resource->createLoginID;
+						echo _(" by ") . $resource->createLoginID;
 					}
 				?>
 
@@ -162,7 +162,7 @@
 
 				<tr>
 				<td>
-				Last Update:
+				<?= _("Last Update:");?>
 				</td>
 				<td>
 				<i>
@@ -170,9 +170,9 @@
 					echo format_date($resource->updateDate);
 
 					if ($updateUser->getDisplayName){
-						echo " by " . $updateUser->getDisplayName;
+						echo _(" by ") . $updateUser->getDisplayName;
 					}else if ($resource->updateLoginID){
-						echo " by " . $resource->updateLoginID;
+						echo _(" by ") . $resource->updateLoginID;
 					}
 				?>
 				</i>
@@ -187,16 +187,16 @@
 
 			if (($parentResource->titleText) || (count($childResourceArray) > 0)){ ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Related Products:
+				<td style='vertical-align:top;width:115px;'><?= _("Related Products:");?>
 					<?php if (count($childResourceArray) > 0) { ?>
-						<br><span style='float: right;'>Child:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br></span>
+						<br><span style='float: right;'><?= _("Child:");?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br></span>
 					<?php } ?>
 				</td>
 				<td style='width:345px;'>
 				<?php
 
 					if ($parentResource->titleText){
-						echo "<span style='float: left;'>" . $parentResource->titleText . "&nbsp;&nbsp;(Parent)&nbsp;&nbsp;<a href='resource.php?resourceID=" . $parentResource->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='view resource' title='View " . $parentResource->titleText . "' style='vertical-align:top;'></a></span><br />";
+						echo "<span style='float: left;'>" . $parentResource->titleText . "&nbsp;&nbsp;"._("(Parent)")."&nbsp;&nbsp;<a href='resource.php?resourceID=" . $parentResource->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='"._("view resource")."' title='"._("View ").$parentResource->titleText . "' style='vertical-align:top;'></a></span><br />";
 					} else {
 						echo "<br />";
 					}
@@ -209,7 +209,7 @@
 					<?php
 					foreach ($childResourceArray as $childResource){
 						$childResourceObj = new Resource(new NamedArguments(array('primaryKey' => $childResource['resourceID'])));
-						echo "<span style='float: left;'>" . $childResourceObj->titleText . "<a href='resource.php?resourceID=" . $childResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='view resource' title='View " . $childResourceObj->titleText . "' style='vertical-align:top;'></a></span><br />";
+						echo "<span style='float: left;'>" . $childResourceObj->titleText . "<a href='resource.php?resourceID=" . $childResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='"._("view resource")."' title='"._("View ") . $childResourceObj->titleText . "' style='vertical-align:top;'></a></span><br />";
 					}
 
 
@@ -233,7 +233,7 @@
 			if (count($aliasArray) > 0){
 			?>
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Aliases:</td>
+			<td style='vertical-align:top;width:115px;'><?= _("Aliases:");?></td>
 			<td style='width:345px;'>
 			<?php
 				foreach ($aliasArray as $resourceAlias){
@@ -250,14 +250,14 @@
 			?>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Organizations:</td>
+			<td style='vertical-align:top;width:115px;'><?= _("Organizations:");?></td>
 			<td style='width:345px;'>
 
 				<?php
 				foreach ($orgArray as $organization){
 					//if organizations is installed provide a link
 					if ($config->settings->organizationsModule == 'Y'){
-						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "&nbsp;&nbsp;<a href='" . $util->getOrganizationURL() . $organization['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='View " . $organization['organization'] . "' title='View " . $organization['organization'] . "' style='vertical-align:top;'></a></span><br />";
+						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "&nbsp;&nbsp;<a href='" . $util->getOrganizationURL() . $organization['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("View ") . $organization['organization'] . "' title='"._("View ") . $organization['organization'] . "' style='vertical-align:top;'></a></span><br />";
 					}else{
 						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "</span><br />";
 					}
@@ -271,8 +271,8 @@
 
 			if ($resource->resourceURL) { ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Resource URL:</td>
-				<td style='width:345px;'><?php echo $resource->resourceURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Resource URL' title='Visit Resource URL' style='vertical-align:top;'></a></td>
+				<td style='vertical-align:top;width:115px;'><?= _("Resource URL:");?></td>
+				<td style='width:345px;'><?php echo $resource->resourceURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='<?= _("Visit Resource URL");?>' title='<?= _("Visit Resource URL");?>' style='vertical-align:top;'></a></td>
 				</tr>
 			<?php
 			}
@@ -280,14 +280,14 @@
 			if ($resource->resourceAltURL) { ?>
 				<tr>
 				<td style='vertical-align:top;width:115px;'>Alt URL:</td>
-				<td style='width:345px;'><?php echo $resource->resourceAltURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceAltURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Secondary Resource URL' title='Visit Secondary Resource URL' style='vertical-align:top;'></a></td>
+				<td style='width:345px;'><?php echo $resource->resourceAltURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceAltURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='<?= _("Visit Secondary Resource URL");?>' title='<?= _("Visit Secondary Resource URL");?>' style='vertical-align:top;'></a></td>
 				</tr>
 			<?php
 			}
 
 			if ($resource->descriptionText){ ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Description:</td>
+				<td style='vertical-align:top;width:115px;'><?= _("Description:");?></td>
 				<td style='width:345px;'><?php echo nl2br($resource->descriptionText); ?></td>
 				</tr>
 			<?php } ?>
@@ -295,7 +295,7 @@
 
 		</table>
 		<?php if ($user->canEdit()){ ?>
-		<a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editResource'>edit product details</a><br />
+		<a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editResource'><?= _("edit product details");?></a><br />
 		<?php } ?>
 
 		<br />
@@ -323,7 +323,7 @@
 		?>
 			<table class='linedFormTable' style='width:460px;max-width:460px;'>
 				<tr>
-				<th>Subjects</th>
+				<th><?= _("Subjects");?></th>
 				<th>
 				</th>
 				<th>
@@ -362,7 +362,7 @@
 								<?php if ($user->canEdit() && $canDelete){ ?>
 
 
-									<a href='javascript:void(0);' tab='Product' class='removeResourceSubjectRelationship' generalDetailSubjectID='<?php echo $generalDetailSubjectID[generalDetailSubjectLinkID]; ?>' resourceID='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='remove subject' title='remove subject'></a>
+									<a href='javascript:void(0);' tab='Product' class='removeResourceSubjectRelationship' generalDetailSubjectID='<?php echo $generalDetailSubjectID[generalDetailSubjectLinkID]; ?>' resourceID='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?= _("remove subject");?>' title='<?= _("remove subject");?>'></a>
 								<?php } ?>
 							</td>
 
@@ -383,7 +383,7 @@
 
 		if ($user->canEdit()){
 		?>
-			<a href='ajax_forms.php?action=getResourceSubjectForm&height=233&width=425&tab=Product&resourceID=<?php echo $resourceID; ?>&modal=true' class='thickbox'>add new subject</a>
+			<a href='ajax_forms.php?action=getResourceSubjectForm&height=233&width=425&tab=Product&resourceID=<?php echo $resourceID; ?>&modal=true' class='thickbox'><?= _("add new subject");?></a>
 		<?php
 		}
 
@@ -430,10 +430,10 @@
 		?>
 			<table class='linedFormTable' style='width:460px;max-width:460px;'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?= _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){ ?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -441,10 +441,10 @@
 					<tr>
 					<td style='width:115px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){ ?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Product'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Product'><img src='images/cross.gif' alt='<?= _("remove note");?>' title='<?= _("remove note");?>'></a>
 					<?php } ?>
 					</td>
-					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 					</tr>
 				<?php } ?>
 			</table>
@@ -452,7 +452,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 			<?php
 			}
 		}
@@ -544,10 +544,10 @@
 			<table class='linedFormTable' style='width:460px;'>
 			<tr>
 			<th colspan='2' style='vertical-align:bottom;'>
-			<span style='float:left;vertical-align:bottom;'>Order</span>
+			<span style='float:left;vertical-align:bottom;'><?= _("Order");?></span>
 
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getOrderForm&height=462&width=783&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='edit order information'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getOrderForm&height=462&width=783&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit order information");?>'></a></span>
 			<?php } ?>
 
 			</th>
@@ -555,21 +555,21 @@
 
 			<?php if ($resource->acquisitionTypeID) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Acquisition Type:</td>
+				<td style='vertical-align:top;width:110px;'><?= _("Acquisition Type:");?></td>
 				<td style='width:350px;'><?php echo $acquisitionType->shortName; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->orderNumber) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Order Number:</td>
+				<td style='vertical-align:top;width:110px;'><?= _("Order Number:");?></td>
 				<td style='width:350px;'><?php echo $resource->orderNumber; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->systemNumber) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>System Number:</td>
+				<td style='vertical-align:top;width:110px;'><?= _("System Number:");?></td>
 				<td style='width:350px;'>
 				<?php
 					echo $resource->systemNumber;
@@ -583,23 +583,23 @@
 
 			<?php if (count($purchaseSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Purchasing Sites:</td>
+				<td style='vertical-align:top;width:110px;'><?= _("Purchasing Sites:");?></td>
 				<td style='width:350px;'><?php echo implode(", ", $purchaseSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if (!is_null_date($resource->subscriptionStartDate)) { ?>
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Subscription Start:</td>
+			<td style='vertical-align:top;width:110px;'><?= _("Subscription Start:");?></td>
 			<td style='width:350px;'><?php echo format_date($resource->subscriptionStartDate); ?></td>
 			</tr>
 			<?php } ?>
 
 			<?php if (!is_null_date($resource->subscriptionEndDate)) { ?>
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Subscription End:</td>
+			<td style='vertical-align:top;width:110px;'><?= _("Subscription End:");?></td>
 			<td style='width:350px;'><?php echo format_date($resource->subscriptionEndDate); ?>&nbsp;&nbsp;
-			<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>Expiration Alert Enabled</i>"; } ?>
+			<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>"._("Expiration Alert Enabled")."</i>"; } ?>
 			</td>
 			</tr>
 			<?php } ?>
@@ -609,7 +609,7 @@
 
 			<table class='linedFormTable' style='width:460px;'>
 			<tr>
-			<th colspan='3'>Initial Cost</th>
+			<th colspan='3'><?= _("Initial Cost");?></th>
 			</th>
 			</tr>
 
@@ -639,13 +639,13 @@
 				<?php
 				}
 			}else{
-				echo "<tr><td colspan='3'><i>No payment information available.</i></td></tr>";
+				echo "<tr><td colspan='3'><i>"._("No payment information available.")."</i></td></tr>";
 			}
 			?>
 
 			</table>
 			<?php if ($user->canEdit()){ ?>
-				<a href='ajax_forms.php?action=getOrderForm&height=462&width=783&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAlias'>edit acquisitions information</a>
+				<a href='ajax_forms.php?action=getOrderForm&height=462&width=783&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAlias'><?= _("edit acquisitions information");?></a>
 			<?php } ?>
 			<br />
 			<br />
@@ -655,24 +655,24 @@
 			<table class='linedFormTable' style='width:460px;'>
 			<tr>
 			<th colspan='2'>
-			<span style='float:left;vertical-align:bottom;'>License</span>
+			<span style='float:left;vertical-align:bottom;'><?= _("License");?></span>
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getLicenseForm&height=420&width=385&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editLicense'><img src='images/edit.gif' alt='edit' title='edit resource'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getLicenseForm&height=420&width=385&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editLicense'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit resource");?>'></a></span>
 			<?php } ?>
 			</th>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Status:</td>
+			<td style='vertical-align:top;width:110px;'><?= _("Status:");?></td>
 			<td style='width:350px;'>
 
 			<?php
 			if (count($licenseStatusArray) > 0){
 				foreach ($licenseStatusArray as $licenseStatus){
-					echo $licenseStatus['licenseStatus'] . " on <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . " by " . $licenseStatus['changeName'] . "</i><br />";
+					echo $licenseStatus['licenseStatus'] . _(" on ")."<i>" . format_date($licenseStatus['licenseStatusChangeDate']) . _(" by ") . $licenseStatus['changeName'] . "</i><br />";
 				}
 			}else{
-				echo "<i>No license status information available.</i>";
+				echo "<i>"._("No license status information available.")."</i>";
 			}
 
 			?>
@@ -682,16 +682,16 @@
 			<?php if ($config->settings->licensingModule == "Y"){ ?>
 
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Licenses:</td>
+			<td style='vertical-align:top;width:110px;'><?= _("Licenses:");?></td>
 			<td style='width:350px;'>
 			<?php
 
 			if (count($licenseArray) > 0){
 				foreach ($licenseArray as $license){
-					echo $license['license'] . "&nbsp;&nbsp;<a href='" . $util->getLicensingURL() . $license['licenseID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='View License' title='View License' style='vertical-align:top;'></a><br />";
+					echo $license['license'] . "&nbsp;&nbsp;<a href='" . $util->getLicensingURL() . $license['licenseID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("View License")."' title='"._("View License")."' style='vertical-align:top;'></a><br />";
 				}
 			}else{
-				echo "<i>No associated licenses available.</i>";
+				echo "<i>"._("No associated licenses available.")."</i>";
 			}
 
 			?>
@@ -705,9 +705,9 @@
 			</table>
 			<?php if ($user->canEdit()){ ?>
 				<?php if ($config->settings->licensingModule == "Y"){ ?>
-					<a href='ajax_forms.php?action=getLicenseForm&height=420&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit license and status</a>
+					<a href='ajax_forms.php?action=getLicenseForm&height=420&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?= _("edit license and status");?></a>
 				<?php }else{ ?>
-					<a href='ajax_forms.php?action=getLicenseForm&height=300&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit license status</a>
+					<a href='ajax_forms.php?action=getLicenseForm&height=300&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?= _("edit license status");?></a>
 				<?php } ?>
 			<?php } ?>
 			<br /><br /><br /><br />
@@ -749,10 +749,10 @@
 		?>
 			<table class='linedFormTable' style='width:460px;max-width:460px;'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?= _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -760,10 +760,10 @@
 					<tr>
 					<td style='width:110px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Acquisitions'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Acquisitions'><img src='images/cross.gif' alt='<?= _("remove note");?>' title='<?= _("remove note");?>'></a>
 					<?php } ?>
 					</td>
-					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 					</tr>
 				<?php } ?>
 			</table>
@@ -771,7 +771,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 			<?php
 			}
 		}
@@ -814,11 +814,11 @@
 			<table class='linedFormTable' style='width:460px;'>
 			<tr>
 			<th colspan='2'>
-			<span style='float:left;vertical-align:bottom;'>Access Information</span>
+			<span style='float:left;vertical-align:bottom;'><?= _("Access Information");?></span>
 
 
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><img src='images/edit.gif' alt='edit' title='edit resource'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit resource");?>'></a></span>
 			<?php } ?>
 
 			</th>
@@ -826,21 +826,21 @@
 
 			<?php if (count($administeringSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Administering Sites:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Administering Sites:");?></td>
 				<td style='width:310px;'><?php echo implode(", ", $administeringSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if (count($authorizedSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Authorized Sites:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Authorized Sites:");?></td>
 				<td style='width:310px;'><?php echo implode(", ", $authorizedSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($authenticationType->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Authentication Type:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Authentication Type:");?></td>
 				<td style='width:310px;'><?php echo $authenticationType->shortName; ?></td>
 				</tr>
 			<?php } ?>
@@ -848,14 +848,14 @@
 
 			<?php if (($resource->authenticationUserName) || ($resource->authenticationPassword)) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Username / Password:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Username / Password:");?></td>
 				<td style='width:310px;'><?php echo $resource->authenticationUserName . " / " . $resource->authenticationPassword; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($userLimit->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Simultaneous User Limit:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Simultaneous User Limit:");?></td>
 				<td style='width:310px;'><?php echo $userLimit->shortName; ?></td>
 				</tr>
 			<?php } ?>
@@ -863,7 +863,7 @@
 
 			<?php if ($resource->registeredIPAddressException){ ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Registered IP Address:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Registered IP Address:");?></td>
 				<td style='width:310px;'><?php echo $resource->registeredIPAddressException; ?></td>
 				</tr>
 			<?php } ?>
@@ -871,35 +871,35 @@
 
 			<?php if ($storageLocation->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Storage Location:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Storage Location:");?></td>
 				<td style='width:310px;'><?php echo $storageLocation->shortName; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->coverageText) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Coverage:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Coverage:");?></td>
 				<td style='width:310px;'><?php echo $resource->coverageText; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($accessMethod->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Access Method:</td>
+				<td style='vertical-align:top;width:150px;'><?= _("Access Method:");?></td>
 				<td style='width:310px;'><?php echo $accessMethod->shortName; ?></td>
 				</tr>
 			<?php
 			}
 
 			if ((count($administeringSiteArray) == 0) && (!$authenticationType->shortName) && (!$resource->coverageText) && (!$resource->authenticationUserName) && (!$resource->authenticationPassword) && (!$userLimit->shortName) && (!$resource->registeredIPAddressException) && (!$storageLocation->shortName) && (!$accessMethod->shortName)){
-				echo "<tr><td colspan='2'><i>No access information available.</i></td></tr>";
+				echo "<tr><td colspan='2'><i>"._("No access information available.")."</i></td></tr>";
 			}
 
 			?>
 			</table>
 
 			<?php if ($user->canEdit()){ ?>
-				<a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'>edit access information</a>
+				<a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><?= _("edit access information");?></a>
 			<?php } ?>
 
 			<br /><br /><br />
@@ -942,10 +942,10 @@
 		?>
 			<table class='linedFormTable' style='width:460px;max-width:460px;'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?= _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -953,7 +953,7 @@
 					<tr>
 					<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Access'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Access'><img src='images/cross.gif' alt='<?= _("remove note");?>' title='<?= _("remove note");?>'></a>
 					<?php } ?>
 					</td>
 					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
@@ -964,7 +964,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _('add new note');?></a>
 			<?php
 			}
 		}
@@ -995,7 +995,7 @@
  			//if we want archives to be displayed
  			if ($showArchivesInd == "1"){
  				if (count($resource->getArchivedContacts()) > 0){
- 					echo "<i><b>The following are archived contacts:</b></i>";
+ 					echo "<i><b>"._("The following are archived contacts:")."</b></i>";
  				}
  				$contactArray = $resource->getArchivedContacts();
  			}
@@ -1007,20 +1007,20 @@
 		if (count($contactArray) > 0){
 			foreach ($contactArray as $contact){
 				if (($resContactFlag == 0) && (!isset($contact['organizationName']))){
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Resource Specific:")."</div>";
 					$resContactFlag = 1;
 				}else if (($orgContactFlag == 0) && (isset($contact['organizationName']))){
 					if ($resContactFlag == 0){
-						echo "<i>No Resource Specific Contacts</i><br /><br />";
+						echo "<i>"._("No Resource Specific Contacts")."</i><br /><br />";
 					}
 
 					if ($user->canEdit() && ($archiveInd != 1) && ($showArchivesInd != 1)){ ?>
-						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?= _("add contact");?></a>
 						<br /><br /><br />
 					<?php
 					}
 
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Inherited:")."</div>";
 					$orgContactFlag = 1;
 				}else{
 					echo "<br />";
@@ -1040,8 +1040,8 @@
 				<span style='float:right;vertical-align:top;'>
 				<?php
 					if (($user->canEdit()) && (!isset($contact['organizationName']))){
-						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit contact'></a>";
-						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='remove note' title='remove contact'></a>";
+						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit contact")."'></a>";
+						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='"._("remove note")."' title='"._("remove contact")."'></a>";
 					}else{
 						echo "&nbsp;";
 					}
@@ -1055,8 +1055,8 @@
 				if (isset($contact['organizationName'])){ ?>
 
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Organization:</td>
-				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Contact in Organizations Module' title='Visit Contact in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
+				<td style='vertical-align:top;width:110px;'><?= _("Organization:");?></td>
+				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("Visit Contact in Organizations Module")."' title='"._("Visit Contact in Organizations Module")."' style='vertical-align:top;'></a>"; ?></td>
 				</tr>
 
 				<?php
@@ -1064,7 +1064,7 @@
 
 				if (!is_null_date($contact['archiveDate'])) { ?>
 				<tr>
-				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'>No longer valid:</td>
+				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'><?= _("No longer valid:");?></td>
 				<td style='background-color:#ebebeb'><i><?php echo format_date($contact['archiveDate']); ?></i></td>
 				</tr>
 				<?php
@@ -1072,7 +1072,7 @@
 
 				if ($contact['title']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Title:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Title:");?></td>
 				<td><?php echo $contact['title']; ?></td>
 				</tr>
 				<?php
@@ -1080,7 +1080,7 @@
 
 				if ((isset($contact['addressText'])) && ($contact['addressText'] != '')){ ?>
 					<tr>
-					<td style='vertical-align:top; width:110px;'>Address:</td>
+					<td style='vertical-align:top; width:110px;'><?= _("Address:");?></td>
 					<td><?php echo nl2br($contact['addressText']); ?></td>
 					</tr>
 				<?php
@@ -1088,7 +1088,7 @@
 
 				if ((isset($contact['state']) || (isset($contact['country']))) && (($contact['state'] != '') || ($contact['country'] != ''))){ ?>
 					<tr>
-					<td style='vertical-align:top; width:110px;'>Location:</td>
+					<td style='vertical-align:top; width:110px;'><?= _("Location:");?></td>
 					<td><?php
 						if (!($contact['state'])) {
 							echo $contact['country'];
@@ -1105,7 +1105,7 @@
 
 				if ($contact['phoneNumber']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Phone:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Phone:");?></td>
 				<td><?php echo $contact['phoneNumber']; ?></td>
 				</tr>
 				<?php
@@ -1113,7 +1113,7 @@
 
 				if ($contact['altPhoneNumber']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Alt Phone:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Alt Phone:");?></td>
 				<td><?php echo $contact['altPhoneNumber']; ?></td>
 				</tr>
 				<?php
@@ -1145,7 +1145,7 @@
 
 				if ($contact['lastUpdateDate']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Last Updated:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Last Updated:");?></td>
 				<td><i><?php echo format_date($contact['lastUpdateDate']); ?></i></td>
 				</tr>
 				<?php
@@ -1159,7 +1159,7 @@
 
 
 			if ($user->canEdit() && ($orgContactFlag == 0) && ($showArchivesInd != 1)){ ?>
-				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?= _("add contact");?></a>
 				<br /><br /><br />
 			<?php
 			}
@@ -1167,9 +1167,9 @@
 
 		} else {
 			if (($archiveInd != 1) && ($showArchivesInd != 1)){
-				echo "<i>No contacts available</i><br /><br />";
+				echo "<i>"._("No contacts available")."</i><br /><br />";
 				if (($user->canEdit())){ ?>
-					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?= _("add contact");?></a>
 					<br /><br /><br />
 				<?php
 				}
@@ -1177,11 +1177,11 @@
 		}
 
 		if (($showArchivesInd == "0") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i>" . count($resource->getArchivedContacts()) . " archived contact(s) available.  <a href='javascript:updateArchivedContacts(1);'>show archived contacts</a></i><br />";
+			echo "<i>" . count($resource->getArchivedContacts()) . _(" archived contact(s) available. ")."<a href='javascript:updateArchivedContacts(1);'>"._("show archived contacts")."</a></i><br />";
 		}
 
 		if (($showArchivesInd == "1") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i><a href='javascript:updateArchivedContacts(0);'>hide archived contacts</a></i><br />";
+			echo "<i><a href='javascript:updateArchivedContacts(0);'>"._("hide archived contacts")."</a></i><br />";
 		}
 
 		echo "<br /><br />";
@@ -1204,20 +1204,20 @@
 			foreach ($externalLoginArray as $externalLogin){
 
 				if (($resELFlag == 0) && ($externalLogin['organizationName'] == '')){
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Resource Specific:")."</div>";
 					$resELFlag = 1;
 				}else if (($orgELFlag == 0) && ($externalLogin['organizationName'] != '')){
 					if ($resELFlag == 0){
-						echo "<i>No Resource Specific Accounts</i><br /><br />";
+						echo "<i>"._("No Resource Specific Accounts")."</i><br /><br />";
 					}
 
 					if ($user->canEdit()){ ?>
-						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'>add new account</a>
+						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'><?= _("add new account");?></a>
 						<br /><br /><br />
 					<?php
 					}
 
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Inherited:")."</div>";
 					$orgELFlag = 1;
 				}else{
 					echo "<br />";
@@ -1234,7 +1234,7 @@
 				<span style='float:right;'>
 				<?php
 					if (($user->canEdit()) && ($externalLogin['organizationName'] == '')){ ?>
-						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>&externalLoginID=<?php echo $externalLogin['externalLoginID']; ?>' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit account'></a>  <a href='javascript:void(0);' class='removeAccount' id='<?php echo $externalLogin['externalLoginID']; ?>'><img src='images/cross.gif' alt='remove account' title='remove account'></a>
+						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>&externalLoginID=<?php echo $externalLogin['externalLoginID']; ?>' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?=_("edit account");?>'></a>  <a href='javascript:void(0);' class='removeAccount' id='<?php echo $externalLogin['externalLoginID']; ?>'><img src='images/cross.gif' alt='<?= _("remove account");?>' title='<?= _("remove account");?>'></a>
 						<?php
 					}else{
 						echo "&nbsp;";
@@ -1246,23 +1246,23 @@
 
 				<?php if (isset($externalLogin['organizationName'])) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Organization:</td>
-				<td><?php echo $externalLogin['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=accounts&organizationID=" . $externalLogin['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Account in Organizations Module' title='Visit Account in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
+				<td style='vertical-align:top; width:130px;'><?= _("Organization:");?></td>
+				<td><?php echo $externalLogin['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=accounts&organizationID=" . $externalLogin['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("Visit Account in Organizations Module")."' title='"._("Visit Account in Organizations Module")."' style='vertical-align:top;'></a>"; ?></td>
 				</tr>
 				<?php
 				}
 
 				if ($externalLogin['loginURL']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Login URL:</td>
-				<td><?php echo $externalLogin['loginURL']; ?>&nbsp;&nbsp;<a href='<?php echo $externalLogin['loginURL']; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Login URL' title='Visit Login URL' style='vertical-align:top;'></a></td>
+				<td style='vertical-align:top; width:130px;'><?= _("Login URL:");?></td>
+				<td><?php echo $externalLogin['loginURL']; ?>&nbsp;&nbsp;<a href='<?php echo $externalLogin['loginURL']; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='<?= _("Visit Login URL");?>' title='<?= _("Visit Login URL");?>' style='vertical-align:top;'></a></td>
 				</tr>
 				<?php
 				}
 
 				if ($externalLogin['username']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>User Name:</td>
+				<td style='vertical-align:top; width:130px;'><?= _("User Name:");?></td>
 				<td><?php echo $externalLogin['username']; ?></td>
 				</tr>
 				<?php
@@ -1270,7 +1270,7 @@
 
 				if ($externalLogin['password']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Password:</td>
+				<td style='vertical-align:top; width:130px;'><?= _("Password:");?></td>
 				<td><?php echo $externalLogin['password']; ?></td>
 				</tr>
 				<?php
@@ -1278,7 +1278,7 @@
 
 				if ($externalLogin['updateDate']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Last Updated:</td>
+				<td style='vertical-align:top; width:130px;'><?= _("Last Updated:");?></td>
 				<td><i><?php echo format_date($externalLogin['updateDate']); ?></i></td>
 				</tr>
 				<?php
@@ -1286,7 +1286,7 @@
 
 				if ($externalLogin['emailAddress']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Registered Email:</td>
+				<td style='vertical-align:top; width:130px;'><?= _("Registered Email:");?></td>
 				<td><?php echo $externalLogin['emailAddress']; ?></td>
 				</tr>
 				<?php
@@ -1294,7 +1294,7 @@
 
 				if ($externalLogin['noteText']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Notes:</td>
+				<td style='vertical-align:top; width:130px;'><?= _("Notes:");?></td>
 				<td><?php echo nl2br($externalLogin['noteText']); ?></td>
 				</tr>
 				<?php
@@ -1304,12 +1304,12 @@
 			<?php
 			}
 		} else {
-			echo "<i>No accounts available</i><br /><br />";
+			echo "<i>"._("No accounts available")."</i><br /><br />";
 
 		}
 
 		if ($user->canEdit() && ($orgELFlag == 0)){ ?>
-			<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'>add new account</a>
+			<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'><?= _("add new account");?></a>
 			<br /><br /><br />
 		<?php
 		}
@@ -1347,12 +1347,12 @@
 				<th colspan='2'>
 					<span style='float:left; vertical-align:bottom;'>
 						<?php echo $attachment['shortName']; ?>&nbsp;&nbsp;
-						<a href='attachments/<?php echo $attachment['attachmentURL']; ?>' style='font-weight:normal;' target='_blank'><img src='images/arrow-up-right-blue.gif' alt='view attachment' title='view attachment' style='vertical-align:top;'></a></a>
+						<a href='attachments/<?php echo $attachment['attachmentURL']; ?>' style='font-weight:normal;' target='_blank'><img src='images/arrow-up-right-blue.gif' alt='<?= _("view attachment");?>' title='<?= _("view attachment");?>' style='vertical-align:top;'></a></a>
 					</span>
 					<span style='float:right;'>
 					<?php
 						if ($user->canEdit()){ ?>
-							<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&attachmentID=<?php echo $attachment['attachmentID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit attachment'></a>  <a href='javascript:void(0);' class='removeAttachment' id='<?php echo $attachment['attachmentID']; ?>'><img src='images/cross.gif' alt='remove this attachment' title='remove this attachment'></a>
+							<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&attachmentID=<?php echo $attachment['attachmentID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit attachment");?>'></a>  <a href='javascript:void(0);' class='removeAttachment' id='<?php echo $attachment['attachmentID']; ?>'><img src='images/cross.gif' alt='<?= _("remove this attachment");?>' title='<?= _("remove this attachment");?>'></a>
 							<?php
 						}else{
 							echo "&nbsp;";
@@ -1364,7 +1364,7 @@
 
 				<?php if ($attachment['attachmentTypeShortName']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Type:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Type:");?></td>
 				<td style='vertical-align:top; width:350px;'><?php echo $attachment['attachmentTypeShortName']; ?></td>
 				</tr>
 				<?php
@@ -1372,7 +1372,7 @@
 
 				if ($attachment['descriptionText']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Details:</td>
+				<td style='vertical-align:top; width:110px;'><?= _("Details:");?></td>
 				<td style='vertical-align:top; width:350px;'><?php echo $attachment['descriptionText']; ?></td>
 				</tr>
 				<?php
@@ -1384,12 +1384,12 @@
 			<?php
 			}
 		} else {
-			echo "<i>No attachments available</i><br /><br />";
+			echo "<i>"._("No attachments available")."</i><br /><br />";
 		}
 
 		if ($user->canEdit()){
 		?>
-		<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAttachment'>add new attachment</a><br /><br />
+		<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAttachment'><?= _("add new attachment");?></a><br /><br />
 		<?php
 		}
 
@@ -1413,18 +1413,18 @@
 
 		if (count($resourceSteps) == "0"){
 			if (($resource->statusID != $completeStatusID) && ($resource->statusID != $archiveStatusID)){
-				echo "<i>No workflow steps have been set up for this resource's combination of Acquisition Type and Resource Format.<br />If you think this is in error, please contact your workflow administrator.</i>";
+				echo "<i>"._("No workflow steps have been set up for this resource's combination of Acquisition Type and Resource Format.")."<br />"._("If you think this is in error, please contact your workflow administrator.")."</i>";
 			}else{
-				echo "<i>Not entered into workflow.</i>";
+				echo "<i>"._("Not entered into workflow.")."</i>";
 			}
 		}else{
 			?>
 			<table class='linedDataTable' style='width:100%;margin-bottom:5px;'>
 				<tr>
-				<th style='background-color:#dad8d8;width:350px;'>Step</th>
-				<th style='background-color:#dad8d8;width:150px;'>Group</th>
-				<th style='background-color:#dad8d8;width:120px;'>Start Date</th>
-				<th style='background-color:#dad8d8;width:250px;'>Complete</th>
+				<th style='background-color:#dad8d8;width:350px;'><?= _("Step");?></th>
+				<th style='background-color:#dad8d8;width:150px;'><?= _("Group");?></th>
+				<th style='background-color:#dad8d8;width:120px;'><?= _("Start Date");?></th>
+				<th style='background-color:#dad8d8;width:250px;'><?= _("Complete");?></th>
 				</tr>
 			<?php
 			$openStep=0;
@@ -1448,14 +1448,14 @@
 				<?php
 					if ($resourceStep->stepEndDate) {
 						if (($eUser->firstName) || ($eUser->lastName)){
-							echo format_date($resourceStep->stepEndDate) . " by " . $eUser->firstName . " " . $eUser->lastName;
+							echo format_date($resourceStep->stepEndDate) . _(" by ") . $eUser->firstName . " " . $eUser->lastName;
 						}else{
-							echo format_date($resourceStep->stepEndDate) . " by " . $resourceStep->endLoginID;
+							echo format_date($resourceStep->stepEndDate) . _(" by ") . $resourceStep->endLoginID;
 						}
 					}else{
 						//add if user is in group or an admin and resource is not completed or archived
 						if ((($user->isAdmin) || ($user->isInGroup($resourceStep->userGroupID))) && ($resourceStep->stepStartDate) &&  ($resource->statusID != $archiveStatusID) && ($resource->statusID != $completeStatusID)){
-							echo "<a href='javascript:void(0);' class='markComplete' id='" . $resourceStep->resourceStepID . "'>mark complete</a>";
+							echo "<a href='javascript:void(0);' class='markComplete' id='" . $resourceStep->resourceStepID . "'>"._("mark complete")."</a>";
 						}
 						//track how many open steps there are
 						$openStep++;
@@ -1477,15 +1477,15 @@
 			//this was marked complete...
 			if (($openStep > 0) && ($resource->statusID == $completeStatusID)){
 				if ($rUser->firstName){
-					echo "<i>Workflow completed on " . format_date($resource->workflowRestartDate) . " by " . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
+					echo "<i>"._("Workflow completed on ") . format_date($resource->workflowRestartDate) . _(" by ") . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
 				}else{
-					echo "<i>Workflow completed on " . format_date($resource->workflowRestartDate) . " by " . $resource->workflowRestartLoginID . "</i><br />";
+					echo "<i>"._("Workflow completed on ") . format_date($resource->workflowRestartDate) . _(" by ") . $resource->workflowRestartLoginID . "</i><br />";
 				}
 			}else{
 				if ($rUser->firstName){
-					echo "<i>Workflow restarted on " . format_date($resource->workflowRestartDate) . " by " . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
+					echo "<i>"._("Workflow restarted on ") . format_date($resource->workflowRestartDate) . _(" by ") . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
 				}else{
-					echo "<i>Workflow restarted on " . format_date($resource->workflowRestartDate) . " by " . $resource->workflowRestartLoginID . "</i><br />";
+					echo "<i>"._("Workflow restarted on ") . format_date($resource->workflowRestartDate) . _(" by ") . $resource->workflowRestartLoginID . "</i><br />";
 				}
 			}
 		}
@@ -1495,8 +1495,8 @@
 
 		if ($user->canEdit()){
 			if (($resource->statusID != $completeStatusID) && ($resource->statusID != $archiveStatusID)){
-				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='restartWorkflow' id='" . $resourceID . "'>restart workflow</a><br />";
-				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='markResourceComplete' id='" . $resourceID . "'>mark entire workflow complete</a><br />";
+				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='restartWorkflow' id='" . $resourceID . "'>"._("restart workflow")."</a><br />";
+				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='markResourceComplete' id='" . $resourceID . "'>"._("mark entire workflow complete")."</a><br />";
 			}
 		}
 
@@ -1584,9 +1584,9 @@
 		$licenseArray = $resource->getLicenseArray();
 
 		echo "<div style='background-color:white; width:219px; padding:7px;'>";
-		echo "<div class='rightPanelLink'><a href='summary.php?resourceID=" . $resource->resourceID . "' target='_blank' class='helpfulLink'>Print View</a></div>";
+		echo "<div class='rightPanelLink'><a href='summary.php?resourceID=" . $resource->resourceID . "' target='_blank' class='helpfulLink'>"._("Print View")."</a></div>";
 		if (($resource->systemNumber) && ($config->settings->catalogURL != '')) {
-			echo "<div class='rightPanelLink'><a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>Catalog View</a></div>";
+			echo "<div class='rightPanelLink'><a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>"._("Catalog View")."</a></div>";
 		}
 		echo "</div>";
 
@@ -1597,13 +1597,13 @@
 				<?php
 
 				if ($parentResource->titleText){
-					echo "<div class='rightPanelHeader'>Parent Record</div>";
+					echo "<div class='rightPanelHeader'>"._("Parent Record")."</div>";
 					echo "<div class='rightPanelLink'><a href='resource.php?resourceID=" . $parentResource->resourceID . "' target='_BLANK' class='helpfulLink'>" . $parentResource->titleText . "</a></div>";
 					echo "</br>";
 				}
 
 				if ((count($childResourceArray) > 0)){
-					echo "<div class='rightPanelHeader'>Child Record(s)</div>";
+					echo "<div class='rightPanelHeader'>"._("Child Record(s)")."</div>";
 
 					foreach ($childResourceArray as $childResource){
 						$childResourceObj = new Resource(new NamedArguments(array('primaryKey' => $childResource['resourceID'])));
@@ -1622,7 +1622,7 @@
 		?>
 
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Organizations Module</div>
+				<div class='rightPanelHeader'><?= _("Organizations Module");?></div>
 
 				<?php
 				foreach ($orgArray as $organization){
@@ -1638,7 +1638,7 @@
 
 		?>
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Licensing Module</div>
+				<div class='rightPanelHeader'><?= _("Licensing Module");?></div>
 
 				<?php
 				foreach ($licenseArray as $license){
@@ -1656,13 +1656,13 @@
 		if (($resourceType->includeStats ==  1) && ($config->settings->usageModule == 'Y')){
 		?>
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Usage Statistics Module</div>
+				<div class='rightPanelHeader'><?= _("Usage Statistics Module");?></div>
 
 				<?php
 			echo "<form method='post' action='/reports/report.php' target='_blank'>";
 			echo "<input type='hidden' name='reportID' value='1'>";
 			echo "<input type='hidden' name='prm_21' value='".$resource->titleText."'>";
-			echo "<input type='submit' value='Get Statistics'>";
+			echo "<input type='submit' value='"._("Get Statistics")."'>";
 			echo "</form>";
 							?>
 
@@ -1683,22 +1683,22 @@
 		$resourceArray = array();
 		$resourceArray = $user->getResourcesInQueue('saved');
 
-		echo "<div class='adminRightHeader'>Saved Requests</div>";
+		echo "<div class='adminRightHeader'>"._("Saved Requests")."</div>";
 
 
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No saved requests</i>";
+			echo "<i>"._("No saved requests")."</i>";
 		}else{
 		?>
 
 			<table class='dataTable' style='width:570px;margin-bottom:5px;'>
 			<tr>
-				<th>ID</th>
-				<th>Name</th>
-				<th>Date Created</th>
-				<th>Acquisition Type</th>
-				<th>Status</th>
+				<th><?= _("ID");?></th>
+				<th><?= _("Name");?></th>
+				<th><?= _("Date Created");?></th>
+				<th><?= _("Acquisition Type");?></th>
+				<th><?= _("Status");?></th>
 				<th>&nbsp;</th>
 			</tr>
 
@@ -1726,8 +1726,8 @@
 					<td <?php echo $classAdd; ?>><?php echo $acquisitionType->shortName; ?></td>
 					<td <?php echo $classAdd; ?>><?php echo $status->shortName; ?></td>
 					<td <?php echo $classAdd; ?> style='text-align:right; width:40px;'>
-					<a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit request'></a>&nbsp;
-					<a href='javascript:void(0);' class='deleteRequest' id='<?php echo $resource['resourceID']; ?>'><img src='images/cross.gif' alt='remove request' title='remove request'></a>
+					<a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?= _("edit");?>' title='<?= _("edit request");?>'></a>&nbsp;
+					<a href='javascript:void(0);' class='deleteRequest' id='<?php echo $resource['resourceID']; ?>'><img src='images/cross.gif' alt='<?= _("remove request");?>' title='<?= _("remove request");?>'></a>
 					</td>
 				</tr>
 
@@ -1752,22 +1752,22 @@
 		$resourceArray = array();
 		$resourceArray = $user->getResourcesInQueue('progress');
 
-		echo "<div class='adminRightHeader'>Submitted Requests</div>";
+		echo "<div class='adminRightHeader'>"._("Submitted Requests")."</div>";
 
 
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No submitted requests</i>";
+			echo "<i>"._("No submitted requests")."</i>";
 		}else{
 		?>
 
 			<table class='dataTable' style='width:570px;margin-bottom:5px;'>
 			<tr>
-				<th>ID</th>
-				<th>Name</th>
-				<th>Date Created</th>
-				<th>Acquisition Type</th>
-				<th>Status</th>
+				<th><?= _("ID");?></th>
+				<th><?= _("Name");?></th>
+				<th><?= _("Date Created");?></th>
+				<th><?= _("Acquisition Type");?></th>
+				<th><?= _("Status");?></th>
 			</tr>
 
 		<?php
@@ -1814,23 +1814,23 @@
 		$resourceArray = array();
 		$resourceArray = $user->getOutstandingTasks();
 
-		echo "<div class='adminRightHeader'>Outstanding Tasks</div>";
+		echo "<div class='adminRightHeader'>"._("Outstanding Tasks")."</div>";
 
 
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No outstanding requests</i>";
+			echo "<i>"._("No outstanding requests")."</i>";
 		}else{
 		?>
 
 
 			<table class='dataTable' style='width:646px;padding:0x;margin:0px;height:100%;'>
 			<tr>
-				<th style='width:45px;'>ID</th>
-				<th style='width:300px;'>Name</th>
-				<th style='width:95px;'>Acquisition Type</th>
-				<th style='width:125px;'>Routing Step</th>
-				<th style='width:75px;'>Start Date</th>
+				<th style='width:45px;'><?= _("ID");?></th>
+				<th style='width:300px;'><?= _("Name");?></th>
+				<th style='width:95px;'><?= _("Acquisition Type");?></th>
+				<th style='width:125px;'><?= _("Routing Step");?></th>
+				<th style='width:75px;'><?= _("Start Date");?></th>
 			</tr>
 
 		<?php
@@ -1965,7 +1965,7 @@
 		$resourceArray = $resourceObj->search($whereAdd, $orderBy, $limit);
 
 		if (count($resourceArray) == 0){
-			echo "<br /><br /><i>Sorry, no requests fit your query</i>";
+			echo "<br /><br /><i>"._("Sorry, no requests fit your query")."</i>";
 			$i=0;
 		}else{
 			//maximum number of pages to display on screen at one time
@@ -1979,7 +1979,7 @@
 			}
 
 			//div for displaying record count
-			echo "<span style='float:left; font-weight:bold; width:650px;'>Displaying " . $displayStartingRecNumber . " to " . $displayEndingRecNumber . " of " . $totalRecords . " Resource Records</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
+			echo "<span style='float:left; font-weight:bold; width:650px;'>Displaying " . $displayStartingRecNumber . _(" to ") . $displayEndingRecNumber . _(" of ") . $totalRecords . _(" Resource Records")."</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
 
 
 			//print out page selectors as long as there are more records than the number that should be displayed
@@ -2025,7 +2025,7 @@
 				if ($nextPage >= $maxPages){
 					echo "<span class='smallerText'>>></span>&nbsp;";
 				}else{
-					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='next page' title='next page'>>></a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='"._("next page")."' title='"._("next page")."'>>></a>&nbsp;";
 				}
 
 				echo "</div>";
@@ -2039,12 +2039,12 @@
 			?>
 			<table class='dataTable' style='width:727px'>
 			<tr>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>ID</td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Name</td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Creator</td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Date Created</td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Acquisition Type</td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Status</td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("ID");?></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("Name");?></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("Creator");?></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("Date Created");?></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("Acquisition Type");?></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?= _("Status");?></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
 			</tr>
 
 			<?php
@@ -2088,7 +2088,7 @@
 					echo "<span class='smallerText'><<</span>&nbsp;";
 				}else{
 					$prevPage = $page - 1;
-					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='previous page' title='previous page'><<</a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='"._("previous page")."' title='"._("previous page")."'><<</a>&nbsp;";
 				}
 
 
@@ -2139,7 +2139,7 @@
 				}
 				?>
 			</select>
-			<span class='smallText'>records per page</span>
+			<span class='smallText'><?= _("records per page");?></span>
 			</td>
 			</tr>
 			</table>
@@ -2172,15 +2172,15 @@
 
 		if (count($instanceArray) > 0){
 			?>
-			<div class="adminRightHeader">Users</div>
+			<div class="adminRightHeader"><?= _("Users");?></div>
 			<table class='linedDataTable' style='width:570px;margin-bottom:5px;'>
 				<tr>
-				<th>Login ID</td>
-				<th>First Name</td>
-				<th>Last Name</td>
-				<th>Privilege</td>
-				<th>View Accounts</td>
-				<th>Email Address</td>
+				<th><?= _("Login ID");?></td>
+				<th><?= _("First Name");?></td>
+				<th><?= _("Last Name");?></td>
+				<th><?= _("Privilege");?></td>
+				<th><?= _("View Accounts");?></td>
+				<th><?= _("Email Address");?></td>
 				<th>&nbsp;</td>
 				<th>&nbsp;</td>
 				</tr>
@@ -2200,18 +2200,18 @@
 					echo "<td>" . $instance['priv'] . "</td>";
 					echo "<td>" . $accountTab . "</td>";
 					echo "<td>" . $instance['emailAddress'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit user'></a></td>";
-					echo "<td><a href='javascript:deleteUser(\"" . $instance['loginID'] . "\")'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit user")."'></a></td>";
+					echo "<td><a href='javascript:deleteUser(\"" . $instance['loginID'] . "\")'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
 				?>
 			</table>
-			<a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>add new user</a>
+			<a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'><?= _("add new user");?></a>
 			<?php
 
 		}else{
-			echo "(none found)<br /><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>add new user</a>";
+			echo _("(none found)")."<br /><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>"._("add new user")."</a>";
 		}
 
 		break;
@@ -2231,14 +2231,14 @@
 
 		$instanceArray = $obj->allAsArray();
 
-		echo "<div class='adminRightHeader'>Currency</div>";
+		echo "<div class='adminRightHeader'>"._("Currency")."</div>";
 
 		if (count($instanceArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:25px;'>Code</th>
-				<th style='width:100%;'>Name</th>
+				<th style='width:25px;'><?= _("Code");?></th>
+				<th style='width:100%;'><?= _("Name");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2248,8 +2248,8 @@
 					echo "<tr>";
 					echo "<td>" . $instance['currencyCode'] . "</td>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=" . $instance['currencyCode'] . "&height=178&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteCurrency(\"Currency\", \"" . $instance['currencyCode'] . "\");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=" . $instance['currencyCode'] . "&height=178&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteCurrency(\"Currency\", \"" . $instance['currencyCode'] . "\");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2258,10 +2258,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=&height=178&width=260&modal=true' class='thickbox'>add new currency</a>";
+		echo "<a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=&height=178&width=260&modal=true' class='thickbox'>"._("add new currency")."</a>";
 
 		break;
 
@@ -2283,7 +2283,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?= _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2292,8 +2292,8 @@
 				foreach($instanceArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2302,10 +2302,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
 
 		break;
 
@@ -2325,13 +2325,13 @@
 		$emailAddressArray = $alertEmailAddress->allAsArray();
 		$daysInAdvanceArray = $alertDaysInAdvance->allAsArray();
 
-		echo "<div class='adminRightHeader'>Alert Settings</div>";
+		echo "<div class='adminRightHeader'>"._("Alert Settings")."</div>";
 
 		if (count($emailAddressArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Email Address</th>
+				<th style='width:100%;'><?= _("Email Address");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2340,8 +2340,8 @@
 				foreach($emailAddressArray as $emailAddress) {
 					echo "<tr>";
 					echo "<td>" . $emailAddress['emailAddress'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=" . $emailAddress['alertEmailAddressID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteAlert(\"AlertEmailAddress\", " . $emailAddress['alertEmailAddressID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=" . $emailAddress['alertEmailAddressID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteAlert(\"AlertEmailAddress\", " . $emailAddress['alertEmailAddressID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2350,10 +2350,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'>add email address</a>";
+		echo "<a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'>"._("add email address")."</a>";
 		echo "<br /><br /><br />";
 
 
@@ -2361,7 +2361,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Days in advance of expiration</th>
+				<th style='width:100%;'><?= _("Days in advance of expiration");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2370,8 +2370,8 @@
 				foreach($daysInAdvanceArray as $daysInAdvance) {
 					echo "<tr>";
 					echo "<td>" . $daysInAdvance['daysInAdvanceNumber'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=" . $daysInAdvance['alertDaysInAdvanceID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteAlert(\"AlertDaysInAdvance\", " . $daysInAdvance['alertDaysInAdvanceID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=" . $daysInAdvance['alertDaysInAdvanceID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteAlert(\"AlertDaysInAdvance\", " . $daysInAdvance['alertDaysInAdvanceID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2380,13 +2380,13 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 
 
 
-		echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'>add days</a>";
+		echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'>"._("add days")."</a>";
 
 		break;
 
@@ -2401,15 +2401,15 @@
 		$userGroupArray = $userGroup->allAsArray();
 
 
-		echo "<div class='adminRightHeader'>Workflow Setup</div>";
+		echo "<div class='adminRightHeader'>"._("Workflow Setup")."</div>";
 
 		if (count($workflowArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>Acquisition Type</th>
-				<th>Resource Format</th>
-				<th>Resource Type</th>
+				<th><?= _("Acquisition Type");?></th>
+				<th><?= _("Resource Format");?></th>
+				<th><?= _("Resource Type");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2430,8 +2430,8 @@
 					echo "<td>" . $acquisitionType->shortName . "</td>";
 					echo "<td>" . $resourceFormat->shortName . "</td>";
 					echo "<td>" . $rtName . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=" . $wf['workflowID'] . "&height=528&width=750&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteWorkflow(\"Workflow\", " . $wf['workflowID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=" . $wf['workflowID'] . "&height=528&width=750&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteWorkflow(\"Workflow\", " . $wf['workflowID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2440,14 +2440,14 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 		//user groups are required to set workflows up so display this message if there arent any
 		if (count($userGroupArray) >0){
 			echo "<a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=&height=528&width=750&modal=true' class='thickbox'>add workflow</a>";
 		}else{
-			echo "<i>You must set up at least one user group before you can add workflows</i>";
+			echo "<i>"._("You must set up at least one user group before you can add workflows")."</i>";
 		}
 
 		?>
@@ -2457,15 +2457,15 @@
 
 		<?php
 
-		echo "<div class='adminRightHeader'>User Group Setup</div>";
+		echo "<div class='adminRightHeader'>"._("User Group Setup")."</div>";
 
 		if (count($userGroupArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>Group Name</th>
-				<th>Email Address</th>
-				<th>Users</th>
+				<th><?= _("Group Name");?></th>
+				<th><?= _("Email Address");?></th>
+				<th><?= _("Users");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2481,8 +2481,8 @@
 						echo $groupUser->getDisplayName . "<br />";
 					}
 					echo "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=" . $userGroup->userGroupID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteWorkflow(\"UserGroup\", " . $userGroup->userGroupID . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=" . $userGroup->userGroupID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteWorkflow(\"UserGroup\", " . $userGroup->userGroupID . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2491,11 +2491,11 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 
-		echo "<a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=&height=400&width=305&modal=true' class='thickbox'>add user group</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=&height=400&width=305&modal=true' class='thickbox'>"._("add user group")."</a>";
 
 		break;
 
@@ -2515,7 +2515,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?= _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2524,8 +2524,8 @@
 				foreach($instanceArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2534,10 +2534,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
 
 		break;
 
@@ -2550,13 +2550,13 @@
 		$detailedSubject = new DetailedSubject();
 		$detailedSubjectArray = $detailedSubject->allAsArray();
 
-		echo "<div class='adminRightHeader'>General Subject</div>";
+		echo "<div class='adminRightHeader'>"._("General Subject")."</div>";
 
 		if (count($generalSubjectArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?= _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2565,11 +2565,11 @@
 				foreach($generalSubjectArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . "GeneralSubject" . "&updateID=" . $instance[lcfirst("GeneralSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . "GeneralSubject" . "&updateID=" . $instance[lcfirst("GeneralSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
 
 						$generalSubject = new GeneralSubject();
 						if ($generalSubject->inUse($instance[lcfirst("GeneralSubject") . 'ID']) == 0) {
-							echo "<td><a href='javascript:deleteGeneralSubject(\"GeneralSubject\", " . $instance[lcfirst("GeneralSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+							echo "<td><a href='javascript:deleteGeneralSubject(\"GeneralSubject\", " . $instance[lcfirst("GeneralSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 						} else {
 							echo "<td><img src='images/do_not_enter.png' alt='subject in use' title='subject in use' /></td>";
 						}
@@ -2582,7 +2582,7 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 		echo "<a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . "GeneralSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("GeneralSubject"))) . "</a>";
@@ -2592,13 +2592,13 @@
 		<br /><br />
 
 		<?php
-		echo "<div class='adminRightHeader'>Detailed Subject</div>";
+		echo "<div class='adminRightHeader'>"._("Detailed Subject")."</div>";
 
 		if (count($detailedSubjectArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?= _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2607,12 +2607,12 @@
 				foreach($detailedSubjectArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=" . $instance[lcfirst("DetailedSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=" . $instance[lcfirst("DetailedSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
 						$detailedSubject = new DetailedSubject();
 						if ($detailedSubject->inUse($instance[lcfirst("DetailedSubject") . 'ID'], -1) == 0) {
-									echo "<td><a href='javascript:deleteDetailedSubject(\"DetailedSubject\", " . $instance[lcfirst("DetailedSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+									echo "<td><a href='javascript:deleteDetailedSubject(\"DetailedSubject\", " . $instance[lcfirst("DetailedSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 						} else {
-							echo "<td><img src='images/do_not_enter.png' alt='subject in use' title='subject in use' /></td>";
+							echo "<td><img src='images/do_not_enter.png' alt='"._("subject in use")."' title='"._("subject in use")."' /></td>";
 						}
 					echo "</tr>";
 				}
@@ -2622,10 +2622,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("DetailedSubject"))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("DetailedSubject"))) . "</a>";
 
 		?>
 
@@ -2633,14 +2633,14 @@
 
 		<?php
 
-		echo "<div class='adminRightHeader'>Subject Relationships</div>";
+		echo "<div class='adminRightHeader'>"._("Subject Relationships")."</div>";
 
 		if (count($generalSubjectArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>General Subject</th>
-				<th>Detailed Subject</th>
+				<th><?= _("General Subject");?></th>
+				<th><?= _("Detailed Subject");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -2656,7 +2656,7 @@
 						echo $detailedSubjects->shortName . "<br />";
 					}
 					echo "</td>";
-					echo "<td><a href='ajax_forms.php?action=getGeneralDetailSubjectForm&generalSubjectID=" . $generalSubject->generalSubjectID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getGeneralDetailSubjectForm&generalSubjectID=" . $generalSubject->generalSubjectID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -2665,7 +2665,7 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 
@@ -2674,7 +2674,7 @@
 
 
 	default:
-       echo "Action " . $action . " not set up!";
+       echo _("Action ") . $action . _(" not set up!");
        break;
 
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index ec17db62798564bcaa5a72b513239b865b3bf842..f2c67df62086c60d4000d67c7712978e2a9b1346 100644
GIT binary patch
delta 26
icmaEs{49CHEO{0)D^ttK^W;@n%&iOzHXoB$5CQ;=3JCE4

delta 26
fcmaEs{49CHEO{0aD`SJn^W;@P48zUG<Q0Sfj6VqF

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 9cb6fa1..155a512 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-07 14:30+0100\n"
-"PO-Revision-Date: 2015-04-07 14:31+0100\n"
+"POT-Creation-Date: 2015-04-07 16:59+0100\n"
+"PO-Revision-Date: 2015-04-07 17:00+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -15,7 +15,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: admin.php:51
+#: admin.php:51 ajax_htmldata.php:2175 ajax_htmldata.php:2468
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -31,7 +31,9 @@ msgstr "Mèthode d'accès"
 msgid "Account Type"
 msgstr "Type d'account"
 
-#: admin.php:55 ajax_forms.php:279 index.php:100
+#: admin.php:55 ajax_forms.php:279 ajax_htmldata.php:1700
+#: ajax_htmldata.php:1769 ajax_htmldata.php:1831 ajax_htmldata.php:2046
+#: ajax_htmldata.php:2410 index.php:100
 msgid "Acquisition Type"
 msgstr "Type d'acquisition"
 
@@ -39,7 +41,7 @@ msgstr "Type d'acquisition"
 msgid "Administering Site"
 msgstr "Administration du site"
 
-#: admin.php:58
+#: admin.php:58 ajax_htmldata.php:2328
 msgid "Alert Settings"
 msgstr "Configuration des alertes"
 
@@ -71,7 +73,7 @@ msgstr "Type de catalogue "
 msgid "Contact Role"
 msgstr "Contact Rôle"
 
-#: admin.php:67
+#: admin.php:67 ajax_htmldata.php:2234
 msgid "Currency"
 msgstr "Concurrence"
 
@@ -99,11 +101,11 @@ msgstr "Organisation"
 msgid "Purchasing Site"
 msgstr "Site d'achat"
 
-#: admin.php:83 index.php:186
+#: admin.php:83 ajax_htmldata.php:2411 index.php:186
 msgid "Resource Format"
 msgstr "Format de la ressource"
 
-#: admin.php:84 ajax_forms.php:466 index.php:210
+#: admin.php:84 ajax_forms.php:466 ajax_htmldata.php:2412 index.php:210
 msgid "Resource Type"
 msgstr "Type de ressource"
 
@@ -111,7 +113,7 @@ msgstr "Type de ressource"
 msgid "Storage Location"
 msgstr "Lieu de stockage"
 
-#: admin.php:86
+#: admin.php:86 ajax_htmldata.php:326
 msgid "Subjects"
 msgstr "Sujets"
 
@@ -163,7 +165,7 @@ msgstr "Ajouter une note"
 msgid "Note Type:"
 msgstr "Type de note:"
 
-#: ajax_forms.php:77 ajax_forms.php:1934
+#: ajax_forms.php:77 ajax_forms.php:1934 ajax_htmldata.php:1297
 msgid "Notes:"
 msgstr "Notes:"
 
@@ -208,7 +210,7 @@ msgstr "Produit"
 msgid "Name:"
 msgstr "Nom:"
 
-#: ajax_forms.php:209 ajax_forms.php:650
+#: ajax_forms.php:209 ajax_forms.php:650 ajax_htmldata.php:290
 msgid "Description:"
 msgstr "Description:"
 
@@ -220,7 +222,7 @@ msgstr "Fournisseur:"
 msgid "Format"
 msgstr "Format"
 
-#: ajax_forms.php:326 ajax_forms.php:1104
+#: ajax_forms.php:326 ajax_forms.php:1104 ajax_htmldata.php:612
 msgid "Initial Cost"
 msgstr "Coût Initial"
 
@@ -234,6 +236,7 @@ msgstr "Prix:"
 
 #: ajax_forms.php:337 ajax_forms.php:707 ajax_forms.php:848
 #: ajax_forms.php:1114 ajax_forms.php:2117 ajax_forms.php:2702
+#: ajax_htmldata.php:1367
 msgid "Type:"
 msgstr "Type:"
 
@@ -273,7 +276,7 @@ msgstr "Parent:"
 msgid "Format:"
 msgstr "Format:"
 
-#: ajax_forms.php:726 ajax_forms.php:1888
+#: ajax_forms.php:726 ajax_forms.php:1888 ajax_htmldata.php:115
 msgid "Archived:"
 msgstr "Archivé:"
 
@@ -281,7 +284,7 @@ msgstr "Archivé:"
 msgid "Role:"
 msgstr "Rôle:"
 
-#: ajax_forms.php:756
+#: ajax_forms.php:756 ajax_htmldata.php:1058 ajax_htmldata.php:1249
 msgid "Organization:"
 msgstr "Organisation:"
 
@@ -325,27 +328,27 @@ msgstr "effacer cet alias"
 msgid "Edit Acquisitions Information"
 msgstr "modifier l'information des acquisitions"
 
-#: ajax_forms.php:1038
+#: ajax_forms.php:1038 ajax_htmldata.php:547
 msgid "Order"
 msgstr "Ordre"
 
-#: ajax_forms.php:1045 ajax_forms.php:2671
+#: ajax_forms.php:1045 ajax_forms.php:2671 ajax_htmldata.php:558
 msgid "Acquisition Type:"
 msgstr "Type d'acquisition:"
 
-#: ajax_forms.php:1063
+#: ajax_forms.php:1063 ajax_htmldata.php:565
 msgid "Order Number:"
 msgstr "Numero d'ordre:"
 
-#: ajax_forms.php:1068
+#: ajax_forms.php:1068 ajax_htmldata.php:572
 msgid "System Number:"
 msgstr "Nombre de système:"
 
-#: ajax_forms.php:1073
+#: ajax_forms.php:1073 ajax_htmldata.php:593
 msgid "Subscription Start:"
 msgstr "Début d'abonnement:"
 
-#: ajax_forms.php:1078
+#: ajax_forms.php:1078 ajax_htmldata.php:600
 msgid "Subscription End:"
 msgstr "Fin d'abonnement:"
 
@@ -381,7 +384,7 @@ msgstr " licence"
 msgid "Licensing Status"
 msgstr "Statut des licences"
 
-#: ajax_forms.php:1450
+#: ajax_forms.php:1450 ajax_htmldata.php:105 ajax_htmldata.php:666
 msgid "Status:"
 msgstr "Statut:"
 
@@ -389,11 +392,16 @@ msgstr "Statut:"
 msgid "History:"
 msgstr "Historie:"
 
-#: ajax_forms.php:1480 resources/cataloging.php:223
+#: ajax_forms.php:1480 ajax_htmldata.php:124 ajax_htmldata.php:126
+#: ajax_htmldata.php:149 ajax_htmldata.php:151 ajax_htmldata.php:173
+#: ajax_htmldata.php:175 ajax_htmldata.php:447 ajax_htmldata.php:672
+#: ajax_htmldata.php:766 ajax_htmldata.php:1451 ajax_htmldata.php:1453
+#: ajax_htmldata.php:1480 ajax_htmldata.php:1482 ajax_htmldata.php:1486
+#: ajax_htmldata.php:1488 resources/cataloging.php:223
 msgid " by "
 msgstr " par "
 
-#: ajax_forms.php:1483
+#: ajax_forms.php:1483 ajax_htmldata.php:675
 msgid "No license status information available."
 msgstr "L'information de statut de la licence n'est pas disponible."
 
@@ -405,7 +413,7 @@ msgstr "Modifier l'accès"
 msgid "Access"
 msgstr "Acèss"
 
-#: ajax_forms.php:1604
+#: ajax_forms.php:1604 ajax_htmldata.php:843
 msgid "Authentication Type:"
 msgstr "Type d'accès:"
 
@@ -413,23 +421,23 @@ msgstr "Type d'accès:"
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
-#: ajax_forms.php:1623
+#: ajax_forms.php:1623 ajax_htmldata.php:888
 msgid "Access Method:"
 msgstr "Mèthode d'accès:"
 
-#: ajax_forms.php:1638 ajax_forms.php:2043
+#: ajax_forms.php:1638 ajax_forms.php:2043 ajax_htmldata.php:1273
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: ajax_forms.php:1642
+#: ajax_forms.php:1642 ajax_htmldata.php:874
 msgid "Storage Location:"
 msgstr "Lieu de stockage:"
 
-#: ajax_forms.php:1657
+#: ajax_forms.php:1657 ajax_htmldata.php:858
 msgid "Simultaneous User Limit:"
 msgstr "Limite d'utilisateurs similtanées"
 
-#: ajax_forms.php:1674
+#: ajax_forms.php:1674 ajax_htmldata.php:881
 msgid "Coverage:"
 msgstr "Coverture:"
 
@@ -449,19 +457,19 @@ msgstr "Modifierl le contact"
 msgid "Add Contact"
 msgstr "Ajouter un contact"
 
-#: ajax_forms.php:1846
+#: ajax_forms.php:1846 ajax_htmldata.php:1075
 msgid "Title:"
 msgstr "Titre:"
 
-#: ajax_forms.php:1853
+#: ajax_forms.php:1853 ajax_htmldata.php:1108
 msgid "Phone:"
 msgstr "Téléphone:"
 
-#: ajax_forms.php:1860
+#: ajax_forms.php:1860 ajax_htmldata.php:1116
 msgid "Alt Phone:"
 msgstr "Alt Téléphone:"
 
-#: ajax_forms.php:1881
+#: ajax_forms.php:1881 ajax_htmldata.php:1083
 msgid "Address:"
 msgstr "Adresse:"
 
@@ -481,7 +489,7 @@ msgstr "Ajouter une compte"
 msgid "Login Type:"
 msgstr "Type d'acèss (login):"
 
-#: ajax_forms.php:2029
+#: ajax_forms.php:2029 ajax_htmldata.php:1289
 msgid "Registered Email:"
 msgstr "Email enregistré:"
 
@@ -501,7 +509,7 @@ msgstr "Fichier:"
 msgid "replace with new file"
 msgstr "remplacer avec un nouveau fichier"
 
-#: ajax_forms.php:2158
+#: ajax_forms.php:2158 ajax_htmldata.php:1375
 msgid "Details:"
 msgstr "Détails:"
 
@@ -525,11 +533,12 @@ msgstr "Modifier la Concurrence"
 msgid "Add Currency"
 msgstr "Ajouter Concurrence"
 
-#: ajax_forms.php:2289
+#: ajax_forms.php:2289 ajax_htmldata.php:2240
 msgid "Code"
 msgstr "Code"
 
-#: ajax_forms.php:2292
+#: ajax_forms.php:2292 ajax_htmldata.php:1698 ajax_htmldata.php:1767
+#: ajax_htmldata.php:1830 ajax_htmldata.php:2043 ajax_htmldata.php:2241
 msgid "Name"
 msgstr "Nom"
 
@@ -541,27 +550,28 @@ msgstr "Modifierl l'utilisateur"
 msgid "Add New User"
 msgstr "Ajouter un nouveau utilisateur"
 
-#: ajax_forms.php:2379
+#: ajax_forms.php:2379 ajax_htmldata.php:2178
 msgid "Login ID"
 msgstr "Identifiant d'accès"
 
-#: ajax_forms.php:2380
+#: ajax_forms.php:2380 ajax_htmldata.php:2179
 msgid "First Name"
 msgstr "Prènom"
 
-#: ajax_forms.php:2381
+#: ajax_forms.php:2381 ajax_htmldata.php:2180
 msgid "Last Name"
 msgstr "Nom"
 
-#: ajax_forms.php:2382
+#: ajax_forms.php:2382 ajax_htmldata.php:2183 ajax_htmldata.php:2334
+#: ajax_htmldata.php:2467
 msgid "Email Address"
 msgstr "Adresse email"
 
-#: ajax_forms.php:2383
+#: ajax_forms.php:2383 ajax_htmldata.php:2181
 msgid "Privilege"
 msgstr "Privilège"
 
-#: ajax_forms.php:2401
+#: ajax_forms.php:2401 ajax_htmldata.php:2182
 msgid "View Accounts"
 msgstr "Montrer les comptes"
 
@@ -645,7 +655,8 @@ msgstr "Supprimer un utilisateur du groupe"
 msgid "Add / Edit Subject Relationships"
 msgstr "Ajouter / Modifier la relation des objets"
 
-#: ajax_forms.php:3194 index.php:251
+#: ajax_forms.php:3194 ajax_htmldata.php:2553 ajax_htmldata.php:2642
+#: index.php:251
 msgid "General Subject"
 msgstr "Sujet général"
 
@@ -661,7 +672,7 @@ msgstr "Ajouter detail d'objet"
 msgid "remove detailed subject"
 msgstr "Supprimer objet détaillé"
 
-#: ajax_forms.php:3274
+#: ajax_forms.php:3274 ajax_htmldata.php:2615
 msgid "subject in use"
 msgstr "Objet en utilisation"
 
@@ -681,18 +692,627 @@ msgstr "Détail du nom d'objet"
 msgid "add"
 msgstr "ajouter"
 
-#: ajax_forms.php:3356
+#: ajax_forms.php:3356 ajax_htmldata.php:2214 ajax_htmldata.php:2261
+#: ajax_htmldata.php:2305 ajax_htmldata.php:2353 ajax_htmldata.php:2383
+#: ajax_htmldata.php:2443 ajax_htmldata.php:2494 ajax_htmldata.php:2537
+#: ajax_htmldata.php:2585 ajax_htmldata.php:2625 ajax_htmldata.php:2668
 msgid "(none found)"
 msgstr "(non trouvé)"
 
-#: ajax_forms.php:3374
+#: ajax_forms.php:3374 ajax_htmldata.php:2677
 msgid "Action "
 msgstr "Action"
 
-#: ajax_forms.php:3374
+#: ajax_forms.php:3374 ajax_htmldata.php:2677
 msgid " not set up!"
 msgstr " ne pas etabli!"
 
+#: ajax_htmldata.php:95 ajax_htmldata.php:444 ajax_htmldata.php:550
+#: ajax_htmldata.php:660 ajax_htmldata.php:763 ajax_htmldata.php:821
+#: ajax_htmldata.php:956 ajax_htmldata.php:1043 ajax_htmldata.php:1237
+#: ajax_htmldata.php:1355 ajax_htmldata.php:1729 ajax_htmldata.php:2203
+#: ajax_htmldata.php:2251 ajax_htmldata.php:2295 ajax_htmldata.php:2343
+#: ajax_htmldata.php:2373 ajax_htmldata.php:2433 ajax_htmldata.php:2484
+#: ajax_htmldata.php:2527 ajax_htmldata.php:2568 ajax_htmldata.php:2610
+#: ajax_htmldata.php:2659
+#, fuzzy
+msgid "edit"
+msgstr "modifier une note"
+
+#: ajax_htmldata.php:95 ajax_htmldata.php:660 ajax_htmldata.php:821
+#, fuzzy
+msgid "edit resource"
+msgstr "Modifier la ressource"
+
+#: ajax_htmldata.php:95
+#, fuzzy
+msgid "remove resource"
+msgstr "effacer une note"
+
+#: ajax_htmldata.php:100
+#, fuzzy
+msgid "Record ID:"
+msgstr "ID d'enregistrement"
+
+#: ajax_htmldata.php:140
+#, fuzzy
+msgid "Created:"
+msgstr "Créateur"
+
+#: ajax_htmldata.php:165
+#, fuzzy
+msgid "Last Update:"
+msgstr "Nom"
+
+#: ajax_htmldata.php:190
+msgid "Related Products:"
+msgstr ""
+
+#: ajax_htmldata.php:192
+msgid "Child:"
+msgstr ""
+
+#: ajax_htmldata.php:199
+#, fuzzy
+msgid "(Parent)"
+msgstr "Parent:"
+
+#: ajax_htmldata.php:199 ajax_htmldata.php:212
+#, fuzzy
+msgid "view resource"
+msgstr "Nouvelle ressource"
+
+#: ajax_htmldata.php:199 ajax_htmldata.php:212 ajax_htmldata.php:260
+msgid "View "
+msgstr ""
+
+#: ajax_htmldata.php:236
+#, fuzzy
+msgid "Aliases:"
+msgstr "Des alias:"
+
+#: ajax_htmldata.php:253
+#, fuzzy
+msgid "Organizations:"
+msgstr "Organisation"
+
+#: ajax_htmldata.php:274
+#, fuzzy
+msgid "Resource URL:"
+msgstr "Source URL: "
+
+#: ajax_htmldata.php:275
+#, fuzzy
+msgid "Visit Resource URL"
+msgstr "Source URL de visite"
+
+#: ajax_htmldata.php:283
+#, fuzzy
+msgid "Visit Secondary Resource URL"
+msgstr "Source URL de visite"
+
+#: ajax_htmldata.php:298
+#, fuzzy
+msgid "edit product details"
+msgstr "modifier les détails du catalogage"
+
+#: ajax_htmldata.php:365
+#, fuzzy
+msgid "remove subject"
+msgstr "Supprimer objet détaillé"
+
+#: ajax_htmldata.php:386
+#, fuzzy
+msgid "add new subject"
+msgstr "Ajouter detail d'objet"
+
+#: ajax_htmldata.php:433 ajax_htmldata.php:752 ajax_htmldata.php:945
+#: resources/cataloging.php:209
+msgid "Additional Notes"
+msgstr "Notes additionales"
+
+#: ajax_htmldata.php:436 ajax_htmldata.php:455 ajax_htmldata.php:755
+#: ajax_htmldata.php:774 ajax_htmldata.php:948 ajax_htmldata.php:967
+#: resources/cataloging.php:212 resources/cataloging.php:231
+msgid "add new note"
+msgstr "ajouter une note"
+
+#: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
+#: resources/cataloging.php:220
+msgid "edit note"
+msgstr "modifier une note"
+
+#: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
+#: ajax_htmldata.php:1044 resources/cataloging.php:220
+msgid "remove note"
+msgstr "effacer une note"
+
+#: ajax_htmldata.php:550 resources/cataloging.php:106
+msgid "edit order information"
+msgstr "modifier l'order de l'information"
+
+#: ajax_htmldata.php:586
+#, fuzzy
+msgid "Purchasing Sites:"
+msgstr "Site d'achat"
+
+#: ajax_htmldata.php:602
+msgid "Expiration Alert Enabled"
+msgstr ""
+
+#: ajax_htmldata.php:642
+#, fuzzy
+msgid "No payment information available."
+msgstr "Le catalogue d'information n'est pas disponible."
+
+#: ajax_htmldata.php:648
+#, fuzzy
+msgid "edit acquisitions information"
+msgstr "modifier l'information des acquisitions"
+
+#: ajax_htmldata.php:658
+#, fuzzy
+msgid "License"
+msgstr " licence"
+
+#: ajax_htmldata.php:672
+msgid " on "
+msgstr ""
+
+#: ajax_htmldata.php:685
+#, fuzzy
+msgid "Licenses:"
+msgstr "Modifier les licences"
+
+#: ajax_htmldata.php:691
+#, fuzzy
+msgid "View License"
+msgstr "Modifier les licences"
+
+#: ajax_htmldata.php:694
+#, fuzzy
+msgid "No associated licenses available."
+msgstr "Le catalogue d'information n'est pas disponible."
+
+#: ajax_htmldata.php:708
+#, fuzzy
+msgid "edit license and status"
+msgstr "Statut de la licence"
+
+#: ajax_htmldata.php:710
+#, fuzzy
+msgid "edit license status"
+msgstr "Statut de la licence"
+
+#: ajax_htmldata.php:817
+#, fuzzy
+msgid "Access Information"
+msgstr "modifier l'information des acquisitions"
+
+#: ajax_htmldata.php:829
+#, fuzzy
+msgid "Administering Sites:"
+msgstr "Administration du site"
+
+#: ajax_htmldata.php:836
+#, fuzzy
+msgid "Authorized Sites:"
+msgstr "Site autorisé"
+
+#: ajax_htmldata.php:851
+#, fuzzy
+msgid "Username / Password:"
+msgstr "Mot de passe:"
+
+#: ajax_htmldata.php:866
+#, fuzzy
+msgid "Registered IP Address:"
+msgstr "Email enregistré:"
+
+#: ajax_htmldata.php:895
+#, fuzzy
+msgid "No access information available."
+msgstr "L'information de statut de la licence n'est pas disponible."
+
+#: ajax_htmldata.php:902
+#, fuzzy
+msgid "edit access information"
+msgstr "modifier l'order de l'information"
+
+#: ajax_htmldata.php:998
+msgid "The following are archived contacts:"
+msgstr ""
+
+#: ajax_htmldata.php:1010 ajax_htmldata.php:1207
+#, fuzzy
+msgid "Resource Specific:"
+msgstr "Type de ressource"
+
+#: ajax_htmldata.php:1014
+msgid "No Resource Specific Contacts"
+msgstr ""
+
+#: ajax_htmldata.php:1018 ajax_htmldata.php:1162 ajax_htmldata.php:1172
+#, fuzzy
+msgid "add contact"
+msgstr "Ajouter un contact"
+
+#: ajax_htmldata.php:1023 ajax_htmldata.php:1220
+msgid "Inherited:"
+msgstr ""
+
+#: ajax_htmldata.php:1043
+#, fuzzy
+msgid "edit contact"
+msgstr "Modifierl le contact"
+
+#: ajax_htmldata.php:1044
+#, fuzzy
+msgid "remove contact"
+msgstr "effacer une note"
+
+#: ajax_htmldata.php:1059
+msgid "Visit Contact in Organizations Module"
+msgstr ""
+
+#: ajax_htmldata.php:1067
+msgid "No longer valid:"
+msgstr ""
+
+#: ajax_htmldata.php:1091
+#, fuzzy
+msgid "Location:"
+msgstr "Lieu de stockage:"
+
+#: ajax_htmldata.php:1148 ajax_htmldata.php:1281
+#, fuzzy
+msgid "Last Updated:"
+msgstr "Nom"
+
+#: ajax_htmldata.php:1170
+#, fuzzy
+msgid "No contacts available"
+msgstr "# Enregistrements disponibles"
+
+#: ajax_htmldata.php:1180
+msgid " archived contact(s) available. "
+msgstr ""
+
+#: ajax_htmldata.php:1180
+msgid "show archived contacts"
+msgstr ""
+
+#: ajax_htmldata.php:1184
+msgid "hide archived contacts"
+msgstr ""
+
+#: ajax_htmldata.php:1211
+msgid "No Resource Specific Accounts"
+msgstr ""
+
+#: ajax_htmldata.php:1215 ajax_htmldata.php:1312
+#, fuzzy
+msgid "add new account"
+msgstr "ajouter une note"
+
+#: ajax_htmldata.php:1237
+#, fuzzy
+msgid "edit account"
+msgstr "Modifier la compte"
+
+#: ajax_htmldata.php:1237
+#, fuzzy
+msgid "remove account"
+msgstr "effacer une note"
+
+#: ajax_htmldata.php:1250
+msgid "Visit Account in Organizations Module"
+msgstr ""
+
+#: ajax_htmldata.php:1257
+#, fuzzy
+msgid "Login URL:"
+msgstr "Type d'acèss (login):"
+
+#: ajax_htmldata.php:1258
+#, fuzzy
+msgid "Visit Login URL"
+msgstr "Source URL de visite"
+
+#: ajax_htmldata.php:1265
+#, fuzzy
+msgid "User Name:"
+msgstr "Nom d'utilisateur:"
+
+#: ajax_htmldata.php:1307
+#, fuzzy
+msgid "No accounts available"
+msgstr "# Enregistrements disponibles"
+
+#: ajax_htmldata.php:1350
+#, fuzzy
+msgid "view attachment"
+msgstr "Modifier la fixation"
+
+#: ajax_htmldata.php:1355
+#, fuzzy
+msgid "edit attachment"
+msgstr "Modifier la fixation"
+
+#: ajax_htmldata.php:1355
+#, fuzzy
+msgid "remove this attachment"
+msgstr "effacer ce payment"
+
+#: ajax_htmldata.php:1387
+#, fuzzy
+msgid "No attachments available"
+msgstr "Le catalogue d'information n'est pas disponible."
+
+#: ajax_htmldata.php:1392
+#, fuzzy
+msgid "add new attachment"
+msgstr "Ajouter fixation"
+
+#: ajax_htmldata.php:1416
+msgid ""
+"No workflow steps have been set up for this resource's combination of "
+"Acquisition Type and Resource Format."
+msgstr ""
+
+#: ajax_htmldata.php:1416
+msgid ""
+"If you think this is in error, please contact your workflow administrator."
+msgstr ""
+
+#: ajax_htmldata.php:1418
+msgid "Not entered into workflow."
+msgstr ""
+
+#: ajax_htmldata.php:1424
+msgid "Step"
+msgstr ""
+
+#: ajax_htmldata.php:1425
+#, fuzzy
+msgid "Group"
+msgstr "Group d'utilisateur"
+
+#: ajax_htmldata.php:1426 ajax_htmldata.php:1833
+#, fuzzy
+msgid "Start Date"
+msgstr "Commence avec"
+
+#: ajax_htmldata.php:1427
+msgid "Complete"
+msgstr ""
+
+#: ajax_htmldata.php:1458
+msgid "mark complete"
+msgstr ""
+
+#: ajax_htmldata.php:1480 ajax_htmldata.php:1482
+#, fuzzy
+msgid "Workflow completed on "
+msgstr "Étapes du Flux de travail"
+
+#: ajax_htmldata.php:1486 ajax_htmldata.php:1488
+#, fuzzy
+msgid "Workflow restarted on "
+msgstr "Étapes du Flux de travail"
+
+#: ajax_htmldata.php:1498
+#, fuzzy
+msgid "restart workflow"
+msgstr "Modifier le flux de travail"
+
+#: ajax_htmldata.php:1499
+msgid "mark entire workflow complete"
+msgstr ""
+
+#: ajax_htmldata.php:1587
+msgid "Print View"
+msgstr ""
+
+#: ajax_htmldata.php:1589
+#, fuzzy
+msgid "Catalog View"
+msgstr "Catalogage"
+
+#: ajax_htmldata.php:1600
+#, fuzzy
+msgid "Parent Record"
+msgstr "Parent étape"
+
+#: ajax_htmldata.php:1606
+#, fuzzy
+msgid "Child Record(s)"
+msgstr "Licences entregistrées"
+
+#: ajax_htmldata.php:1625
+#, fuzzy
+msgid "Organizations Module"
+msgstr "Rôle dans l'organisation"
+
+#: ajax_htmldata.php:1641
+#, fuzzy
+msgid "Licensing Module"
+msgstr "Statut des licences"
+
+#: ajax_htmldata.php:1659
+msgid "Usage Statistics Module"
+msgstr ""
+
+#: ajax_htmldata.php:1665
+msgid "Get Statistics"
+msgstr ""
+
+#: ajax_htmldata.php:1686
+#, fuzzy
+msgid "Saved Requests"
+msgstr "Modifier ressource enregistré"
+
+#: ajax_htmldata.php:1691
+msgid "No saved requests"
+msgstr ""
+
+#: ajax_htmldata.php:1697 ajax_htmldata.php:1766 ajax_htmldata.php:1829
+#: ajax_htmldata.php:2042
+msgid "ID"
+msgstr ""
+
+#: ajax_htmldata.php:1699 ajax_htmldata.php:1768 ajax_htmldata.php:2045
+#, fuzzy
+msgid "Date Created"
+msgstr "Date de création entre"
+
+#: ajax_htmldata.php:1701 ajax_htmldata.php:1770 ajax_htmldata.php:2047
+#: index.php:123
+msgid "Status"
+msgstr "Statut"
+
+#: ajax_htmldata.php:1729
+msgid "edit request"
+msgstr ""
+
+#: ajax_htmldata.php:1730
+#, fuzzy
+msgid "remove request"
+msgstr "supprimer "
+
+#: ajax_htmldata.php:1755
+msgid "Submitted Requests"
+msgstr ""
+
+#: ajax_htmldata.php:1760
+msgid "No submitted requests"
+msgstr ""
+
+#: ajax_htmldata.php:1817
+msgid "Outstanding Tasks"
+msgstr ""
+
+#: ajax_htmldata.php:1822
+msgid "No outstanding requests"
+msgstr ""
+
+#: ajax_htmldata.php:1832 index.php:553
+msgid "Routing Step"
+msgstr "Etape de routage"
+
+#: ajax_htmldata.php:1968
+msgid "Sorry, no requests fit your query"
+msgstr ""
+
+#: ajax_htmldata.php:1982
+msgid " to "
+msgstr ""
+
+#: ajax_htmldata.php:1982
+msgid " of "
+msgstr ""
+
+#: ajax_htmldata.php:1982
+#, fuzzy
+msgid " Resource Records"
+msgstr "Format de la ressource"
+
+#: ajax_htmldata.php:2028
+msgid "next page"
+msgstr ""
+
+#: ajax_htmldata.php:2044 index.php:154
+msgid "Creator"
+msgstr "Créateur"
+
+#: ajax_htmldata.php:2091
+msgid "previous page"
+msgstr ""
+
+#: ajax_htmldata.php:2142
+msgid "records per page"
+msgstr ""
+
+#: ajax_htmldata.php:2203
+#, fuzzy
+msgid "edit user"
+msgstr "Modifierl l'utilisateur"
+
+#: ajax_htmldata.php:2204 ajax_htmldata.php:2252 ajax_htmldata.php:2296
+#: ajax_htmldata.php:2344 ajax_htmldata.php:2374 ajax_htmldata.php:2434
+#: ajax_htmldata.php:2485 ajax_htmldata.php:2528 ajax_htmldata.php:2572
+#: ajax_htmldata.php:2613
+#, fuzzy
+msgid "remove"
+msgstr "supprimer "
+
+#: ajax_htmldata.php:2210 ajax_htmldata.php:2214
+#, fuzzy
+msgid "add new user"
+msgstr "Ajouter un utilisateur"
+
+#: ajax_htmldata.php:2264
+#, fuzzy
+msgid "add new currency"
+msgstr "Ajouter Concurrence"
+
+#: ajax_htmldata.php:2286 ajax_htmldata.php:2518 ajax_htmldata.php:2559
+#: ajax_htmldata.php:2601
+msgid "Value"
+msgstr ""
+
+#: ajax_htmldata.php:2308 ajax_htmldata.php:2540 ajax_htmldata.php:2628
+#, fuzzy
+msgid "add new "
+msgstr "ajouter une note"
+
+#: ajax_htmldata.php:2356
+#, fuzzy
+msgid "add email address"
+msgstr "Ajouter alerte d'adresse email"
+
+#: ajax_htmldata.php:2364
+msgid "Days in advance of expiration"
+msgstr ""
+
+#: ajax_htmldata.php:2389
+#, fuzzy
+msgid "add days"
+msgstr "ajouter alias"
+
+#: ajax_htmldata.php:2404
+#, fuzzy
+msgid "Workflow Setup"
+msgstr "Étapes du Flux de travail"
+
+#: ajax_htmldata.php:2450
+msgid "You must set up at least one user group before you can add workflows"
+msgstr ""
+
+#: ajax_htmldata.php:2460
+#, fuzzy
+msgid "User Group Setup"
+msgstr "Group d'utilisateur"
+
+#: ajax_htmldata.php:2466
+#, fuzzy
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: ajax_htmldata.php:2498
+#, fuzzy
+msgid "add user group"
+msgstr "Ajouter groupé d'utilisateur"
+
+#: ajax_htmldata.php:2595 ajax_htmldata.php:2643 index.php:282
+msgid "Detailed Subject"
+msgstr "Sujet détaillé"
+
+#: ajax_htmldata.php:2636
+#, fuzzy
+msgid "Subject Relationships"
+msgstr "Ajouter / Modifier la relation des objets"
+
 #: index.php:26 templates/header.php:98
 msgid "Home"
 msgstr "Accueil"
@@ -724,14 +1344,6 @@ msgstr "Fonds"
 msgid "All"
 msgstr "Tous"
 
-#: index.php:123
-msgid "Status"
-msgstr "Statut"
-
-#: index.php:154
-msgid "Creator"
-msgstr "Créateur"
-
 #: index.php:218 index.php:220 index.php:259 index.php:261 index.php:290
 #: index.php:292 index.php:351 index.php:353 index.php:409 index.php:411
 #: index.php:441 index.php:443 index.php:473 index.php:475 index.php:503
@@ -743,10 +1355,6 @@ msgstr "(aucun)"
 msgid "Record ID"
 msgstr "ID d'enregistrement"
 
-#: index.php:282
-msgid "Detailed Subject"
-msgstr "Sujet détaillé"
-
 #: index.php:313
 msgid "Starts with"
 msgstr "Commence avec"
@@ -771,10 +1379,6 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: index.php:553
-msgid "Routing Step"
-msgstr "Etape de routage"
-
 #: resource.php:54
 msgid "Success!"
 msgstr "Fait!"
@@ -787,10 +1391,6 @@ msgstr "Nouvelle ressource ajouté"
 msgid "Cataloging"
 msgstr "Catalogage"
 
-#: resources/cataloging.php:106
-msgid "edit order information"
-msgstr "modifier l'order de l'information"
-
 #: resources/cataloging.php:114
 msgid "Identifier:"
 msgstr "Identifiant:"
@@ -839,22 +1439,6 @@ msgstr "Le catalogue d'information n'est pas disponible."
 msgid "edit cataloging details"
 msgstr "modifier les détails du catalogage"
 
-#: resources/cataloging.php:209
-msgid "Additional Notes"
-msgstr "Notes additionales"
-
-#: resources/cataloging.php:212 resources/cataloging.php:231
-msgid "add new note"
-msgstr "ajouter une note"
-
-#: resources/cataloging.php:220
-msgid "edit note"
-msgstr "modifier une note"
-
-#: resources/cataloging.php:220
-msgid "remove note"
-msgstr "effacer une note"
-
 #: resources/cataloging_edit.php:15
 msgid "Edit Cataloging"
 msgstr "Modifier le catalogage"

From dd76bf35c0fb25b34ab451e902c8371328d75c84 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 8 Apr 2015 11:02:55 +0200
Subject: [PATCH 005/159] Finished translate ajax_htmldata.php

---
 ajax_htmldata.php                    |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 12774 -> 20560 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 337 +++++++++++----------------
 3 files changed, 136 insertions(+), 203 deletions(-)

diff --git a/ajax_htmldata.php b/ajax_htmldata.php
index 4312bef..ed08da9 100644
--- a/ajax_htmldata.php
+++ b/ajax_htmldata.php
@@ -1979,7 +1979,7 @@
 			}
 
 			//div for displaying record count
-			echo "<span style='float:left; font-weight:bold; width:650px;'>Displaying " . $displayStartingRecNumber . _(" to ") . $displayEndingRecNumber . _(" of ") . $totalRecords . _(" Resource Records")."</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
+			echo "<span style='float:left; font-weight:bold; width:650px;'>"._("Displaying ") . $displayStartingRecNumber . _(" to ") . $displayEndingRecNumber . _(" of ") . $totalRecords . _(" Resource Records")."</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
 
 
 			//print out page selectors as long as there are more records than the number that should be displayed
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index f2c67df62086c60d4000d67c7712978e2a9b1346..ea3e8986ef77d67e92c75dd0c2032dd3523d1298 100644
GIT binary patch
literal 20560
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

literal 12774
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
b$EUns;1=BO)>$`8t7b2v05~3JC?oiPmgm;k

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 155a512..90cfa1e 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-07 16:59+0100\n"
-"PO-Revision-Date: 2015-04-07 17:00+0100\n"
+"POT-Creation-Date: 2015-04-08 11:01+0100\n"
+"PO-Revision-Date: 2015-04-08 11:01+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -21,7 +21,7 @@ msgstr "Utilisateurs"
 
 #: admin.php:52
 msgid "Workflow / User Group"
-msgstr "Flux de travail / Group utilisateur"
+msgstr "Workflow / Groupe d'utilisateur"
 
 #: admin.php:53
 msgid "Access Method"
@@ -451,7 +451,7 @@ msgstr "Administration du site(s)"
 
 #: ajax_forms.php:1826
 msgid "Edit Contact"
-msgstr "Modifierl le contact"
+msgstr "Modifier le contact"
 
 #: ajax_forms.php:1826
 msgid "Add Contact"
@@ -544,7 +544,7 @@ msgstr "Nom"
 
 #: ajax_forms.php:2368
 msgid "Edit User"
-msgstr "Modifierl l'utilisateur"
+msgstr "Modifier l'utilisateur"
 
 #: ajax_forms.php:2368
 msgid "Add New User"
@@ -593,7 +593,7 @@ msgstr "Ajouter alerte jours à l'avance"
 
 #: ajax_forms.php:2655
 msgid "Edit Workflow"
-msgstr "Modifier le flux de travail"
+msgstr "Modifier le workflow"
 
 #: ajax_forms.php:2664
 msgid "Resource Entry Requirements"
@@ -601,7 +601,7 @@ msgstr "Conditions d'entrée des ressources"
 
 #: ajax_forms.php:2727
 msgid "Workflow Steps"
-msgstr "Étapes du Flux de travail"
+msgstr "Étapes du Workflow"
 
 #: ajax_forms.php:2737
 msgid "Approval/Notification Group:"
@@ -625,11 +625,11 @@ msgstr "Modifier le groupe d'utilisateur"
 
 #: ajax_forms.php:2915
 msgid "Add User Group"
-msgstr "Ajouter groupé d'utilisateur"
+msgstr "Ajouter une groupe d'utilisateur"
 
 #: ajax_forms.php:2924
 msgid "User Group"
-msgstr "Group d'utilisateur"
+msgstr "Groupe d'utilisateur"
 
 #: ajax_forms.php:2932
 msgid "Group Name:"
@@ -653,7 +653,7 @@ msgstr "Supprimer un utilisateur du groupe"
 
 #: ajax_forms.php:3185
 msgid "Add / Edit Subject Relationships"
-msgstr "Ajouter / Modifier la relation des objets"
+msgstr "Ajouter / Modifier la relation des sujets"
 
 #: ajax_forms.php:3194 ajax_htmldata.php:2553 ajax_htmldata.php:2642
 #: index.php:251
@@ -662,31 +662,31 @@ msgstr "Sujet général"
 
 #: ajax_forms.php:3220
 msgid "Detailed Subjects"
-msgstr "Objet détaillé"
+msgstr "Sujet détaillé"
 
 #: ajax_forms.php:3242
 msgid "add detail subject"
-msgstr "Ajouter detail d'objet"
+msgstr "Ajouter detail du sujet"
 
 #: ajax_forms.php:3272
 msgid "remove detailed subject"
-msgstr "Supprimer objet détaillé"
+msgstr "Supprimer le sujet détaillé"
 
 #: ajax_forms.php:3274 ajax_htmldata.php:2615
 msgid "subject in use"
-msgstr "Objet en utilisation"
+msgstr "Sujet en utilisation"
 
 #: ajax_forms.php:3318
 msgid "Add General / Detail Subject Link"
-msgstr "Ajouter général / détail lien d'objet"
+msgstr "Ajouter général / détail lien du sujet"
 
 #: ajax_forms.php:3325
 msgid "General Subject Name"
-msgstr "Nom général d'objet"
+msgstr "Nom général du sujet"
 
 #: ajax_forms.php:3326
 msgid "Detail Subject Name"
-msgstr "Détail du nom d'objet"
+msgstr "Détail du nom de sujet"
 
 #: ajax_forms.php:3338 ajax_forms.php:3345
 msgid "add"
@@ -715,96 +715,80 @@ msgstr " ne pas etabli!"
 #: ajax_htmldata.php:2373 ajax_htmldata.php:2433 ajax_htmldata.php:2484
 #: ajax_htmldata.php:2527 ajax_htmldata.php:2568 ajax_htmldata.php:2610
 #: ajax_htmldata.php:2659
-#, fuzzy
 msgid "edit"
-msgstr "modifier une note"
+msgstr "modifier"
 
 #: ajax_htmldata.php:95 ajax_htmldata.php:660 ajax_htmldata.php:821
-#, fuzzy
 msgid "edit resource"
 msgstr "Modifier la ressource"
 
 #: ajax_htmldata.php:95
-#, fuzzy
 msgid "remove resource"
-msgstr "effacer une note"
+msgstr "Supprimer la ressource"
 
 #: ajax_htmldata.php:100
-#, fuzzy
 msgid "Record ID:"
-msgstr "ID d'enregistrement"
+msgstr "ID d'enregistrement:"
 
 #: ajax_htmldata.php:140
-#, fuzzy
 msgid "Created:"
-msgstr "Créateur"
+msgstr "Créé:"
 
 #: ajax_htmldata.php:165
-#, fuzzy
 msgid "Last Update:"
-msgstr "Nom"
+msgstr "Dernière mise à jour:"
 
 #: ajax_htmldata.php:190
 msgid "Related Products:"
-msgstr ""
+msgstr "Produits connexes:"
 
 #: ajax_htmldata.php:192
 msgid "Child:"
-msgstr ""
+msgstr "Enfant:"
 
 #: ajax_htmldata.php:199
-#, fuzzy
 msgid "(Parent)"
-msgstr "Parent:"
+msgstr "(Parent)"
 
 #: ajax_htmldata.php:199 ajax_htmldata.php:212
-#, fuzzy
 msgid "view resource"
-msgstr "Nouvelle ressource"
+msgstr "Voir la ressource"
 
 #: ajax_htmldata.php:199 ajax_htmldata.php:212 ajax_htmldata.php:260
 msgid "View "
-msgstr ""
+msgstr "Voir"
 
 #: ajax_htmldata.php:236
-#, fuzzy
 msgid "Aliases:"
-msgstr "Des alias:"
+msgstr "Aliases:"
 
 #: ajax_htmldata.php:253
-#, fuzzy
 msgid "Organizations:"
-msgstr "Organisation"
+msgstr "Organisations:"
 
 #: ajax_htmldata.php:274
-#, fuzzy
 msgid "Resource URL:"
-msgstr "Source URL: "
+msgstr "Ressource URL: "
 
 #: ajax_htmldata.php:275
-#, fuzzy
 msgid "Visit Resource URL"
-msgstr "Source URL de visite"
+msgstr "Ressource URL de visite"
 
 #: ajax_htmldata.php:283
-#, fuzzy
 msgid "Visit Secondary Resource URL"
-msgstr "Source URL de visite"
+msgstr "Ressource URL secondaire de visite"
 
 #: ajax_htmldata.php:298
-#, fuzzy
 msgid "edit product details"
-msgstr "modifier les détails du catalogage"
+msgstr "modifier les détails du produit"
 
 #: ajax_htmldata.php:365
-#, fuzzy
 msgid "remove subject"
-msgstr "Supprimer objet détaillé"
+msgstr "Supprimer le sujet"
 
 #: ajax_htmldata.php:386
-#, fuzzy
 msgid "add new subject"
-msgstr "Ajouter detail d'objet"
+msgstr "Ajouter nouveau sujet"
 
 #: ajax_htmldata.php:433 ajax_htmldata.php:752 ajax_htmldata.php:945
 #: resources/cataloging.php:209
@@ -832,339 +816,296 @@ msgid "edit order information"
 msgstr "modifier l'order de l'information"
 
 #: ajax_htmldata.php:586
-#, fuzzy
 msgid "Purchasing Sites:"
-msgstr "Site d'achat"
+msgstr "Site d'achats:"
 
 #: ajax_htmldata.php:602
 msgid "Expiration Alert Enabled"
-msgstr ""
+msgstr "Alerte d'expiration activé"
 
 #: ajax_htmldata.php:642
-#, fuzzy
 msgid "No payment information available."
-msgstr "Le catalogue d'information n'est pas disponible."
+msgstr "L'information du payment n'est pas disponible."
 
 #: ajax_htmldata.php:648
-#, fuzzy
 msgid "edit acquisitions information"
 msgstr "modifier l'information des acquisitions"
 
 #: ajax_htmldata.php:658
-#, fuzzy
 msgid "License"
-msgstr " licence"
+msgstr "Llicence"
 
 #: ajax_htmldata.php:672
 msgid " on "
-msgstr ""
+msgstr " sur "
 
 #: ajax_htmldata.php:685
-#, fuzzy
 msgid "Licenses:"
-msgstr "Modifier les licences"
+msgstr "Licences:"
 
 #: ajax_htmldata.php:691
-#, fuzzy
 msgid "View License"
-msgstr "Modifier les licences"
+msgstr "Voir la licence"
 
 #: ajax_htmldata.php:694
-#, fuzzy
 msgid "No associated licenses available."
-msgstr "Le catalogue d'information n'est pas disponible."
+msgstr "Pas des licences associées disponibles."
 
 #: ajax_htmldata.php:708
-#, fuzzy
 msgid "edit license and status"
-msgstr "Statut de la licence"
+msgstr "Modifier la licence et le statut"
 
 #: ajax_htmldata.php:710
-#, fuzzy
 msgid "edit license status"
-msgstr "Statut de la licence"
+msgstr "Modifier le statut de la licence"
 
 #: ajax_htmldata.php:817
-#, fuzzy
 msgid "Access Information"
-msgstr "modifier l'information des acquisitions"
+msgstr "Infromation d'accès"
 
 #: ajax_htmldata.php:829
-#, fuzzy
 msgid "Administering Sites:"
-msgstr "Administration du site"
+msgstr "Administration des sites:"
 
 #: ajax_htmldata.php:836
-#, fuzzy
 msgid "Authorized Sites:"
-msgstr "Site autorisé"
+msgstr "Sites autorisés:"
 
 #: ajax_htmldata.php:851
-#, fuzzy
 msgid "Username / Password:"
-msgstr "Mot de passe:"
+msgstr "Nom d'utilisateur / Mot de passe:"
 
 #: ajax_htmldata.php:866
-#, fuzzy
 msgid "Registered IP Address:"
-msgstr "Email enregistré:"
+msgstr "Adresse IP enregistré:"
 
 #: ajax_htmldata.php:895
-#, fuzzy
 msgid "No access information available."
-msgstr "L'information de statut de la licence n'est pas disponible."
+msgstr "Pas d'information d'accès disponible."
 
 #: ajax_htmldata.php:902
-#, fuzzy
 msgid "edit access information"
-msgstr "modifier l'order de l'information"
+msgstr "modifier l'accès à l'information"
 
 #: ajax_htmldata.php:998
 msgid "The following are archived contacts:"
-msgstr ""
+msgstr "Les suivantes contacts sont archivées: "
 
 #: ajax_htmldata.php:1010 ajax_htmldata.php:1207
-#, fuzzy
 msgid "Resource Specific:"
-msgstr "Type de ressource"
+msgstr "Ressource spécifique:"
 
 #: ajax_htmldata.php:1014
 msgid "No Resource Specific Contacts"
-msgstr ""
+msgstr "Il n'y a pas une ressource spécifique par les contacts"
 
 #: ajax_htmldata.php:1018 ajax_htmldata.php:1162 ajax_htmldata.php:1172
-#, fuzzy
 msgid "add contact"
 msgstr "Ajouter un contact"
 
 #: ajax_htmldata.php:1023 ajax_htmldata.php:1220
 msgid "Inherited:"
-msgstr ""
+msgstr "Hérité:"
 
 #: ajax_htmldata.php:1043
-#, fuzzy
 msgid "edit contact"
-msgstr "Modifierl le contact"
+msgstr "Modifier le contact"
 
 #: ajax_htmldata.php:1044
-#, fuzzy
 msgid "remove contact"
-msgstr "effacer une note"
+msgstr "Supprimer le contact"
 
 #: ajax_htmldata.php:1059
 msgid "Visit Contact in Organizations Module"
-msgstr ""
+msgstr "Visitez contact dans le module Organisations"
 
 #: ajax_htmldata.php:1067
 msgid "No longer valid:"
-msgstr ""
+msgstr "N'est plus valide:"
 
 #: ajax_htmldata.php:1091
-#, fuzzy
 msgid "Location:"
-msgstr "Lieu de stockage:"
+msgstr "Emplacement:"
 
 #: ajax_htmldata.php:1148 ajax_htmldata.php:1281
-#, fuzzy
 msgid "Last Updated:"
-msgstr "Nom"
+msgstr "Dernière mise à jour:"
 
 #: ajax_htmldata.php:1170
-#, fuzzy
 msgid "No contacts available"
-msgstr "# Enregistrements disponibles"
+msgstr "Pas de contacts disponibles"
 
 #: ajax_htmldata.php:1180
 msgid " archived contact(s) available. "
-msgstr ""
+msgstr " contact(s) archivée(s) disponible(s)."
 
 #: ajax_htmldata.php:1180
 msgid "show archived contacts"
-msgstr ""
+msgstr "montrer les contacts archivées"
 
 #: ajax_htmldata.php:1184
 msgid "hide archived contacts"
-msgstr ""
+msgstr "cacher les contacts archivées"
 
 #: ajax_htmldata.php:1211
 msgid "No Resource Specific Accounts"
-msgstr ""
+msgstr "Il n'y a pas une ressource spécifié par les comptes"
 
 #: ajax_htmldata.php:1215 ajax_htmldata.php:1312
-#, fuzzy
 msgid "add new account"
-msgstr "ajouter une note"
+msgstr "ajouter une nouvelle compte"
 
 #: ajax_htmldata.php:1237
-#, fuzzy
 msgid "edit account"
 msgstr "Modifier la compte"
 
 #: ajax_htmldata.php:1237
-#, fuzzy
 msgid "remove account"
-msgstr "effacer une note"
+msgstr "Supprimer une compte"
 
 #: ajax_htmldata.php:1250
 msgid "Visit Account in Organizations Module"
-msgstr ""
+msgstr "Visitez Comptes sur le module Organisations"
 
 #: ajax_htmldata.php:1257
-#, fuzzy
 msgid "Login URL:"
-msgstr "Type d'acèss (login):"
+msgstr "URL d'accès(login):"
 
 #: ajax_htmldata.php:1258
-#, fuzzy
 msgid "Visit Login URL"
-msgstr "Source URL de visite"
+msgstr "Source URL d'accès(login)"
 
 #: ajax_htmldata.php:1265
-#, fuzzy
 msgid "User Name:"
 msgstr "Nom d'utilisateur:"
 
 #: ajax_htmldata.php:1307
-#, fuzzy
 msgid "No accounts available"
-msgstr "# Enregistrements disponibles"
+msgstr "Pas des comptes disponibles"
 
 #: ajax_htmldata.php:1350
-#, fuzzy
 msgid "view attachment"
-msgstr "Modifier la fixation"
+msgstr "Voir la fixation"
 
 #: ajax_htmldata.php:1355
-#, fuzzy
 msgid "edit attachment"
 msgstr "Modifier la fixation"
 
 #: ajax_htmldata.php:1355
-#, fuzzy
 msgid "remove this attachment"
-msgstr "effacer ce payment"
+msgstr "suopprimer cette fixation"
 
 #: ajax_htmldata.php:1387
-#, fuzzy
 msgid "No attachments available"
-msgstr "Le catalogue d'information n'est pas disponible."
+msgstr "Pas des fixations disponibles."
 
 #: ajax_htmldata.php:1392
-#, fuzzy
 msgid "add new attachment"
-msgstr "Ajouter fixation"
+msgstr "Ajouter une nouvelle fixation"
 
 #: ajax_htmldata.php:1416
 msgid ""
 "No workflow steps have been set up for this resource's combination of "
 "Acquisition Type and Resource Format."
 msgstr ""
+"Pas d'étapes de workflow ont été mis en place pour la combinaison de Type "
+"d'Acquisition et le Format de Ressource."
 
 #: ajax_htmldata.php:1416
 msgid ""
 "If you think this is in error, please contact your workflow administrator."
 msgstr ""
+"Si vous pensez qui cet un erreur, s'il vous plaît contactez à "
+"l'administrateur de workflow"
 
 #: ajax_htmldata.php:1418
 msgid "Not entered into workflow."
-msgstr ""
+msgstr "N'a pas entré dans le workflow"
 
 #: ajax_htmldata.php:1424
 msgid "Step"
-msgstr ""
+msgstr "Étape"
 
 #: ajax_htmldata.php:1425
-#, fuzzy
 msgid "Group"
-msgstr "Group d'utilisateur"
+msgstr "Groupe"
 
 #: ajax_htmldata.php:1426 ajax_htmldata.php:1833
-#, fuzzy
 msgid "Start Date"
-msgstr "Commence avec"
+msgstr "Date de début"
 
 #: ajax_htmldata.php:1427
 msgid "Complete"
-msgstr ""
+msgstr "Complète"
 
 #: ajax_htmldata.php:1458
 msgid "mark complete"
-msgstr ""
+msgstr "marquer comme complète"
 
 #: ajax_htmldata.php:1480 ajax_htmldata.php:1482
-#, fuzzy
 msgid "Workflow completed on "
-msgstr "Étapes du Flux de travail"
+msgstr "Workflow completé le "
 
 #: ajax_htmldata.php:1486 ajax_htmldata.php:1488
-#, fuzzy
 msgid "Workflow restarted on "
-msgstr "Étapes du Flux de travail"
+msgstr "Workflow redémarré le "
 
 #: ajax_htmldata.php:1498
-#, fuzzy
 msgid "restart workflow"
-msgstr "Modifier le flux de travail"
+msgstr "Redémarrer le workflow"
 
 #: ajax_htmldata.php:1499
 msgid "mark entire workflow complete"
-msgstr ""
+msgstr "marquer tout le workflow comme complète"
 
 #: ajax_htmldata.php:1587
 msgid "Print View"
-msgstr ""
+msgstr "Imprimer ***"
 
 #: ajax_htmldata.php:1589
-#, fuzzy
 msgid "Catalog View"
-msgstr "Catalogage"
+msgstr "Voir le Catalogue"
 
 #: ajax_htmldata.php:1600
-#, fuzzy
 msgid "Parent Record"
-msgstr "Parent étape"
+msgstr "Registre du parent"
 
 #: ajax_htmldata.php:1606
-#, fuzzy
 msgid "Child Record(s)"
-msgstr "Licences entregistrées"
+msgstr "Registre(s) enfant(s)"
 
 #: ajax_htmldata.php:1625
-#, fuzzy
 msgid "Organizations Module"
-msgstr "Rôle dans l'organisation"
+msgstr "Module d'organisations"
 
 #: ajax_htmldata.php:1641
-#, fuzzy
 msgid "Licensing Module"
-msgstr "Statut des licences"
+msgstr "Module des licences"
 
 #: ajax_htmldata.php:1659
 msgid "Usage Statistics Module"
-msgstr ""
+msgstr "Module des statistiques d'utilisation"
 
 #: ajax_htmldata.php:1665
 msgid "Get Statistics"
-msgstr ""
+msgstr "Obtenir les statistiques"
 
 #: ajax_htmldata.php:1686
-#, fuzzy
 msgid "Saved Requests"
-msgstr "Modifier ressource enregistré"
+msgstr "Rêquetes enregistrées"
 
 #: ajax_htmldata.php:1691
 msgid "No saved requests"
-msgstr ""
+msgstr "Pas des requêtes enregistrées"
 
 #: ajax_htmldata.php:1697 ajax_htmldata.php:1766 ajax_htmldata.php:1829
 #: ajax_htmldata.php:2042
 msgid "ID"
-msgstr ""
+msgstr "Identifiant"
 
 #: ajax_htmldata.php:1699 ajax_htmldata.php:1768 ajax_htmldata.php:2045
-#, fuzzy
 msgid "Date Created"
-msgstr "Date de création entre"
+msgstr "Date de création"
 
 #: ajax_htmldata.php:1701 ajax_htmldata.php:1770 ajax_htmldata.php:2047
 #: index.php:123
@@ -1173,28 +1114,27 @@ msgstr "Statut"
 
 #: ajax_htmldata.php:1729
 msgid "edit request"
-msgstr ""
+msgstr "modifier la requête"
 
 #: ajax_htmldata.php:1730
-#, fuzzy
 msgid "remove request"
-msgstr "supprimer "
+msgstr "supprimer la requête"
 
 #: ajax_htmldata.php:1755
 msgid "Submitted Requests"
-msgstr ""
+msgstr "Requêtes Enregistrées"
 
 #: ajax_htmldata.php:1760
 msgid "No submitted requests"
-msgstr ""
+msgstr "Pas des requêtes soumises"
 
 #: ajax_htmldata.php:1817
 msgid "Outstanding Tasks"
-msgstr ""
+msgstr "Tâches en suspens"
 
 #: ajax_htmldata.php:1822
 msgid "No outstanding requests"
-msgstr ""
+msgstr "Pas des requêtes en suspens"
 
 #: ajax_htmldata.php:1832 index.php:553
 msgid "Routing Step"
@@ -1202,24 +1142,27 @@ msgstr "Etape de routage"
 
 #: ajax_htmldata.php:1968
 msgid "Sorry, no requests fit your query"
-msgstr ""
+msgstr "Désolé, il n'y a pas des résultats par votre requête"
+
+#: ajax_htmldata.php:1982
+msgid "Displaying "
+msgstr "En montrant "
 
 #: ajax_htmldata.php:1982
 msgid " to "
-msgstr ""
+msgstr " par "
 
 #: ajax_htmldata.php:1982
 msgid " of "
-msgstr ""
+msgstr " de "
 
 #: ajax_htmldata.php:1982
-#, fuzzy
 msgid " Resource Records"
-msgstr "Format de la ressource"
+msgstr " Resources enregistrées"
 
 #: ajax_htmldata.php:2028
 msgid "next page"
-msgstr ""
+msgstr "page suivante"
 
 #: ajax_htmldata.php:2044 index.php:154
 msgid "Creator"
@@ -1227,91 +1170,81 @@ msgstr "Créateur"
 
 #: ajax_htmldata.php:2091
 msgid "previous page"
-msgstr ""
+msgstr "page précédente"
 
 #: ajax_htmldata.php:2142
 msgid "records per page"
-msgstr ""
+msgstr "resultats par page"
 
 #: ajax_htmldata.php:2203
-#, fuzzy
 msgid "edit user"
-msgstr "Modifierl l'utilisateur"
+msgstr "Modifier l'utilisateur"
 
 #: ajax_htmldata.php:2204 ajax_htmldata.php:2252 ajax_htmldata.php:2296
 #: ajax_htmldata.php:2344 ajax_htmldata.php:2374 ajax_htmldata.php:2434
 #: ajax_htmldata.php:2485 ajax_htmldata.php:2528 ajax_htmldata.php:2572
 #: ajax_htmldata.php:2613
-#, fuzzy
 msgid "remove"
-msgstr "supprimer "
+msgstr "supprimer"
 
 #: ajax_htmldata.php:2210 ajax_htmldata.php:2214
-#, fuzzy
 msgid "add new user"
-msgstr "Ajouter un utilisateur"
+msgstr "Ajouter un nouveau utilisateur"
 
 #: ajax_htmldata.php:2264
-#, fuzzy
 msgid "add new currency"
-msgstr "Ajouter Concurrence"
+msgstr "Ajouter une vouvelle concurrence"
 
 #: ajax_htmldata.php:2286 ajax_htmldata.php:2518 ajax_htmldata.php:2559
 #: ajax_htmldata.php:2601
 msgid "Value"
-msgstr ""
+msgstr "Valeur"
 
 #: ajax_htmldata.php:2308 ajax_htmldata.php:2540 ajax_htmldata.php:2628
-#, fuzzy
 msgid "add new "
-msgstr "ajouter une note"
+msgstr "ajouter un nouveau  "
 
 #: ajax_htmldata.php:2356
-#, fuzzy
 msgid "add email address"
-msgstr "Ajouter alerte d'adresse email"
+msgstr "Ajouter une nouvelle adresse email"
 
 #: ajax_htmldata.php:2364
 msgid "Days in advance of expiration"
-msgstr ""
+msgstr "Jours à l'avance de expiration"
 
 #: ajax_htmldata.php:2389
-#, fuzzy
 msgid "add days"
-msgstr "ajouter alias"
+msgstr "ajouter jours"
 
 #: ajax_htmldata.php:2404
-#, fuzzy
 msgid "Workflow Setup"
-msgstr "Étapes du Flux de travail"
+msgstr "Configuration du workflow"
 
 #: ajax_htmldata.php:2450
 msgid "You must set up at least one user group before you can add workflows"
 msgstr ""
+"Vous devez configurer au moins une groupe, après vous pouvez ajouter "
+"workflows"
 
 #: ajax_htmldata.php:2460
-#, fuzzy
 msgid "User Group Setup"
-msgstr "Group d'utilisateur"
+msgstr "Configuration de groupe d'utilisateur"
 
 #: ajax_htmldata.php:2466
-#, fuzzy
 msgid "Group Name"
 msgstr "Nom du groupe"
 
 #: ajax_htmldata.php:2498
-#, fuzzy
 msgid "add user group"
-msgstr "Ajouter groupé d'utilisateur"
+msgstr "Ajouter groupe d'utilisateur"
 
 #: ajax_htmldata.php:2595 ajax_htmldata.php:2643 index.php:282
 msgid "Detailed Subject"
 msgstr "Sujet détaillé"
 
 #: ajax_htmldata.php:2636
-#, fuzzy
 msgid "Subject Relationships"
-msgstr "Ajouter / Modifier la relation des objets"
+msgstr "Relation des sujets"
 
 #: index.php:26 templates/header.php:98
 msgid "Home"

From c5c8399578bc4d87adc6dfad5b94f03f68274e1c Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 8 Apr 2015 12:16:35 +0200
Subject: [PATCH 006/159] Finished translate files PHP

---
 ajax_processing.php                  |  24 +++----
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 20560 -> 22610 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 104 +++++++++++++++++++++++----
 queue.php                            |  12 ++--
 sendAlerts.php                       |   4 +-
 templates/header.php                 |   2 +-
 6 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/ajax_processing.php b/ajax_processing.php
index 0ec7ec3..e2d5d95 100644
--- a/ajax_processing.php
+++ b/ajax_processing.php
@@ -61,7 +61,7 @@
 
 		try {
 			$resourceNote->delete();
-			echo "Note successfully deleted.";
+			echo _("Note successfully deleted.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
@@ -334,7 +334,7 @@
 
 		try {
 			$resource->removeResource();
-			echo "Resource successfully deleted.";
+			echo _("Resource successfully deleted.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
@@ -715,10 +715,10 @@
 				//set to web rwx, everyone else rw
 				//this way we can edit the attachment directly on the server
 				chmod ($target_path, 0766);
-				echo "success uploading!";
+				echo _("success uploading!");
 			} else {
 			  header('HTTP/1.1 500 Internal Server Error');
-			  echo "<div id=\"error\">There was a problem saving your file to $target_path.  Please ensure your attachments directory is writable.</div>";
+			  echo "<div id='error'>"._("There was a problem saving your file to ").$target_path.  _("Please ensure your attachments directory is writable.")."</div>";
 			}
 
 		}
@@ -737,13 +737,13 @@
 
 		if ($numberOfChildren > 0){
 			//print out a friendly message...
-			echo "Unable to delete  - this " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " is in use.  Please make sure no resources are set up with this information.";
+			echo _("Unable to delete  - this ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" is in use.  Please make sure no resources are set up with this information.");
 		}else{
 			try {
 				$instance->delete();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 		}
 
@@ -886,7 +886,7 @@
 
 		try {
 			$user->save();
-			echo "User successfully saved.";
+			echo _("User successfully saved.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
@@ -1207,7 +1207,7 @@
 				$instance->deleteGeneralSubject();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 
 		break;
@@ -1224,7 +1224,7 @@
 				$instance->delete();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 
 		break;
@@ -1357,7 +1357,7 @@
 				echo $e->getMessage();
 			}
 		} else {
-			echo "A duplicate " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " exists.";
+			echo _("A duplicate ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" exists.");
 		}
 
  		break;
@@ -1383,7 +1383,7 @@
 				echo $e->getMessage();
 			}
 		} else {
-			echo "A duplicate " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " exists.";
+			echo _("A duplicate ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" exists.");
 		}
 
 
@@ -1396,7 +1396,7 @@
 
 
 	default:
-       echo "Action " . $action . " not set up!";
+       echo _("Action ") . $action . _(" not set up!");
        break;
 
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index ea3e8986ef77d67e92c75dd0c2032dd3523d1298..314ecfdc18c0fe29f452376c9c8dd11e2a92f8bb 100644
GIT binary patch
delta 9447
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

delta 7416
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 90cfa1e..a5e829d 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-08 11:01+0100\n"
-"PO-Revision-Date: 2015-04-08 11:01+0100\n"
+"POT-Creation-Date: 2015-04-08 12:08+0100\n"
+"PO-Revision-Date: 2015-04-08 12:08+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -121,7 +121,7 @@ msgstr "Sujets"
 msgid "User Limit"
 msgstr "Limit d'utilisateurs"
 
-#: admin.php:92
+#: admin.php:92 queue.php:59
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -699,11 +699,11 @@ msgstr "ajouter"
 msgid "(none found)"
 msgstr "(non trouvé)"
 
-#: ajax_forms.php:3374 ajax_htmldata.php:2677
+#: ajax_forms.php:3374 ajax_htmldata.php:2677 ajax_processing.php:1399
 msgid "Action "
 msgstr "Action"
 
-#: ajax_forms.php:3374 ajax_htmldata.php:2677
+#: ajax_forms.php:3374 ajax_htmldata.php:2677 ajax_processing.php:1399
 msgid " not set up!"
 msgstr " ne pas etabli!"
 
@@ -1090,7 +1090,7 @@ msgstr "Module des statistiques d'utilisation"
 msgid "Get Statistics"
 msgstr "Obtenir les statistiques"
 
-#: ajax_htmldata.php:1686
+#: ajax_htmldata.php:1686 queue.php:52
 msgid "Saved Requests"
 msgstr "Rêquetes enregistrées"
 
@@ -1120,15 +1120,15 @@ msgstr "modifier la requête"
 msgid "remove request"
 msgstr "supprimer la requête"
 
-#: ajax_htmldata.php:1755
+#: ajax_htmldata.php:1755 queue.php:53
 msgid "Submitted Requests"
-msgstr "Requêtes Enregistrées"
+msgstr "Requêtes soumises"
 
 #: ajax_htmldata.php:1760
 msgid "No submitted requests"
 msgstr "Pas des requêtes soumises"
 
-#: ajax_htmldata.php:1817
+#: ajax_htmldata.php:1817 queue.php:51
 msgid "Outstanding Tasks"
 msgstr "Tâches en suspens"
 
@@ -1150,7 +1150,7 @@ msgstr "En montrant "
 
 #: ajax_htmldata.php:1982
 msgid " to "
-msgstr " par "
+msgstr " sur "
 
 #: ajax_htmldata.php:1982
 msgid " of "
@@ -1246,6 +1246,59 @@ msgstr "Sujet détaillé"
 msgid "Subject Relationships"
 msgstr "Relation des sujets"
 
+#: ajax_processing.php:64
+msgid "Note successfully deleted."
+msgstr "La note a été supprimé avec succès."
+
+#: ajax_processing.php:337
+msgid "Resource successfully deleted."
+msgstr "La ressource a été supprimé avec succès"
+
+#: ajax_processing.php:718
+msgid "success uploading!"
+msgstr "Téléchargement correcte!"
+
+#: ajax_processing.php:721
+msgid "There was a problem saving your file to "
+msgstr "Il y avait un problème pour enregistrer votre fichier sur "
+
+#: ajax_processing.php:721
+msgid "Please ensure your attachments directory is writable."
+msgstr ""
+"S'il vous plaît, verifiez que votre dossier de attachement a des droits "
+"d'écriture."
+
+#: ajax_processing.php:740
+msgid "Unable to delete  - this "
+msgstr "N'est pas possible supprimer - "
+
+#: ajax_processing.php:740
+msgid ""
+" is in use.  Please make sure no resources are set up with this information."
+msgstr ""
+"est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
+"configurée avec cet information."
+
+#: ajax_processing.php:746 ajax_processing.php:1210 ajax_processing.php:1227
+msgid ""
+"Unable to delete.  Please make sure no resources are set up with this "
+"information."
+msgstr ""
+"N'est pas possible supprimer. S'il vous plaît, assurez-vous  qu'aucune "
+"ressource est configurée avec cet information."
+
+#: ajax_processing.php:889
+msgid "User successfully saved."
+msgstr "Utilisateur enregistré avec succès"
+
+#: ajax_processing.php:1360 ajax_processing.php:1386
+msgid "A duplicate "
+msgstr "Il y a un doublon "
+
+#: ajax_processing.php:1360 ajax_processing.php:1386
+msgid " exists."
+msgstr " existant."
+
 #: index.php:26 templates/header.php:98
 msgid "Home"
 msgstr "Accueil"
@@ -1312,6 +1365,10 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
+#: queue.php:22 queue.php:40 templates/header.php:100
+msgid "My Queue"
+msgstr "Ma liste"
+
 #: resource.php:54
 msgid "Success!"
 msgstr "Fait!"
@@ -1392,6 +1449,14 @@ msgstr "# Enregistrements chargées"
 msgid "OCLC Holdings"
 msgstr "OCLC Holdings"
 
+#: sendAlerts.php:76
+msgid "No Resources found fitting alert day criteria"
+msgstr "Pas des ressources trouvées selon les critères d'alerte du jour"
+
+#: sendAlerts.php:81
+msgid "Alerts not enabled in configuration.ini file"
+msgstr "Les Alertes ne sont pas activées dans le fichier configuration.ini"
+
 #: setuser.php:44
 msgid ""
 "LDAP Connection is not working or has timed out.  Please check configuration."
@@ -1400,6 +1465,21 @@ msgstr ""
 "La connexion LDAP ne marche pas ou a expiré. S'il vous plaît vérifiez la "
 "configuration du configuration.ini."
 
+#: templates/header.php:58
+msgid ""
+"JavaScript must be enabled in order for you to use CORAL. However, it seems "
+"JavaScript is either disabled or not supported by your browser. To use "
+"CORAL, enable JavaScript by changing your browser options, then "
+msgstr ""
+"JavaScript doit être activé pour utiliser CORAL. Cependant, on semble qui "
+"JavaScript est desactivé ou n'est pas supporté par votre navigateur. Pour "
+"utiliser CORAL, activez JavaScript en modifiant la configuration de votre "
+"navigateur, après "
+
+#: templates/header.php:58
+msgid "try again"
+msgstr "réessayez"
+
 #: templates/header.php:77
 msgid "Hello, "
 msgstr "Bonjour, "
@@ -1412,10 +1492,6 @@ msgstr "Se déconnecter"
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
-#: templates/header.php:100
-msgid "My Queue"
-msgstr "Ma liste"
-
 #: templates/header.php:101
 msgid "Admin"
 msgstr "Administrateur"
diff --git a/queue.php b/queue.php
index 2b897b1..8d00e36 100644
--- a/queue.php
+++ b/queue.php
@@ -19,7 +19,7 @@
 
 include_once 'directory.php';
 
-$pageTitle='My Queue';
+$pageTitle=_('My Queue');
 include 'templates/header.php';
 
 //set referring page
@@ -37,7 +37,7 @@
 		<table style='width:100%; margin:0 0 11px 0;padding:0;'>
 		<tr style='vertical-align:top'>
 		<td>
-		<span class="headerText">My Queue</span>
+		<span class="headerText"><?= _("My Queue");?></span>
 		<br />
 		</td>
 		</tr>
@@ -48,15 +48,15 @@
 		<tr>
 		<td style='width:170px;vertical-align:top;'>
 			<table class='queueMenuTable' style='width:170px;'>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='OutstandingTasks'>Outstanding Tasks</a></div><span class='span_OutstandingTasksNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SavedRequests'>Saved Requests</a></div><span class='span_SavedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SubmittedRequests'>Submitted Requests</a></div><span class='span_SubmittedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='OutstandingTasks'><?= _("Outstanding Tasks");?></a></div><span class='span_OutstandingTasksNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SavedRequests'><?= _("Saved Requests");?></a></div><span class='span_SavedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SubmittedRequests'><?= _("Submitted Requests");?></a></div><span class='span_SubmittedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
 
 			</table>
 		</td>
 		<td class='queueRightPanel' style='width:720px;margin:0;'>
 			<div id='div_QueueContent'>
-			<img src = "images/circle.gif" />Loading...
+			<img src = "images/circle.gif" /><?= _("Loading...");?>
 			</div>
 			<div style='margin-top:5px;' class='darkRedText' id='div_error'></div>
 
diff --git a/sendAlerts.php b/sendAlerts.php
index cefb618..64e0398 100644
--- a/sendAlerts.php
+++ b/sendAlerts.php
@@ -73,12 +73,12 @@
 
 		}
 	}else{
-		echo "No Resources found fitting alert day criteria";
+		echo _("No Resources found fitting alert day criteria");
 	}
 
 
 }else{
-	echo "Alerts not enabled in configuration.ini file";
+	echo _("Alerts not enabled in configuration.ini file");
 }
 
 
diff --git a/templates/header.php b/templates/header.php
index a69faa8..0366be0 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -55,7 +55,7 @@
 <script type="text/javascript" src="js/common.js"></script>
 </head>
 <body>
-<noscript><font face=arial>JavaScript must be enabled in order for you to use CORAL. However, it seems JavaScript is either disabled or not supported by your browser. To use CORAL, enable JavaScript by changing your browser options, then <a href="">try again</a>. </font></noscript>
+<noscript><font face='arial'><?= _("JavaScript must be enabled in order for you to use CORAL. However, it seems JavaScript is either disabled or not supported by your browser. To use CORAL, enable JavaScript by changing your browser options, then ");?><a href=""><?= _("try again");?></a>. </font></noscript>
 
 <div class="wrapper">
 <center>

From 53c4fa6af9b7e109d49ae100a4d4b0b18f6f3608 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 8 Apr 2015 14:48:08 +0200
Subject: [PATCH 007/159] Change dynamic of language with the dropdown

---
 css/style.css                        |  17 ++++++++++-
 directory.php                        |  10 ++++---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22610 -> 22610 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   6 ++--
 templates/header.php                 |  42 ++++++++++++++++++++++++---
 5 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/css/style.css b/css/style.css
index 8f0d9e8..e759139 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1031,7 +1031,7 @@ input.dp-applied {
 }
 
 .adminAddInput{margin-top:5px;}
-.licenseAddInput{margin-top:5px;margin-bottom;5px;}
+.licenseAddInput{margin-top:5px;margin-bottom:5px;}
 
 
 
@@ -1080,3 +1080,18 @@ select option.changeSelect{
  border: solid 1px #a5acb2;  
  color: #526972;  
 } 
+
+/* Change language */
+.dropDownLang{
+    float:right; 
+    position:absolute; 
+    margin-left:135px; 
+    margin-top:-4px;
+    color: #3D545D;
+    background: #e4f5fc; /* Old browsers */
+    background: linear-gradient(to bottom, #c8d8e9 3%,#e2f0ff 52%,#c7cefc 100%); /* W3C */
+    border: none;
+    border-radius: 5px;
+    font-weight: bolder;
+    height:22px;
+}
\ No newline at end of file
diff --git a/directory.php b/directory.php
index 288598f..d86dfab 100644
--- a/directory.php
+++ b/directory.php
@@ -163,9 +163,12 @@ function debug($value) {
 }
 
     // Verify the language of the browser
-
-    $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
-
+    if(isset($_COOKIE["lang"])){
+        $http_lang = $_COOKIE["lang"];
+        //var_dump($language);
+    }else{
+        $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+    }
     switch ($http_lang) {
         case 'fr': 
             $language = "fr_FR.utf8"; 
@@ -181,5 +184,4 @@ function debug($value) {
 	setlocale(LC_ALL, $language);
 	bindtextdomain("messages", "./locale");
 	textdomain("messages");
-
 ?>
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 314ecfdc18c0fe29f452376c9c8dd11e2a92f8bb..c40bd45556d3044ef290373769c2c5776b8d4386 100644
GIT binary patch
delta 33
pcmcb#f$`D?#tk)QOh(3&>&#SGjIE4~HZL<vXJjne%xB@E007Y%3fKSu

delta 33
pcmcb#f$`D?#tk)QOa>N{>&#SGjI0bSHZL<vXJic8%xB@E007Xg3cUaT

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index a5e829d..4404dac 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-08 12:08+0100\n"
-"PO-Revision-Date: 2015-04-08 12:08+0100\n"
+"POT-Creation-Date: 2015-04-08 12:23+0100\n"
+"PO-Revision-Date: 2015-04-08 13:32+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -1158,7 +1158,7 @@ msgstr " de "
 
 #: ajax_htmldata.php:1982
 msgid " Resource Records"
-msgstr " Resources enregistrées"
+msgstr " resources enregistrées"
 
 #: ajax_htmldata.php:2028
 msgid "next page"
diff --git a/templates/header.php b/templates/header.php
index 0366be0..484f163 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -103,7 +103,7 @@
 
 </td>
 
-<td style='width:130px;height:19px;' align='right'>
+<td style='width:258px;height:19px;' align='right'>
 <?php
 
 //only show the 'Change Module' if there are other modules installed or if there is an index to the main CORAL page
@@ -111,10 +111,10 @@
 if ((file_exists($util->getCORALPath() . "index.php")) || ($config->settings->licensingModule == 'Y') || ($config->settings->organizationsModule == 'Y') || ($config->settings->cancellationModule == 'Y') || ($config->settings->usageModule == 'Y')) {
 
 	?>
-
+    
 	<div style='text-align:left;'>
 		<ul class="tabs">
-		<li style="background: url('images/change/coral-change.gif') no-repeat right;">&nbsp;
+		<li style="background: url('images/change/coral-change.gif') no-repeat right; position: absolute;">&nbsp;
 			<ul class="coraldropdown">
 				<?php if (file_exists($util->getCORALPath() . "index.php")) {?>
 				<li><a href="<?php echo $coralURL; ?>" target='_blank'><img src='images/change/coral-main.gif'></a></li>
@@ -142,8 +142,42 @@
 			</ul>
 		</li>
 		</ul>
-
+		<select name="lang" id="lang" class="dropDownLang">
+           <?php
+            $fr="<option value='fr' selected='selected'>Français</option><option value='en'>English</option>";
+            $en="<option value='fr'>Français</option><option value='en' selected='selected'>English</option>";
+            if(isset($_COOKIE["lang"])){
+                if($_COOKIE["lang"]=='fr'){
+                    echo $fr;
+                }else{
+                    echo $en;
+                }
+            }else{
+                $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+                if($defLang=='fr'){
+                    echo $fr;
+                }else{
+                    echo $en;
+                }
+            }
+            ?>
+            
+        </select>
 	</div>
+	<script>
+        $("#lang").change(function() {
+            setLanguage($("#lang").val());
+            location.reload();
+        });
+        
+        function setLanguage(lang) {
+			var wl = window.location, now = new Date(), time = now.getTime();
+            var cookievalid=86400000; // 1 jour (1000*60*60*24)
+            time += cookievalid;
+			now.setTime(time);
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now.toGMTString();
+	    }
+    </script>
 	<?php
 
 } else {

From 991ecc540559b8650a6f96d29c4c7d6ce472f663 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 8 Apr 2015 15:30:24 +0200
Subject: [PATCH 008/159] Fixed date of cookie

---
 templates/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/header.php b/templates/header.php
index 484f163..4874eb6 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -175,7 +175,7 @@ function setLanguage(lang) {
             var cookievalid=86400000; // 1 jour (1000*60*60*24)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now.toGMTString();
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
 	    }
     </script>
 	<?php

From 23d044663eeacd09c053a6dfc4c8d33b1f9935d0 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 8 Apr 2015 16:30:08 +0200
Subject: [PATCH 009/159] Change dropdown 'Change Module' to text/CSS

---
 css/style.css                        |  17 ++++++++++++++---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22610 -> 22658 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   8 ++++++--
 templates/header.php                 |   4 ++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/css/style.css b/css/style.css
index e759139..0e6c118 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1080,18 +1080,29 @@ select option.changeSelect{
  border: solid 1px #a5acb2;  
  color: #526972;  
 } 
+/* Change Module */
+.changeMod{
+    position: absolute;
+    background: #e4f5fc; /* Old browsers */
+    background: linear-gradient(to bottom, #c8d8e9 3%,#e2f0ff 52%,#c7cefc 100%); /* W3C */  
+    border: none;
+    border-radius: 5px;
+    text-align: center;
+    cursor: pointer;
+}
 
 /* Change language */
 .dropDownLang{
     float:right; 
     position:absolute; 
     margin-left:135px; 
-    margin-top:-4px;
+    margin-top:-22px;
     color: #3D545D;
     background: #e4f5fc; /* Old browsers */
     background: linear-gradient(to bottom, #c8d8e9 3%,#e2f0ff 52%,#c7cefc 100%); /* W3C */
     border: none;
     border-radius: 5px;
     font-weight: bolder;
-    height:22px;
-}
\ No newline at end of file
+    height:20px;
+    cursor: pointer;
+}
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index c40bd45556d3044ef290373769c2c5776b8d4386..e7e4fbe73407831dff24630d30b2886980defdff 100644
GIT binary patch
delta 7657
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

delta 7611
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 4404dac..2629730 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-08 12:23+0100\n"
-"PO-Revision-Date: 2015-04-08 13:32+0100\n"
+"POT-Creation-Date: 2015-04-08 16:23+0100\n"
+"PO-Revision-Date: 2015-04-08 16:23+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -1496,6 +1496,10 @@ msgstr "Nouvelle ressource"
 msgid "Admin"
 msgstr "Administrateur"
 
+#: templates/header.php:117
+msgid "Change Module"
+msgstr "Changer le module"
+
 #: user.php:101
 msgid ""
 "Login is not working.  Check the .htaccess file and the "
diff --git a/templates/header.php b/templates/header.php
index 4874eb6..09e7f5d 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -103,7 +103,7 @@
 
 </td>
 
-<td style='width:258px;height:19px;' align='right'>
+<td style='width:248px;height:19px;' align='right'>
 <?php
 
 //only show the 'Change Module' if there are other modules installed or if there is an index to the main CORAL page
@@ -114,7 +114,7 @@
     
 	<div style='text-align:left;'>
 		<ul class="tabs">
-		<li style="background: url('images/change/coral-change.gif') no-repeat right; position: absolute;">&nbsp;
+		<li class="changeMod"><?= _("Change Module");?>&nbsp;▼
 			<ul class="coraldropdown">
 				<?php if (file_exists($util->getCORALPath() . "index.php")) {?>
 				<li><a href="<?php echo $coralURL; ?>" target='_blank'><img src='images/change/coral-main.gif'></a></li>

From d830070257b8411e5eef79c145f51340b8390c3b Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Thu, 9 Apr 2015 12:10:10 +0200
Subject: [PATCH 010/159] Translate update

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22658 -> 22648 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e7e4fbe73407831dff24630d30b2886980defdff..7c1b9809746f77d7de2da3292c3188de6e8dca1e 100644
GIT binary patch
delta 1766
zcmZA1Sx8h-9LMofmP=}5u9cQIw`?=BRVzWl+{VUiY<bACns%I4%7`W;ixLVdq9UKH
zhtdaQgn9`A4GSbFdTDtIwIC=Vq^Os^Kkk8|hv9S1|K5B4|MS21OzXpOKYPaYyzzvl
z8e^PtV-m3#r=S;4VIxN4Ta3VuI2lK90*;}c`-Rgneyw|7J}zZGAD80}EW_KFhaWH<
zBPvYD<TJ>uFlHuJVj=E9-Eb3EVlOJuC}v<pr7;EQU?%!d1qAUpUb1mhWsFDnVH_4>
zJg&ysSW^`;W+H>51R}A;-f$MR)61yq9jJvmQ457}8a_oW_|C>ZV=D78)bnxGZsF<H
z0@VFw7=^x&4QxU!9KZ%Vf=c|{#$Vzj=I>Dtj@bBD>u+mxjaz66s(@Tf!X=oDmDa7O
zj)smfNMq1u109&nya%<DH`XtxZ)3dIO^}T9nCD<L)}cDM1ru;PYTd&agBLLeuVEHG
z#uel@?-|4qNUn7&o`q^rA!@-=)Q-#TycU(fk18mD+TjU%y&bi)tM>Xm)XpEFIy#8D
z|25{5-;6NON9I{)OcB<g5}!dm(1!ZR+VKQ-VJ>F-+=Z)9^F}*AhbrI}YRBC;3t!pz
zchrU>>-dr1Br(u&nvSY06Fs;X)#5ccAA_it-m&(gS~-Z?;Wt#F6V|&QXAWw;Qq-%g
zM;-TlsN>v<p<)K-8BmmYifVO2z55ELqIQyJ=f$W3Do}~Hp%S#B3b=tfwp};_2hhP`
zOu)zu#-v~x>bNi1K>t;dmp~#0tS4~_^L9J$K<%Ihb^Zr%JPx4>{)GAnzo82IiCQn+
z@1FAlRDl~&ANK)F!Yh9I?=a{jAp22?hf(kBhmB9;OeQlgLG8eYDky+Td>XZ*Hq@)T
zi|SM_=HnnL;TWp0n2m0SGeQiMa4zb?D%5fD;UwIGO1#V3f@<w$R42Mot$l&|2YiPq
zIEJYhyUATQ3zcUn>W{0!#+#b#;25fP7f?HYfN400u{ebKxJFS0C2V#J%|#_%h$^@m
zRZs&e;qLI9)ay=Ev9qYCq_8O5zif1($KQAVVBh^idxOmZr|jUdaNnx^(W?W_&R}zM
q;N-qwv+=ha3OKv|iIkXzdhdS`Z`0o=!iURCV`Kk$ApE56S=1kJ?B;p^

delta 1785
zcmX}sS!~Qv6vy$~TDn-KI&INfrlsxBrq*he5YbW$ZO60-p-nZEN!w&>_0SQ52TiO^
z@Pd$7f?zC3CG}8=M1)9bh!@+7hb|;yiG=UZ|MK*?_ssp@bME=y|9rm@wfAP!jTf$P
zk}<|pVoVC=qvk$r!5WOkw>SVl;c)E1f%pp(F=~-9shEUXHwE)?1{PpFF2Hk`g&!~t
z;}@H-@iNF-Y|J<;!>QPST5tyE;C)o0Z#V|yOO46HY#fhOr~-E2c06k1F-webX&ny5
z0vv|Ln2r7=VPgg{*iB$C?y(CFqE6a|`uzfGqbsP5+Ho{KLT&iY#`{p6{Dpenz0@f@
z!<vs;Uy3nU6}Ex(sEvbIiOs0Q&usi9#xsA9da%dFzgnZ0InTRLg^ocLkc)1dgL<`P
z){Ur+hMO6TWYB5@7jOded#IDVv3|i3%;S7cf;7xwo`bQt3e~}COu$X3eRp9T9>Ixt
z8Z+<#7Lwn*XE2mN+H$92FRDcas0~X{C-&KS0F_`Zs-Ph1ge~^>W2lpzvcF$NoxB6p
z(Js{b*XSj`>0zKtma@W_>F7r#-j8~q6?Msu;ZD4TnK-%3*|;1vue0+*r~=NSP8`8>
zd}ZT5Q3oDYP9E}`R0jH-(ovOVp$m&pEnbSbxC3>|&!bw~fof$p>V!W~g$}Q9E@vKU
zzf#nzT!*7Dg!)WdF+7{W5e5`x9-~^F>UUm22I?eJ?R+6BaRn-IJt{#fs(`bo&-M<E
z#pme3K1{%bmBu7vI_h&TSV{j?Q5AtiY_#sh5zO1{{37ZE?WphnIYwhIs^HJ4OZWp-
zSaiVIFB7ww7orNRMqTdh=*Ck4`tM<IjevZLO5BHfXHk5Mici2KEJmGR4XU6<RN@1u
z6CFmqy6gD&6`_}TH!9(8)Ir@<PKUF?43uyt>W4+B&t(njd#^<$Zm{k{we}>c6L(Rq
z?Lys+kC=?VF$I%XIs4|K^2|s5aaGuO%~m^TLACBE>g2a^BzEHv>_uI!pQwUTS38AH
zK_#AzDmZ{DXag!?Q)E)g2~SL+XWFcy=`$h^XY~(qEeLM&1UfGVJ1;kFZfvNFbk5xp
zTbx}}TibalWCG1ib)JpPn1npuVB@CxhDk-H((n5lRrr6<XCL~vEV89!-VnD9+EvD1
Q7YZHkFHed*DZd)?2UvsfsQ>@~

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 2629730..b282086 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "POT-Creation-Date: 2015-04-08 16:23+0100\n"
-"PO-Revision-Date: 2015-04-08 16:23+0100\n"
+"PO-Revision-Date: 2015-04-09 12:02+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -467,7 +467,7 @@ msgstr "Téléphone:"
 
 #: ajax_forms.php:1860 ajax_htmldata.php:1116
 msgid "Alt Phone:"
-msgstr "Alt Téléphone:"
+msgstr "Téléphone Alt:"
 
 #: ajax_forms.php:1881 ajax_htmldata.php:1083
 msgid "Address:"
@@ -487,7 +487,7 @@ msgstr "Ajouter une compte"
 
 #: ajax_forms.php:2005
 msgid "Login Type:"
-msgstr "Type d'acèss (login):"
+msgstr "Type de connexion:"
 
 #: ajax_forms.php:2029 ajax_htmldata.php:1289
 msgid "Registered Email:"
@@ -552,7 +552,7 @@ msgstr "Ajouter un nouveau utilisateur"
 
 #: ajax_forms.php:2379 ajax_htmldata.php:2178
 msgid "Login ID"
-msgstr "Identifiant d'accès"
+msgstr "Identifiant de connexion"
 
 #: ajax_forms.php:2380 ajax_htmldata.php:2179
 msgid "First Name"
@@ -969,11 +969,11 @@ msgstr "Visitez Comptes sur le module Organisations"
 
 #: ajax_htmldata.php:1257
 msgid "Login URL:"
-msgstr "URL d'accès(login):"
+msgstr "URL de connexion:"
 
 #: ajax_htmldata.php:1258
 msgid "Visit Login URL"
-msgstr "Source URL d'accès(login)"
+msgstr "Source URL de connexion"
 
 #: ajax_htmldata.php:1265
 msgid "User Name:"
@@ -1505,7 +1505,7 @@ msgid ""
 "Login is not working.  Check the .htaccess file and the "
 "remoteAuthVariableName specified in /admin/configuration.ini"
 msgstr ""
-"L'accès (login) ne marche pas. Vérifiez le fichier .htaccess et "
+"La connexion ne marche pas. Vérifiez le fichier .htaccess et "
 "remoteAuthVariableName specifié en /admin/configuration.ini"
 
 #, fuzzy

From 260cf3ff4d6e0640cfcdcd07a001c58d3a7b0b72 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Thu, 9 Apr 2015 16:17:06 +0200
Subject: [PATCH 011/159] Translate updated, change some strings

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22648 -> 22670 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  18 +++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 7c1b9809746f77d7de2da3292c3188de6e8dca1e..3cdfe5ef5f2086fbd68363b92bda9848904800d8 100644
GIT binary patch
delta 2979
zcmX}teN5F=9LMoP%Co2-sEEQv1q95PDPBRcco6e}Cq<o;g2Ba1;kJ7*vFUzWHJ!N%
zhWW74YV=2@n<7ioEn1FcwX)@+2mT3iP1jhPir}VJ?+?FYf4$B*zw_`t-*e8r_s)jA
z)fIAfezcQljLGsElYzw;iaRh01K5mvF#?Bh65hq}7`oK$AB8d0C);{5&Z0ioT8K&1
zYpr`w^BrAkoUwr)(hyF=8BD+n7>D0u7!F`O-oRLVV82hyGiD<7R8;>QoPtHDaT`(d
zK8Kmui0apd9_-9>j7g@@OT%QmZaWO4CJN7Y2PUEVl~@~4{a-^59zsq0DQah5qXPR8
zr{Vx6;;1!tnOo0xC=~Ib1SjADROE+IM{pc9;m4?yccB(OkF)U#M&e(n%njS`Q3dXi
zB%uPyw0cpQEJbC~*+M~Q-;A2zFlyn`sE!v<nfMO1!vR~rgPI`xDR*2VD%DS*0$qX%
zY#HiqtiTjpkD9*)>F*eaf;#TUXlzGKd>p6Y8Pvcls0`h(?Zc={OjzzZ3pLLIR6j2&
zb0w(x%1|4qMQu2Ub6DTJOCgnpFHk!kM4j0PYUeReyMd&l1};Tqstz^rE?Yl<$<*IR
zjqgDZ_Mzq-L1iNP8P`Ny=+KZsK|9%uskj}J@J-YXPNGtK4s|y!+4`5L=lYHH2h{WI
zLj~|BPR9qRaS4U)!ZWQ|=qP1g3bGKj&>GZHtVgA?7Pnv%rsKD${<ly&x{r4;lAG+u
ze{mf8i`~oxtp`yX>a_LK#pGY9>7_vv{)S5Vb?YdOrL4paBoVcvbktccM;$>GzJd*?
z1%5{ba1(X=hj2XJM~yQpjF|ybR*-*nTtLHOT!>5X1te?c15C$1P)8D3YRo)LL!EUQ
z=3o=*`w7g)OQ?lLa3)5sWDQKm6s$%Cu+yQilR}&Q5caHlhUuu(=b|!Dgc(?gp|~5v
z(6Qh5p>}%6e(yxxg_EdxE~0*bzCz76VB4L)Dd@7?M@<m7%8fkLx(GF(6vMIF)@x7`
zZ^vqEMFn=%w*Q1t)CW=HhHU$=HDvYJc*jhnph%NY0c4}@KpyIDlv(RhDQ!jlE*!M=
zPMkyiJZdBT)?28%5wXUde+Fh#&%y}YfMI(7&r{IzYeY@F3nTGuoQubBHufNYd}a_Q
z;Ec6yz!|6v<)V(H7`5Zow!RL>o;NC>?Whgz)px!Bb_&|rQQP4ZYUiJ$QhE(F;8&c7
zL#RuZP{xJDO4P!yqxv62U9xt38M`nI=at)xqU!bNXrTiX6u=48j=L}wf41%SP&<yU
za2J}6%1{a_uuN+KD#evJANQg%`ib>2DwF-Fbstuce?=Ns>E6zTs0r7g&axKu-glv%
zX&ds_Zw?_bnX9N&Cs(;gkdE5OB3my-1yGGzxCu3X8!CX0s>r|I?L``9VIO+%4o=4S
zb?$F{8tT30qXOEDaTv7j!&vIaZ2c5!13jqs--nOkZB)Q_QJ3(cLqU;+t#>EP#0=`o
zP!TquZuf4Sg2&N=UDj);h3}w_ER?sX?->}6D=`6UPyq!|3%`Ndkkdh75`}Z9R9!}0
zvVPQp<2JZ~O~V-KS*QiQwtW@qF4Umj`&QJ#0qcHLX5T|);u0#ezaYPWj=4!8frfD#
z-3Sv=sm(zxRD}BFs<!QZ>#L~Dy@T5MXE+V}F&b~9?$$r3fRZ=4fj)`)=`Fx0ZE+I?
zb*M)L(%PLl^@wNu;=IK<-MzUlhIBmcEf4W@@9|C#4X^TTtqU~xx{nl8#&(?b=5@>|
zA5F830gqYhZ*B?r0-hbdpr_v7^iqp2XdVs8tw@Q;{=e&vI#1)a*1DE${^mzL7*^*A
N_<}+I&Op7-{0C?=XkY*U

delta 2956
zcmXZddra0<9LMn=auERo<t`{cu7a5oCIMavFL>dic}X+M%cCQ~CmwK$bN<pIR&2D1
zX;!Q?%B`e@gO;tWS()Zyxi0^tWwQynTuQnp&Hm~A;heu-=bYcUe9!ls^E{oWLhkj2
z^i7ZUQXI#bR^m8Qu>!+!Cq`itHsXGa#6K|>?_d~)mYV*NIG*|gww{iYsb^UiVjA^2
z>ps+cM@t=Vbl}@GjHTg2OvI0IB7Tbzcm)%12q)lu`#q+NMX6_?`p>|4EJux7i<);6
z7T`8izfN@VoifjHrcn5jhB&-xJKRQ16h6lcOhxspux>&1KZq_KMorw0+Sxf&U>7k7
zuV5+$t+8`Wy}+YT!G{Wr!FE*SM^H!bCThYHsFZ(%T6h4n@M|20*HM|fZNEp(Ge?q&
z3S_Fa7?sJzs7!hrDd_AQY{L=M!Y5E2PoXk#4z<Hew*D7tf{^)U;doT43s8YRj0&t6
zbvG7b23Diy--Yz|oK_0zco3tp12yq6Ovd+71HV9J=&EhMiONL80%J02o_tilB2?xU
zpysPYZD1p6!;P5D`p#<<GHLh}wd2dEGaEteeC$FKNE&M3EL5tWL`~de>o4FG>c>&z
zPos+$QS*+VG7(;GjK?C6hD-|D$r{W=AEseDY6m^2)b^t8#(=GVhI+1FSudcT=S5Ti
zzhMgggBln6m{~Z<nuDHFRzyM0MJ==hbrjX8RBpsgxC8U>EUNzv)Q*A}#87UsAOFQr
ztY2g@*Jy1+ZK&JUPb?z;O3mjqXu=;+DgV{_H;$%ku?Zv|wIdgGmZhj8Sc&_v4z<9~
zr~rOP-Tq+=!yszheVl~jmymyT%wOU-vvE2;id&GZId5Pd{(?G^(53Xn4AfayVj=E8
zeSaP2-~ei&5lqL>N`9Qs#SE-L1>pB6?56OF{opJ!XXv6*Ux>=UJe-OvFdUmP0$c6(
z=TSTDwBNf?ccBM0Pe1Ah=nQJUOSav+PC=I?h?*c~xrsc@Is-MJ9LHjft*=K-?8CJf
zKn3=VZT}9Vs9#2n8@BB?t^XN4Cvt^}G!Yd*F6s_Eg1Q@()~8S@4WND(+HAcWv#Ix?
zHu9782I_8%S!w1^zz3=4U?kRJgx>!K3VMFepeAm@ariRkU>9cLY2=U3xr{NGP-Ozn
zL}jQDbtLmqJ6>$-RXF;*Q33f-8{DJsdjB01w6nvu!+WTme}YQsAZox5n2*D#OBP$r
z)5R62g%6<mx1las2kya>n2XspX5M9}dL4RN=tT+&;5cf>y_kvL+x9!C9Y@rfh2l}q
zX%Z^142;EDs1#S=bo8S#`j&M7mB~TWy0>b{zakA=Wo~B<YQp)bvs{gO@Aar>dI(GL
zB_t;23@X)etIZLlpf-|c>!qjwmZBDZ8a4kRQ~*a;lYhP2lQc}m^XTFb#$m+c=C?i>
z_1+&s1+)?;qR+Y)Cs6OO^={M#`cUuxJdVL@sDS@KUBX))1x0obHDTHs^Ui0WB3y^M
z-8(TJUqu&ttY=XR5223iu5C}{O(sw;!$hn>1>{35ydSk8uZ@Dv?p;)>22hu55Vc?s
z71+3SCdKKf1*f6f=b~Oq4MyPx)WX}Wt*Fd)qB7Bo%IpQ?7tnJqQAngAh)Ec|-b|c@
zT4*-vmusnQ-)wC`Wv(5y^A9i?2QeD2q3+fQDxkP0OrW`_pWc}mr7bR}porF@7Tn%n
zkaWxqD=I52>OWijY)IG4lIs2gB`M*d>-_co-SbvW=sHz0rz^kaZaNJCr^>&pCEyFV
x4Zdb~tH1HN7GJZYo{MTTBD2-QZP@H?uiv}5rQW|wUq%}OzUF5C?!Z=`^FOBoTvq@9

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index b282086..080869c 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "POT-Creation-Date: 2015-04-08 16:23+0100\n"
-"PO-Revision-Date: 2015-04-09 12:02+0100\n"
+"PO-Revision-Date: 2015-04-09 15:50+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -752,11 +752,11 @@ msgstr "(Parent)"
 
 #: ajax_htmldata.php:199 ajax_htmldata.php:212
 msgid "view resource"
-msgstr "Voir la ressource"
+msgstr "Regarder la ressource"
 
 #: ajax_htmldata.php:199 ajax_htmldata.php:212 ajax_htmldata.php:260
 msgid "View "
-msgstr "Voir"
+msgstr "Regarder "
 
 #: ajax_htmldata.php:236
 msgid "Aliases:"
@@ -845,7 +845,7 @@ msgstr "Licences:"
 
 #: ajax_htmldata.php:691
 msgid "View License"
-msgstr "Voir la licence"
+msgstr "Regarder la licence"
 
 #: ajax_htmldata.php:694
 msgid "No associated licenses available."
@@ -985,7 +985,7 @@ msgstr "Pas des comptes disponibles"
 
 #: ajax_htmldata.php:1350
 msgid "view attachment"
-msgstr "Voir la fixation"
+msgstr "Regarder la fixation"
 
 #: ajax_htmldata.php:1355
 msgid "edit attachment"
@@ -1064,7 +1064,7 @@ msgstr "Imprimer ***"
 
 #: ajax_htmldata.php:1589
 msgid "Catalog View"
-msgstr "Voir le Catalogue"
+msgstr "Regarder le Catalogue"
 
 #: ajax_htmldata.php:1600
 msgid "Parent Record"
@@ -1158,7 +1158,7 @@ msgstr " de "
 
 #: ajax_htmldata.php:1982
 msgid " Resource Records"
-msgstr " resources enregistrées"
+msgstr " ressources enregistrées"
 
 #: ajax_htmldata.php:2028
 msgid "next page"
@@ -1276,7 +1276,7 @@ msgstr "N'est pas possible supprimer - "
 msgid ""
 " is in use.  Please make sure no resources are set up with this information."
 msgstr ""
-"est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
+" est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
 "configurée avec cet information."
 
 #: ajax_processing.php:746 ajax_processing.php:1210 ajax_processing.php:1227
@@ -1284,7 +1284,7 @@ msgid ""
 "Unable to delete.  Please make sure no resources are set up with this "
 "information."
 msgstr ""
-"N'est pas possible supprimer. S'il vous plaît, assurez-vous  qu'aucune "
+"N'est pas possible supprimer. S'il vous plaît, assurez-vous qu'aucune "
 "ressource est configurée avec cet information."
 
 #: ajax_processing.php:889

From af85cc7b1c316152ef289d4267487ec452d737a4 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 15 Apr 2015 13:58:29 +0200
Subject: [PATCH 012/159] Translated dropdown

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22670 -> 22735 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  14 +++++++++++---
 templates/header.php                 |   4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 3cdfe5ef5f2086fbd68363b92bda9848904800d8..f2fa8f74fa0ee6c33534d13719b93388f5a7ecd0 100644
GIT binary patch
delta 7624
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

delta 7562
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 080869c..532b862 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-08 16:23+0100\n"
-"PO-Revision-Date: 2015-04-09 15:50+0100\n"
+"POT-Creation-Date: 2015-04-15 13:57+0100\n"
+"PO-Revision-Date: 2015-04-15 13:57+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -127,7 +127,7 @@ msgstr "Chargement..."
 
 #: admin.php:115
 msgid "You do not have permissions to access this screen."
-msgstr "Vous n'avez pas la permission d'accèder dans cette page."
+msgstr "Vous n'avez pas la permission d'accéder dans cette page."
 
 #: admin/classes/common/DBService.php:39
 msgid "There was a problem with the database: "
@@ -1500,6 +1500,14 @@ msgstr "Administrateur"
 msgid "Change Module"
 msgstr "Changer le module"
 
+#: templates/header.php:147 templates/header.php:148
+msgid "French"
+msgstr "Français"
+
+#: templates/header.php:147 templates/header.php:148
+msgid "English"
+msgstr "Anglais"
+
 #: user.php:101
 msgid ""
 "Login is not working.  Check the .htaccess file and the "
diff --git a/templates/header.php b/templates/header.php
index 09e7f5d..bcc81eb 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -144,8 +144,8 @@
 		</ul>
 		<select name="lang" id="lang" class="dropDownLang">
            <?php
-            $fr="<option value='fr' selected='selected'>Français</option><option value='en'>English</option>";
-            $en="<option value='fr'>Français</option><option value='en' selected='selected'>English</option>";
+            $fr="<option value='fr' selected='selected'>"._("French")."</option><option value='en'>"._("English")."</option>";
+            $en="<option value='fr'>"._("French")."</option><option value='en' selected='selected'>"._("English")."</option>";
             if(isset($_COOKIE["lang"])){
                 if($_COOKIE["lang"]=='fr'){
                     echo $fr;

From 183b94dda9d629a52775bfe6e3caeb8829a72c7b Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Thu, 16 Apr 2015 17:30:48 +0200
Subject: [PATCH 013/159] Translated summary.php and updated some strings in
 messages.po

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 22735 -> 23283 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 139 ++++++++++++++++++---------
 summary.php                          | 122 +++++++++++------------
 3 files changed, 153 insertions(+), 108 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index f2fa8f74fa0ee6c33534d13719b93388f5a7ecd0..0212a3b52370776738d79bdd35e94435b80bbd95 100644
GIT binary patch
delta 8311
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
I(ti*AFH+aC2><{9

delta 7831
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
Z*}IP8Vb_g5<=(Crb4Pf%uIK&f_dhl59w7h#

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 532b862..bb7b1c6 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-15 13:57+0100\n"
-"PO-Revision-Date: 2015-04-15 13:57+0100\n"
+"POT-Creation-Date: 2015-04-16 17:23+0100\n"
+"PO-Revision-Date: 2015-04-16 17:24+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -210,7 +210,7 @@ msgstr "Produit"
 msgid "Name:"
 msgstr "Nom:"
 
-#: ajax_forms.php:209 ajax_forms.php:650 ajax_htmldata.php:290
+#: ajax_forms.php:209 ajax_forms.php:650 ajax_htmldata.php:290 summary.php:347
 msgid "Description:"
 msgstr "Description:"
 
@@ -223,6 +223,7 @@ msgid "Format"
 msgstr "Format"
 
 #: ajax_forms.php:326 ajax_forms.php:1104 ajax_htmldata.php:612
+#: summary.php:477
 msgid "Initial Cost"
 msgstr "Coût Initial"
 
@@ -328,27 +329,28 @@ msgstr "effacer cet alias"
 msgid "Edit Acquisitions Information"
 msgstr "modifier l'information des acquisitions"
 
-#: ajax_forms.php:1038 ajax_htmldata.php:547
+#: ajax_forms.php:1038 ajax_htmldata.php:547 summary.php:414
 msgid "Order"
 msgstr "Ordre"
 
 #: ajax_forms.php:1045 ajax_forms.php:2671 ajax_htmldata.php:558
+#: summary.php:421
 msgid "Acquisition Type:"
 msgstr "Type d'acquisition:"
 
-#: ajax_forms.php:1063 ajax_htmldata.php:565
+#: ajax_forms.php:1063 ajax_htmldata.php:565 summary.php:428
 msgid "Order Number:"
 msgstr "Numero d'ordre:"
 
-#: ajax_forms.php:1068 ajax_htmldata.php:572
+#: ajax_forms.php:1068 ajax_htmldata.php:572 summary.php:435
 msgid "System Number:"
 msgstr "Nombre de système:"
 
-#: ajax_forms.php:1073 ajax_htmldata.php:593
+#: ajax_forms.php:1073 ajax_htmldata.php:593 summary.php:458
 msgid "Subscription Start:"
 msgstr "Début d'abonnement:"
 
-#: ajax_forms.php:1078 ajax_htmldata.php:600
+#: ajax_forms.php:1078 ajax_htmldata.php:600 summary.php:465
 msgid "Subscription End:"
 msgstr "Fin d'abonnement:"
 
@@ -385,6 +387,7 @@ msgid "Licensing Status"
 msgstr "Statut des licences"
 
 #: ajax_forms.php:1450 ajax_htmldata.php:105 ajax_htmldata.php:666
+#: summary.php:205 summary.php:508
 msgid "Status:"
 msgstr "Statut:"
 
@@ -397,11 +400,13 @@ msgstr "Historie:"
 #: ajax_htmldata.php:175 ajax_htmldata.php:447 ajax_htmldata.php:672
 #: ajax_htmldata.php:766 ajax_htmldata.php:1451 ajax_htmldata.php:1453
 #: ajax_htmldata.php:1480 ajax_htmldata.php:1482 ajax_htmldata.php:1486
-#: ajax_htmldata.php:1488 resources/cataloging.php:223
+#: ajax_htmldata.php:1488 resources/cataloging.php:223 summary.php:219
+#: summary.php:245 summary.php:399 summary.php:514 summary.php:590
+#: summary.php:712 summary.php:825
 msgid " by "
 msgstr " par "
 
-#: ajax_forms.php:1483 ajax_htmldata.php:675
+#: ajax_forms.php:1483 ajax_htmldata.php:675 summary.php:517
 msgid "No license status information available."
 msgstr "L'information de statut de la licence n'est pas disponible."
 
@@ -413,7 +418,7 @@ msgstr "Modifier l'accès"
 msgid "Access"
 msgstr "Acèss"
 
-#: ajax_forms.php:1604 ajax_htmldata.php:843
+#: ajax_forms.php:1604 ajax_htmldata.php:843 summary.php:625
 msgid "Authentication Type:"
 msgstr "Type d'accès:"
 
@@ -421,7 +426,7 @@ msgstr "Type d'accès:"
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
-#: ajax_forms.php:1623 ajax_htmldata.php:888
+#: ajax_forms.php:1623 ajax_htmldata.php:888 summary.php:662
 msgid "Access Method:"
 msgstr "Mèthode d'accès:"
 
@@ -429,11 +434,11 @@ msgstr "Mèthode d'accès:"
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: ajax_forms.php:1642 ajax_htmldata.php:874
+#: ajax_forms.php:1642 ajax_htmldata.php:874 summary.php:655
 msgid "Storage Location:"
 msgstr "Lieu de stockage:"
 
-#: ajax_forms.php:1657 ajax_htmldata.php:858
+#: ajax_forms.php:1657 ajax_htmldata.php:858 summary.php:639
 msgid "Simultaneous User Limit:"
 msgstr "Limite d'utilisateurs similtanées"
 
@@ -726,19 +731,19 @@ msgstr "Modifier la ressource"
 msgid "remove resource"
 msgstr "Supprimer la ressource"
 
-#: ajax_htmldata.php:100
+#: ajax_htmldata.php:100 summary.php:199
 msgid "Record ID:"
 msgstr "ID d'enregistrement:"
 
-#: ajax_htmldata.php:140
+#: ajax_htmldata.php:140 summary.php:211
 msgid "Created:"
 msgstr "Créé:"
 
-#: ajax_htmldata.php:165
+#: ajax_htmldata.php:165 summary.php:237
 msgid "Last Update:"
 msgstr "Dernière mise à jour:"
 
-#: ajax_htmldata.php:190
+#: ajax_htmldata.php:190 summary.php:262
 msgid "Related Products:"
 msgstr "Produits connexes:"
 
@@ -746,7 +751,7 @@ msgstr "Produits connexes:"
 msgid "Child:"
 msgstr "Enfant:"
 
-#: ajax_htmldata.php:199
+#: ajax_htmldata.php:199 summary.php:267
 msgid "(Parent)"
 msgstr "(Parent)"
 
@@ -758,15 +763,15 @@ msgstr "Regarder la ressource"
 msgid "View "
 msgstr "Regarder "
 
-#: ajax_htmldata.php:236
+#: ajax_htmldata.php:236 summary.php:293
 msgid "Aliases:"
 msgstr "Aliases:"
 
-#: ajax_htmldata.php:253
+#: ajax_htmldata.php:253 summary.php:310
 msgid "Organizations:"
 msgstr "Organisations:"
 
-#: ajax_htmldata.php:274
+#: ajax_htmldata.php:274 summary.php:331
 msgid "Resource URL:"
 msgstr "Ressource URL: "
 
@@ -819,11 +824,11 @@ msgstr "modifier l'order de l'information"
 msgid "Purchasing Sites:"
 msgstr "Site d'achats:"
 
-#: ajax_htmldata.php:602
+#: ajax_htmldata.php:602 summary.php:467
 msgid "Expiration Alert Enabled"
 msgstr "Alerte d'expiration activé"
 
-#: ajax_htmldata.php:642
+#: ajax_htmldata.php:642 summary.php:493
 msgid "No payment information available."
 msgstr "L'information du payment n'est pas disponible."
 
@@ -831,15 +836,15 @@ msgstr "L'information du payment n'est pas disponible."
 msgid "edit acquisitions information"
 msgstr "modifier l'information des acquisitions"
 
-#: ajax_htmldata.php:658
+#: ajax_htmldata.php:658 summary.php:503
 msgid "License"
-msgstr "Llicence"
+msgstr "Licence"
 
-#: ajax_htmldata.php:672
+#: ajax_htmldata.php:672 summary.php:514
 msgid " on "
 msgstr " sur "
 
-#: ajax_htmldata.php:685
+#: ajax_htmldata.php:685 summary.php:525
 msgid "Licenses:"
 msgstr "Licences:"
 
@@ -847,7 +852,7 @@ msgstr "Licences:"
 msgid "View License"
 msgstr "Regarder la licence"
 
-#: ajax_htmldata.php:694
+#: ajax_htmldata.php:694 summary.php:534
 msgid "No associated licenses available."
 msgstr "Pas des licences associées disponibles."
 
@@ -859,27 +864,27 @@ msgstr "Modifier la licence et le statut"
 msgid "edit license status"
 msgstr "Modifier le statut de la licence"
 
-#: ajax_htmldata.php:817
+#: ajax_htmldata.php:817 summary.php:604
 msgid "Access Information"
-msgstr "Infromation d'accès"
+msgstr "Information d'accès"
 
-#: ajax_htmldata.php:829
+#: ajax_htmldata.php:829 summary.php:618
 msgid "Administering Sites:"
 msgstr "Administration des sites:"
 
-#: ajax_htmldata.php:836
+#: ajax_htmldata.php:836 summary.php:450
 msgid "Authorized Sites:"
 msgstr "Sites autorisés:"
 
-#: ajax_htmldata.php:851
+#: ajax_htmldata.php:851 summary.php:632
 msgid "Username / Password:"
 msgstr "Nom d'utilisateur / Mot de passe:"
 
-#: ajax_htmldata.php:866
+#: ajax_htmldata.php:866 summary.php:647
 msgid "Registered IP Address:"
 msgstr "Adresse IP enregistré:"
 
-#: ajax_htmldata.php:895
+#: ajax_htmldata.php:895 summary.php:612
 msgid "No access information available."
 msgstr "Pas d'information d'accès disponible."
 
@@ -1377,11 +1382,11 @@ msgstr "Fait!"
 msgid "New resource added"
 msgstr "Nouvelle ressource ajouté"
 
-#: resources/cataloging.php:103
+#: resources/cataloging.php:103 summary.php:723
 msgid "Cataloging"
 msgstr "Catalogage"
 
-#: resources/cataloging.php:114
+#: resources/cataloging.php:114 summary.php:729
 msgid "Identifier:"
 msgstr "Identifiant:"
 
@@ -1393,35 +1398,35 @@ msgstr "Source URL: "
 msgid "Visit Source URL"
 msgstr "Source URL de visite"
 
-#: resources/cataloging.php:128
+#: resources/cataloging.php:128 summary.php:743
 msgid "Cataloging Type:"
 msgstr "Type de catalogage:"
 
-#: resources/cataloging.php:136
+#: resources/cataloging.php:136 summary.php:751
 msgid "Cataloging Status:"
-msgstr "Stat de catalogage:"
+msgstr "Statut de catalogage:"
 
-#: resources/cataloging.php:142
+#: resources/cataloging.php:142 summary.php:757
 msgid "# Records Available:"
 msgstr "# Enregistrements disponibles"
 
-#: resources/cataloging.php:148
+#: resources/cataloging.php:148 summary.php:763
 msgid "# Records Loaded:"
 msgstr "# Enregistrements chargées"
 
-#: resources/cataloging.php:153
+#: resources/cataloging.php:153 summary.php:769
 msgid "OCLC Holdings:"
 msgstr "OCLC Holdings:"
 
-#: resources/cataloging.php:154
+#: resources/cataloging.php:154 summary.php:770
 msgid "Yes"
 msgstr "Oui"
 
-#: resources/cataloging.php:154
+#: resources/cataloging.php:154 summary.php:770
 msgid "No"
 msgstr "Non"
 
-#: resources/cataloging.php:159
+#: resources/cataloging.php:159 summary.php:776
 msgid "No cataloging information available."
 msgstr "Le catalogue d'information n'est pas disponible."
 
@@ -1465,6 +1470,46 @@ msgstr ""
 "La connexion LDAP ne marche pas ou a expiré. S'il vous plaît vérifiez la "
 "configuration du configuration.ini."
 
+#: summary.php:34
+msgid " Summary"
+msgstr " Resumé"
+
+#: summary.php:272
+msgid "(child)"
+msgstr "(enfant)"
+
+#: summary.php:284
+msgid "ISSN / ISBN:"
+msgstr "ISSN / ISBN:"
+
+#: summary.php:339
+msgid "Alt URL:"
+msgstr "URL Alt:"
+
+#: summary.php:394
+msgid "Additional Product Notes"
+msgstr "Notes additionales du produit"
+
+#: summary.php:443
+msgid "Purchasing Site:"
+msgstr "Site d'achat:"
+
+#: summary.php:582
+msgid "Additional Acquisitions Notes"
+msgstr "Notes additionales d'acquisition"
+
+#: summary.php:707
+msgid "Additional Access Notes"
+msgstr "Notes additionales de connexion:"
+
+#: summary.php:735
+msgid "URL:"
+msgstr "URL:"
+
+#: summary.php:820
+msgid "Additional Cataloging Notes"
+msgstr "Notes additionales du catalogue"
+
 #: templates/header.php:58
 msgid ""
 "JavaScript must be enabled in order for you to use CORAL. However, it seems "
diff --git a/summary.php b/summary.php
index 27d5b76..0b7b039 100644
--- a/summary.php
+++ b/summary.php
@@ -31,7 +31,7 @@
 
 
 	//set this to turn off displaying the title header in header.php
-	$pageTitle=$resource->titleText . " Summary";
+	$pageTitle=$resource->titleText . _(" Summary");
 
 
 	$resourceFormat = new ResourceFormat(new NamedArguments(array('primaryKey' => $resource->resourceFormatID)));
@@ -196,19 +196,19 @@
 		</tr>
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Record ID:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Record ID:");?></td>
 		<td style='width:335px;'><?php echo $resource->resourceID; ?></td>
 		</tr>
 
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Status:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Status:");?></td>
 		<td style='width:335px;'><?php echo $status->shortName; ?></td>
 		</tr>
 
 		<tr>
 		<td style='vertical-align:top;width:150px;'>
-		Created:
+		<?= _("Created:");?>
 		</td>
 		<td>
 		<i>
@@ -216,7 +216,7 @@
 			echo format_date($resource->createDate);
 			//since resources could be created by other modules the user may or may not be set and may or may not have a user entry in this db
 			if ($createUser->primaryKey){
-				echo " by ";
+				echo _(" by ");
 				if ($createUser->firstName){
 					echo $createUser->firstName . " " . $createUser->lastName;
 				}else{
@@ -234,7 +234,7 @@
 
 			<tr>
 			<td style='vertical-align:top;width:150px;'>
-			Last Update:
+			<?= _("Last Update:");?>
 			</td>
 			<td>
 			<i>
@@ -242,7 +242,7 @@
 				echo format_date($resource->updateDate);
 				//since resources could be updated by other modules the user may or may not be set and may or may not have a user entry in this db
 				if ($updateUser->primaryKey){
-					echo " by ";
+					echo _(" by ");
 					if ($updateUser->firstName){
 						echo $updateUser->firstName . " " . $updateUser->lastName;
 					}else{
@@ -259,17 +259,17 @@
 
 		if (($parentResource->titleText) || (count($childResourceArray) > 0)){ ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'>Related Products:</td>
+			<td style='vertical-align:top;width:150px;'><?= _("Related Products:");?></td>
 			<td>
 			<?php
 
 			if ($parentResource->titleText){
-				echo "<span style='float: left;'>" . $parentResource->titleText . "&nbsp;&nbsp;(Parent)</span>";
+				echo "<span style='float: left;'>" . $parentResource->titleText . "&nbsp;&nbsp;"._("(Parent)")."</span>";
 			}
 
 			foreach ($childResourceArray as $childResource){
 				$childResourceObj = new Resource(new NamedArguments(array('primaryKey' => $childResource['resourceID'])));
-				echo "<span style='float: left;'>" . $childResourceObj->titleText . "&nbsp;&nbsp;(child)</span>";
+				echo "<span style='float: left;'>" . $childResourceObj->titleText . "&nbsp;&nbsp;"._("(child)")."</span>";
 			}
 
 
@@ -281,7 +281,7 @@
 		if ($resource->isbnOrISSN){
 		?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>ISSN / ISBN:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("ISSN / ISBN:");?></td>
 		<td style='width:335px;'><?php echo $resource->isbnOrISSN; ?></td>
 		</tr>
 		<?php
@@ -290,7 +290,7 @@
 		if (count($aliasArray) > 0){
 		?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Aliases:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Aliases:");?></td>
 		<td>
 		<?php
 			foreach ($aliasArray as $resourceAlias){
@@ -307,7 +307,7 @@
 		?>
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Organizations:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Organizations:");?></td>
 		<td>
 
 			<?php
@@ -328,7 +328,7 @@
 
 		if ($resource->resourceURL) { ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'>Resource URL:</td>
+			<td style='vertical-align:top;width:150px;'><?= _("Resource URL:");?></td>
 			<td><?php echo $resource->resourceURL; ?></td>
 			</tr>
 		<?php
@@ -336,7 +336,7 @@
 
 		if ($resource->resourceAltURL) { ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'>Alt URL:</td>
+			<td style='vertical-align:top;width:150px;'><?= _("Alt URL:");?></td>
 			<td><?php echo $resource->resourceAltURL; ?></td>
 			</tr>
 		<?php
@@ -344,7 +344,7 @@
 		
 		if ($resource->descriptionText){ ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'>Description:</td>
+			<td style='vertical-align:top;width:150px;'><?= _("Description:");?></td>
 			<td><?php echo nl2br($resource->descriptionText); ?></td>
 			</tr>
 		<?php } ?>
@@ -391,12 +391,12 @@
 	?>
 		<table class='linedFormTable' style='width:510px;'>
 			<tr>
-			<th colspan='2'>Additional Product Notes</th>
+			<th colspan='2'><?= _("Additional Product Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
 				<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?>:</td>
-				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 				</tr>
 			<?php } ?>
 		</table>
@@ -411,28 +411,28 @@
 	<table class='linedFormTable' style='width:510px;'>
 	<tr>
 	<th colspan='2' style='vertical-align:bottom;'>
-	<span style='float:left;vertical-align:bottom;'>Order</span>
+	<span style='float:left;vertical-align:bottom;'><?= _("Order");?></span>
 
 	</th>
 	</tr>
 
 	<?php if ($resource->acquisitionTypeID) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Acquisition Type:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Acquisition Type:");?></td>
 		<td><?php echo $acquisitionType->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($resource->orderNumber) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Order Number:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Order Number:");?></td>
 		<td><?php echo $resource->orderNumber; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($resource->systemNumber) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>System Number:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("System Number:");?></td>
 		<td><?php echo $resource->systemNumber; ?></td>
 		</tr>
 	<?php } ?>
@@ -440,14 +440,14 @@
 
 	<?php if (count($purchaseSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Purchasing Site:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Purchasing Site:");?></td>
 		<td><?php echo implode(", ", $purchaseSiteArray); ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if (count($authorizedSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Authorized Sites:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Authorized Sites:");?></td>
 		<td><?php echo implode(", ", $authorizedSiteArray); ?></td>
 		</tr>
 	<?php } ?>
@@ -455,16 +455,16 @@
 
 	<?php if (!is_null_date($resource->subscriptionStartDate)) { ?>
 	<tr>
-	<td style='vertical-align:top;width:150px;'>Subscription Start:</td>
+	<td style='vertical-align:top;width:150px;'><?= _("Subscription Start:");?></td>
 	<td><?php echo format_date($resource->subscriptionStartDate); ?></td>
 	</tr>
 	<?php } ?>
 
 	<?php if (!is_null_date($resource->subscriptionEndDate)) { ?>
 	<tr>
-	<td style='vertical-align:top;width:150px;'>Subscription End:</td>
+	<td style='vertical-align:top;width:150px;'><?= _("Subscription End:");?></td>
 	<td><?php echo format_date($resource->subscriptionEndDate); ?>&nbsp;&nbsp;
-	<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>Expiration Alert Enabled</i>"; } ?>
+	<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>"._("Expiration Alert Enabled")."</i>"; } ?>
 	</td>
 	</tr>
 	<?php } ?>
@@ -474,7 +474,7 @@
 
 	<table class='linedFormTable' style='width:510px;'>
 	<tr>
-	<th colspan='3'>Initial Cost</th>
+	<th colspan='3'><?= _("Initial Cost");?></th>
 	</th>
 	</tr>
 
@@ -490,7 +490,7 @@
 		<?php
 		}
 	}else{
-		echo "<tr><td colspan='3'><i>No payment information available.</i></td></tr>";
+		echo "<tr><td colspan='3'><i>"._("No payment information available.")."</i></td></tr>";
 	}
 	?>
 
@@ -500,21 +500,21 @@
 	<table class='linedFormTable' style='width:510px;'>
 	<tr>
 	<th colspan='2'>
-	<span style='float:left;vertical-align:bottom;'>License</span>
+	<span style='float:left;vertical-align:bottom;'><?= _("License");?></span>
 	</th>
 	</tr>
 
 	<tr>
-	<td style='vertical-align:top;width:150px;'>Status:</td>
+	<td style='vertical-align:top;width:150px;'><?= _("Status:");?></td>
 	<td>
 
 	<?php
 	if (count($licenseStatusArray) > 0){
 		foreach ($licenseStatusArray as $licenseStatus){
-			echo $licenseStatus['licenseStatus'] . " on <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . " by " . $licenseStatus['changeName'] . "</i><br />";
+			echo $licenseStatus['licenseStatus'] . _(" on ")."<i>" . format_date($licenseStatus['licenseStatusChangeDate']) . _(" by ") . $licenseStatus['changeName'] . "</i><br />";
 		}
 	}else{
-		echo "<i>No license status information available.</i>";
+		echo "<i>"._("No license status information available.")."</i>";
 	}
 
 	?>
@@ -522,7 +522,7 @@
 	</tr>
 
 	<tr>
-	<td style='vertical-align:top;width:150px;'>Licenses:</td>
+	<td style='vertical-align:top;width:150px;'><?= _("Licenses:");?></td>
 	<td>
 	<?php
 
@@ -531,7 +531,7 @@
 			echo $license['license'] . "<br />";
 		}
 	}else{
-		echo "<i>No associated licenses available.</i>";
+		echo "<i>"._("No associated licenses available.")."</i>";
 	}
 
 	?>
@@ -579,7 +579,7 @@
 	?>
 		<table class='linedFormTable' style='width:510px;'>
 			<tr>
-			<th colspan='2'>Additional Acquisitions Notes</th>
+			<th colspan='2'><?= _("Additional Acquisitions Notes");?></th>
 			</th>&nbsp;
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
@@ -587,7 +587,7 @@
 				<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?></td>
 
 				</td>
-				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 				</tr>
 			<?php } ?>
 		</table>
@@ -601,7 +601,7 @@
 	<table class='linedFormTable' style='width:510px;'>
 	<tr>
 	<th colspan='2'>
-	<span style='float:left;vertical-align:bottom;'>Access Information</span>
+	<span style='float:left;vertical-align:bottom;'><?= _("Access Information");?></span>
 	</th>
 	</tr>
 
@@ -609,34 +609,34 @@
 	<?php
 		//If no access information is available, display that information
 		if ((count($administeringSiteArray) == 0) && (!$authenticationType->shortName) && (!$resource->authenticationUserName) && (!$resource->authenticationPassword) && (!$userLimit->shortName) && (!$resource->registeredIPAddressException) && (!$storageLocation->shortName) && (!$accessMethod->shortName)){
-			echo "<tr><td colspan='2'><i>No access information available.</i></td></tr>";
+			echo "<tr><td colspan='2'><i>"._("No access information available.")."</i></td></tr>";
 		}
 	?>
 
 	<?php if (count($administeringSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Administering Sites:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Administering Sites:");?></td>
 		<td><?php echo implode(", ", $administeringSiteArray); ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($authenticationType->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Authentication Type:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Authentication Type:");?></td>
 		<td><?php echo $authenticationType->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if (($resource->authenticationUserName) || ($resource->authenticationPassword)) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Username / Password:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Username / Password:");?></td>
 		<td><?php echo $resource->authenticationUserName . " / " . $resource->authenticationPassword; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($userLimit->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Simultaneous User Limit:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Simultaneous User Limit:");?></td>
 		<td><?php echo $userLimit->shortName; ?></td>
 		</tr>
 	<?php } ?>
@@ -644,7 +644,7 @@
 
 	<?php if ($resource->registeredIPAddressException){ ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Registered IP Address:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Registered IP Address:");?></td>
 		<td style='width:310px;'><?php echo $resource->registeredIPAddressException; ?></td>
 		</tr>
 	<?php } ?>
@@ -652,14 +652,14 @@
 
 	<?php if ($storageLocation->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Storage Location:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Storage Location:");?></td>
 		<td><?php echo $storageLocation->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($accessMethod->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'>Access Method:</td>
+		<td style='vertical-align:top;width:150px;'><?= _("Access Method:");?></td>
 		<td><?php echo $accessMethod->shortName; ?></td>
 		</tr>
 	<?php } ?>
@@ -704,12 +704,12 @@
 	?>
 		<table class='linedFormTable' style='width:510px;'>
 			<tr>
-			<th colspan='2'>Additional Access Notes</th>
+			<th colspan='2'><?= _("Additional Access Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
 				<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?>:</td>
-				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 				</tr>
 			<?php } ?>
 		</table>
@@ -720,19 +720,19 @@
   <table class='linedFormTable' style='width:510px;'>
     <tr>
       <th colspan='2' style='vertical-align:bottom;'>
-        <span style='float:left;vertical-align:bottom;'>Cataloging</span>
+        <span style='float:left;vertical-align:bottom;'><?= _("Cataloging");?></span>
       </th>
     </tr>
     <?php if ($resource->hasCatalogingInformation()) { ?>
       <?php if ($resource->recordSetIdentifier) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'>Identifier:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("Identifier:");?></td>
       		<td><?php echo $resource->recordSetIdentifier; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->bibSourceURL) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'>URL:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("URL:");?></td>
       		<td><?php echo $resource->bibSourceURL; ?></td>
     		</tr>
     	<?php } ?>
@@ -740,7 +740,7 @@
     		$catalogingType = new CatalogingType(new NamedArguments(array('primaryKey' => $resource->catalogingTypeID)));
     		?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'>Cataloging Type:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("Cataloging Type:");?></td>
       		<td><?php echo $catalogingType->shortName; ?></td>
     		</tr>
     	<?php } ?>
@@ -748,32 +748,32 @@
     		$catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $resource->catalogingStatusID)));
     		?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'>Cataloging Status:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("Cataloging Status:");?></td>
       		<td><?php echo $catalogingStatus->shortName; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->numberRecordsAvailable) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'># Records Available:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("# Records Available:");?></td>
       		<td><?php echo $resource->numberRecordsAvailable; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->numberRecordsLoaded) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'># Records Loaded:</td>
+      		<td style='vertical-align:top;width:150px;'><?= _("# Records Loaded:");?></td>
       		<td><?php echo $resource->numberRecordsLoaded; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->hasOclcHoldings) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'>OCLC Holdings:</td>
-      		<td><?php echo $resource->hasOclcHoldings ? 'Yes' : 'No'; ?></td>
+      		<td style='vertical-align:top;width:150px;'><?= _("OCLC Holdings:");?></td>
+      		<td><?php echo $resource->hasOclcHoldings ? _('Yes') : _('No'); ?></td>
     		</tr>
     	<?php } ?>
     <?php } else { ?>
       <tr>
         <td colspan="2">
-          <em>No cataloging information available.</em>
+          <em><?= _("No cataloging information available.");?></em>
         </td>
       </tr>
     <?php } ?>
@@ -817,12 +817,12 @@
 	?>
 		<table class='linedFormTable' style='width:510px;'>
 			<tr>
-			<th colspan='2'>Additional Cataloging Notes</th>
+			<th colspan='2'><?= _("Additional Cataloging Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
 				<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?>:</td>
-				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+				<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 				</tr>
 			<?php } ?>
 		</table>
@@ -838,4 +838,4 @@
 
 <?php
 }
-?>
+?>
\ No newline at end of file

From a0e3550ab394caaa0c0624e9dd0edf2b70a7f24a Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Mon, 20 Apr 2015 12:13:25 +0200
Subject: [PATCH 014/159] CSS fixed

---
 css/style.css | 74 +++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/css/style.css b/css/style.css
index 0e6c118..7cf6296 100644
--- a/css/style.css
+++ b/css/style.css
@@ -10,7 +10,6 @@ body {
  color:  #2c3c42;
  font-family: "arial";
  font-size: 10pt;
- font-weight: heavy;
  background: #FFFFFF;
  margin: 0; /* it's good practice to zero the margin and padding of the body element to account for differing browser defaults */
  padding: 0;
@@ -98,14 +97,14 @@ a.helpfulLink {color:#526972;}
 
 .smallText{color:#3D545D;font-size:92%;}
 .smallerText{color:#3D545D;font-size:85%;}
-.redText{color:red}
+.redText{color:red;}
 .smallRedText{font-size:85%;color:red;}
 .darkRedText{color:#7a0026;}
 .bigDarkRedText{font-size:125%; color:#7a0026;}
 .smallDarkRedText{font-size:85%;color:#7a0026;}
-.normalText{color:#3D545D}
-.smallBlueText{font-size:85%;font-weight:normal; color:#526972}
-.smallGreyText{font-size:85%;font-weight:normal; color:gray}
+.normalText{color:#3D545D;}
+.smallBlueText{font-size:85%;font-weight:normal; color:#526972;}
+.smallGreyText{font-size:85%;font-weight:normal; color:gray;}
 .boldBlueText{font-weight:bold; color:#526972;}
 .boldText{font-weight:bold;}
 .bigBlueText{font-size:125%; color:#526972;}
@@ -118,10 +117,10 @@ fieldset {border:0;}
 
 
 select option { color: #3D545D; font-family: "arial"; font-size: 95%; margin:1px; }
-.optionStyle { color: #3D545D; font-family: "arial"; font-size: 8pt; font-weight: medium; }
+.optionStyle { color: #3D545D; font-family: "arial"; font-size: 8pt;}
 
 
-input, select, multiple, textarea{color: #3D545D; font-family: "arial"; font-size: 95%; font-weight: medium;}
+input, select, multiple, textarea{color: #3D545D; font-family: "arial"; font-size: 95%;}
 
 
 /* following is for the right panel (helpful links) in the resource page
@@ -157,7 +156,7 @@ table.queueMenuTable {
 
 table.queueMenuTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	background-color: #f6f8fa;
     	border-top: 1px solid #e6e5e9;
     	vertical-align:top;
@@ -167,7 +166,7 @@ table.queueMenuTable td {
 
 table.queueMenuTable td.selected {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
     	border-top: 1px solid #e6e5e9;
     	background-color: #f2f5f7;
     	background-image:url('../images/tab.gif');
@@ -190,7 +189,7 @@ table.queueMenuTable tr {
 
 
 td.queueRightPanel {	
-	border-width: 1px 1px 1px 1px;
+	border-width: 1px;
 	border-style: solid;
 	border-color: #e6e5e9;
 	border-collapse: collapse;
@@ -214,7 +213,7 @@ table.queueDataTable {
 
 table.queueDataTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	border-width: 1px 0 0 0;
 	border-style: solid;
 	border-color: #e6e5e9;
@@ -266,7 +265,7 @@ table.adminMenuTable {
 
 table.adminMenuTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	background-color: #f6f8fa;
     	border-top: 1px solid #e6e5e9;
     	vertical-align:top;
@@ -276,7 +275,7 @@ table.adminMenuTable td {
 
 table.adminMenuTable td.selected {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
     	border-top: 1px solid #e6e5e9;
     	background-color: #f2f5f7;
     	background-image:url('../images/tab.gif');
@@ -299,7 +298,7 @@ table.adminMenuTable tr {
 
 
 td.adminRightPanel {	
-	border-width: 1px 1px 1px 1px;
+	border-width: 1px;
 	border-style: solid;
 	border-color: #e6e5e9;
 	border-collapse: collapse;
@@ -323,7 +322,7 @@ table.linedDataTable {
 
 table.linedDataTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	border-width: 1px 0 0 0;
 	border-style: solid;
 	border-color: #e6e5e9;
@@ -562,18 +561,18 @@ table.sample {
 	margin:0px;
 	border-width: 0px;
 	border-spacing: 0px;
-	border-style: inset inset inset inset;
+	border-style: inset;
 	border-color: white;
 	border-collapse: collapse;
 	background-color: white;
 }
 
 table.sample td.main {
-	border-width: 1px 1px 1px 1px;
-	padding: 3px 3px 3px 3px;
-	border-style: solid solid solid solid;
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
 	border-color: gray gray gray white;
-	-moz-border-radius: 0px 0px 0px 0px;
+	-moz-border-radius: 0px;
 }
 
 table.sample td.selected {
@@ -581,21 +580,21 @@ table.sample td.selected {
 	height:15px;
 	border-width: 1px 0px 1px 1px;
 	padding: 8px 3px 8px 3px;
-	border-style: solid solid solid solid;
+	border-style: solid;
 	border-color: gray white gray gray;
-	-moz-border-radius: 0px 0px 0px 0px;
+	-moz-border-radius: 0px;
 
 }
 
 table.sample td.unselected {
 	width:110px;
 	height:15px;
-	border-width: 1px 1px 1px 1px;
+	border-width: 1px;
 	padding: 8px 3px 8px 3px;
-	border-style: solid solid solid solid;
-	border-color: gray gray gray gray;
+	border-style: solid;
+	border-color: gray;
 	background-color: #adc6de;
-	-moz-border-radius: 0px 0px 0px 0px;
+	-moz-border-radius: 0px;
 
 }
 
@@ -603,9 +602,9 @@ table.sample td.unselected {
 table.sample td.bottom {
 	width:90px;
 	height:auto;
-	border-width: 1px 1px 1px 1px;
-	padding: 3px 3px 3px 3px;
-	border-style: solid solid solid solid;
+	border-width: 1px;
+	padding: 3px;
+	border-style: solid;
 	border-color: white gray white white;
 	-moz-border-radius: 0px 0px 0px 0px;
 
@@ -674,7 +673,7 @@ table.sample td.bottom {
 
 
 .printContent{
-    padding: 24px 24px 24px 24px; 
+    padding: 24px; 
     background-color: white; 
     text-align:left;
     background-color: white;
@@ -712,7 +711,7 @@ table.verticalFormTable {
 
 table.verticalFormTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	border-width: 1px 1px 0 0;
 	border-style: solid;
 	border-color: #e0dfe3;
@@ -760,7 +759,7 @@ table.linedFormTable {
 
 table.linedFormTable td {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	border-width: 1px 0 0 0;
 	border-style: solid;
 	border-color: #e6e5e9;
@@ -771,7 +770,7 @@ table.linedFormTable td {
 
 table.linedFormTable td.bottom {
 	margin: 0;
-	padding: 3px 3px 3px 3px;
+	padding: 3px;
 	border-width: 1px 0 0 0;
 	border-style: solid;
 	border-color: #e6e5e9;
@@ -971,7 +970,7 @@ table.noBorder td { border:0; }
 table.smallPadding td{ padding:1px; }
 
 table.noMargin { border:0px;margin:0px; padding:0px;text-align:center; }
-table.noMargin tr { border:0px;margin:0px; padding:0px; vertical-align:center; }
+table.noMargin tr { border:0px;margin:0px; padding:0px; vertical-align:middle; }
 table.noMargin td { border:0px;margin:0px; padding:0px; }
 
 
@@ -986,7 +985,6 @@ table.thickboxTable{
  color:  #2c3c42;
  font-family: "arial";
  font-size: 8pt;
- font-weight: heavy;
 }
 
 table.thickboxTable td{
@@ -995,9 +993,9 @@ table.thickboxTable td{
 
 .smallText{font-size:small;}
 
-.infoText{font-size:small;font-weight:normal; color:gray}
-.span_CancellationNumber{font-size:small;font-weight:normal; color:gray}
-.span_CurrentQueue{font-size:small;font-weight:normal; color:gray}
+.infoText{font-size:small;font-weight:normal; color:gray;}
+.span_CancellationNumber{font-size:small;font-weight:normal; color:gray;}
+.span_CurrentQueue{font-size:small;font-weight:normal; color:gray;}
 
 table.noBorderTable {padding:0px; width:100%; border-style:none;}
 table.noBorderTable td {padding:0px; border-style:none; vertical-align:middle;}

From fe8ed86548bbdc1ca972f4a9948b8c775cadcc2e Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Mon, 20 Apr 2015 17:25:33 +0200
Subject: [PATCH 015/159] Translated all files JavaScript with Gettext.js

---
 ajax_htmldata.php                    |    4 +-
 js/admin.js                          |   20 +-
 js/common.js                         |   44 +-
 js/forms/acquisitionsForm.js         |   16 +-
 js/forms/attachmentForm.js           |   16 +-
 js/forms/contactForm.js              |    2 +-
 js/forms/detailedSubjectForm.js      |    2 +-
 js/forms/generalDetailSubjectForm.js |   12 +-
 js/forms/generalSubjectForm.js       |    2 +-
 js/forms/licenseForm.js              |    8 +-
 js/forms/resourceNewForm.js          |   20 +-
 js/forms/resourceNoteForm.js         |    2 +-
 js/forms/resourceUpdateForm.js       |   26 +-
 js/forms/userGroupForm.js            |    8 +-
 js/forms/workflowForm.js             |   17 +-
 js/index.js                          |   45 +-
 js/plugins/Gettext.js                | 1265 ++++++++++++++++++++++++++
 js/resource.js                       |   56 +-
 locale/fr_FR/LC_MESSAGES/messages.mo |  Bin 23283 -> 29447 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  311 ++++++-
 templates/header.php                 |   15 +-
 21 files changed, 1750 insertions(+), 141 deletions(-)
 create mode 100755 js/plugins/Gettext.js

diff --git a/ajax_htmldata.php b/ajax_htmldata.php
index ed08da9..3212622 100644
--- a/ajax_htmldata.php
+++ b/ajax_htmldata.php
@@ -2200,7 +2200,7 @@
 					echo "<td>" . $instance['priv'] . "</td>";
 					echo "<td>" . $accountTab . "</td>";
 					echo "<td>" . $instance['emailAddress'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit user")."'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt=\""._("edit")."\" title=\""._("edit user")."\"></a></td>";
 					echo "<td><a href='javascript:deleteUser(\"" . $instance['loginID'] . "\")'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
@@ -2571,7 +2571,7 @@
 						if ($generalSubject->inUse($instance[lcfirst("GeneralSubject") . 'ID']) == 0) {
 							echo "<td><a href='javascript:deleteGeneralSubject(\"GeneralSubject\", " . $instance[lcfirst("GeneralSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 						} else {
-							echo "<td><img src='images/do_not_enter.png' alt='subject in use' title='subject in use' /></td>";
+							echo "<td><img src='images/do_not_enter.png' alt='"._("subject in use")."' title='"._("subject in use")."' /></td>";
 						}
 
 					echo "</tr>";
diff --git a/js/admin.js b/js/admin.js
index a2759b2..25df295 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -298,10 +298,10 @@ function updateSubjectsTable(){
  	numberOfDays = $('#daysInAdvanceNumber').val();
  	
  	if (parseInt(numberOfDays) != numberOfDays-0){
- 		$('#div_form_error').html("Number of days must be a number");
+ 		$('#div_form_error').html(_("Number of days must be a number"));
  		return false;
  	}else if ((numberOfDays < 1) || (numberOfDays > 365)){
- 		$('#div_form_error').html("Number of days should be between 1 and 365");
+ 		$('#div_form_error').html(_("Number of days should be between 1 and 365"));
  		return false;
  	}else{
  		$('#div_form_error').html("&nbsp;");
@@ -322,7 +322,7 @@ function updateSubjectsTable(){
 
  function deleteData(className, deleteID){
  
- 	if (confirm("Do you really want to delete this data?") == true) {
+ 	if (confirm(_("Do you really want to delete this data?")) == true) {
 
 	       $.ajax({
 		  type:       "GET",
@@ -349,7 +349,7 @@ function updateSubjectsTable(){
 
    function deleteGeneralSubject(className, deleteID){
  
- 	if (confirm("Do you really want to remove this data?") == true) {
+ 	if (confirm(_("Do you really want to remove this data?")) == true) {
 	   
 	       $.ajax({
 		  type:       "GET",
@@ -377,7 +377,7 @@ function updateSubjectsTable(){
  
    function deleteDetailedSubject(className, deleteID){
  
- 	if (confirm("Do you really want to remove this data?") == true) {
+ 	if (confirm(_("Do you really want to remove this data?")) == true) {
 	   
 	       $.ajax({
 		  type:       "GET",
@@ -405,7 +405,7 @@ function updateSubjectsTable(){
  
   function deleteGeneralDetailSubject(className, deleteID){
  
- 	if (confirm("Do you really want to remove this data?") == true) {
+ 	if (confirm(_("Do you really want to remove this data?")) == true) {
 	   
 	       $.ajax({
 		  type:       "GET",
@@ -435,7 +435,7 @@ function updateSubjectsTable(){
 
  function deleteUser(deleteId){
  
- 	if (confirm("Do you really want to delete this user?") == true) {
+ 	if (confirm(_("Do you really want to delete this user?")) == true) {
 
 	       $('#span_User_response').html('<img src = "images/circle.gif">&nbsp;&nbsp;Processing...');
 	       $.ajax({
@@ -465,7 +465,7 @@ function updateSubjectsTable(){
 
  function deleteAlert(className, deleteID){
  
- 	if (confirm("Do you really want to remove this alert setting?") == true) {
+ 	if (confirm(_("Do you really want to remove this alert setting?")) == true) {
 	   
 	       $.ajax({
 		  type:       "GET",
@@ -494,7 +494,7 @@ function updateSubjectsTable(){
 
  function deleteWorkflow(className, deleteID){
  
- 	if (confirm("Do you really want to remove this data?") == true) {
+ 	if (confirm(_("Do you really want to remove this data?")) == true) {
 	   
 	       $.ajax({
 		  type:       "GET",
@@ -524,7 +524,7 @@ function updateSubjectsTable(){
 
  function deleteCurrency(className, deleteID){
  
- 	if (confirm("Do you really want to delete this currency?") == true) {
+ 	if (confirm(_("Do you really want to delete this currency?")) == true) {
 
 	       $.ajax({
 		  type:       "GET",
diff --git a/js/common.js b/js/common.js
index 9dd429c..8400150 100644
--- a/js/common.js
+++ b/js/common.js
@@ -14,7 +14,47 @@
 **
 **************************************************************************************************************************
 */
-
+function getCookie(clave){
+    var valCookie= ""; 
+    var buscar= clave + "="; 
+    if(document.cookie.length > 0) { 
+        pos=document.cookie.indexOf(buscar); 
+        if (pos != -1) {
+            pos += buscar.length; 
+            fin= document.cookie.indexOf(";", pos); 
+            if (fin == -1) 
+                fin= document.cookie.length; 
+            valCookie= unescape(document.cookie.substring(pos,fin)) 
+        }
+    } 
+    return valCookie; 
+} 
+
+function fLang() {
+    var langBrowser = '';
+    // Search the language according to the browser
+    if(getCookie('lang')=='' || getCookie('lang')==undefined){
+        if (navigator.languages==undefined) {
+            if (navigator.language==undefined) {
+                // Internet Explorer Compatibility
+                langBrowser= navigator.userLanguage.slice(0,2);
+            } else {
+                // Old navigator compatibility
+                langBrowser= navigator.language.slice(0,2);
+            }
+        } else { 
+            // Recent navigators
+            langBrowser= navigator.languages[0].slice(0,2);                                
+        }
+    }else{
+        langBrowser = getCookie('lang');
+    }
+    return langBrowser;
+}
+var gt = new Gettext({ 'domain' : 'messages' });//gt = new Gettext({ 'domain' : 'messages' });
+function _(msgid) {
+    return gt.gettext(msgid);
+}
 //image preloader
 (function($) {
   var cache = [];
@@ -70,7 +110,7 @@ $(function(){
 
 
 	 function log(event, data, formatted) {
-		$("<li>").html( !data ? "No match!" : "Selected: " + formatted).html("#result");
+		$("<li>").html( !data ? _("No match!") : _("Selected: ") + formatted).html("#result");
 
 	 }
 
diff --git a/js/forms/acquisitionsForm.js b/js/forms/acquisitionsForm.js
index a965c8d..b529c30 100644
--- a/js/forms/acquisitionsForm.js
+++ b/js/forms/acquisitionsForm.js
@@ -115,13 +115,13 @@
 		var pAmount = $('.newPaymentTable').children().children().children().children('.paymentAmount').val();
 						
 		if (((pAmount == '') || (pAmount == null)) && ((fName == '') || (fName == null))){
-			$('#div_errorPayment').html('Error - Either amount or fund is required');
+			$('#div_errorPayment').html(_("Error - Either amount or fund is required"));
 			return false;		
 		}else if((typeID == '') || (typeID == null)){
-			$('#div_errorPayment').html('Error - order type is a required field');
+			$('#div_errorPayment').html(_("Error - order type is a required field"));
 			return false;
 		}else if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-			$('#div_errorPayment').html('Error - price is not numeric');
+			$('#div_errorPayment').html(_("Error - price is not numeric"));
 			return false;		
 		}else{
 
@@ -139,8 +139,8 @@
 
 			$('.newPaymentTR').children().children().children('.addPayment').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this payment',
-			  title: 'remove this payment'
+			  alt: _("remove this payment"),
+			  title: _("remove this payment")
 			});
 			$('.newPaymentTR').children().children().children('.addPayment').addClass('remove').css("text-align","center");
 			$('.newPaymentTR').children().children('.paymentAmount').val(pAmount);
@@ -239,19 +239,19 @@ function submitOrderForm(){
 
 	//also perform same checks on the current record in case add button wasn't clicked
 	if ((((pAmount == '') || (pAmount == null)) && ((fName == '') || (fName == null))) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - Either price or fund is required');
+		$('#div_errorPayment').html(_("Error - Either price or fund is required"));
 		myReturn="1";		
 
 	}
 
 	if(((typeID == '') || (typeID == null)) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - order type is a required field');
+		$('#div_errorPayment').html(_("Error - order type is a required field"));
 		myReturn="1";
 	}
 
 	
 	if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-		$('#div_errorPayment').html('Error - price is not numeric');
+		$('#div_errorPayment').html(_("Error - price is not numeric"));
 		myReturn="1";		
 	}
  	
diff --git a/js/forms/attachmentForm.js b/js/forms/attachmentForm.js
index a6be39b..c68bf41 100644
--- a/js/forms/attachmentForm.js
+++ b/js/forms/attachmentForm.js
@@ -91,15 +91,15 @@ function checkUploadAttachment (file, extension){
 		  exists = "";
 			if (response == "1"){
 				exists = "1";
-				$("#div_file_message").html("  <font color='red'>File name is already being used...</font>");
+				$("#div_file_message").html("  <font color='red'>"+_("File name is already being used...")+"</font>");
 				return false;
 			} else if (response == "2"){
 				exists = "2";
-				$("#div_file_message").html("  <font color='red'>File name may not contain special characters - ampersand, single quote, double quote or less than/greater than characters</font>");
+				$("#div_file_message").html("  <font color='red'>"+_("File name may not contain special characters - ampersand, single quote, double quote or less than/greater than characters")+"</font>");
 				return false;				
 			} else if (response == "3"){
 				exists = "3";
-				$("#div_file_message").html("  <font color='red'>The attachments directory is not writable.</font>");
+				$("#div_file_message").html("  <font color='red'>"+_("The attachments directory is not writable.")+"</font>");
 				return false;
 			}
 			
@@ -121,7 +121,7 @@ new AjaxUpload('upload_button',
           if (errorMessage.size() > 0) {
             $("#div_file_message").html("<font color='red'>" + errorMessage.html() + "</font>");
           } else {
-            $("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + " successfully uploaded.");
+            $("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + _(" successfully uploaded."));
 				}
       }
 		}
@@ -143,7 +143,7 @@ new AjaxUpload('upload_button',
 					fileName=data;
 
 					if (exists == ""){
-						$("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + " successfully uploaded.");
+						$("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + _(" successfully uploaded."));
 						$("#div_uploadFile").html("<br />");
 
 					}
@@ -156,8 +156,8 @@ new AjaxUpload('upload_button',
 
  function validateForm (){
  	myReturn=0;
- 	if (!validateRequired('shortName','<br />Name must be entered to continue.')) myReturn="1";
- 	if (!validateRequired('attachmentTypeID','<br />Attachment Type must be selected to continue.')) myReturn="1";
+ 	if (!validateRequired('shortName',"<br />"+_("Name must be entered to continue."))) myReturn="1";
+ 	if (!validateRequired('attachmentTypeID',"<br />"+_("Attachment Type must be selected to continue."))) myReturn="1";
  	
  
  	if (myReturn == "1"){
@@ -175,7 +175,7 @@ new AjaxUpload('upload_button',
 function submitAttachment(){
 
 	if (fileName == ''){
-		$("#div_file_message").html("A file must be uploaded");
+		$("#div_file_message").html(_("A file must be uploaded"));
 	}else{
 		if (validateForm() === true) {
 			$('#submitAttachment').attr("disabled", "disabled"); 
diff --git a/js/forms/contactForm.js b/js/forms/contactForm.js
index 11c6384..3e00016 100644
--- a/js/forms/contactForm.js
+++ b/js/forms/contactForm.js
@@ -176,7 +176,7 @@ function submitContact(){
 	}); 
 	
  	if (contactRolesList == ''){
- 	    $("#span_error_contactRole").html('Please choose at least one role.');
+ 	    $("#span_error_contactRole").html(_("Please choose at least one role."));
  	    myReturn="1";
  	} else {
  	    $("#span_error_contactRole").html('');
diff --git a/js/forms/detailedSubjectForm.js b/js/forms/detailedSubjectForm.js
index f0b61db..4b77052 100644
--- a/js/forms/detailedSubjectForm.js
+++ b/js/forms/detailedSubjectForm.js
@@ -57,7 +57,7 @@
 
  function validateDetailedSubject(){
 	if ($("#updateVal").val() == ''){
-		$("#span_errors").html('Error - Please enter a value');
+		$("#span_errors").html(_("Error - Please enter a value"));
 		return false;
 	}else{
 		return true;
diff --git a/js/forms/generalDetailSubjectForm.js b/js/forms/generalDetailSubjectForm.js
index c462250..d78de69 100644
--- a/js/forms/generalDetailSubjectForm.js
+++ b/js/forms/generalDetailSubjectForm.js
@@ -84,7 +84,7 @@ $(document).ready(function(){
 		var detailedSubjectID = $('.newdetailedSubjectTable').children().children().children().children('.detailedSubjectID').val();
 		
 		if ((detailedSubjectID == '') || (detailedSubjectID == null)){
-			$('#div_errordetailedSubject').html('Error - Detailed Subject is required');
+			$('#div_errordetailedSubject').html(_("Error - Detailed Subject is required"));
 			return false;
 			
 		}else{
@@ -105,8 +105,8 @@ $(document).ready(function(){
 			$('.changeSelect option').each(function () {
 
 				if (($(this).val() == detailID) && (!firstFlag)) {
-					$('#div_errordetailedSubject').html('Error - Detail Subject Already Added');
-					$('#div_errordetailedSubject').html('Error - Detail Subject Already Added');	
+					$('#div_errordetailedSubject').html(_("Error - Detail Subject Already Added"));
+					$('#div_errordetailedSubject').html(_("Error - Detail Subject Already Added"));	
 					$('.newdetailedSubjectTR').remove();
 		
 					//next put the original clone back, we just need to reset the values
@@ -132,8 +132,8 @@ $(document).ready(function(){
 
 			$('.newdetailedSubjectTR').children().children().children('.adddetailedSubject').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove user from group',
-			  title: 'remove from group'
+			  alt: _("remove user from group"),
+			  title: _("remove from group")
 			});
 			
 			$('.newdetailedSubjectTR').children().children().children('.adddetailedSubject').addClass('remove');
@@ -178,7 +178,7 @@ $(document).ready(function(){
 
  function validateDetailSubject(){
  	myReturn=0;
- 	if (!validateRequired('shortName','<br />Short Name must be entered to continue.<br />')) myReturn="1";
+ 	if (!validateRequired('shortName',"<br />"+_("Short Name must be entered to continue.")+"<br />")) myReturn="1";
 	
  	 
  	if (myReturn == "1"){
diff --git a/js/forms/generalSubjectForm.js b/js/forms/generalSubjectForm.js
index 8e6ee59..83cb646 100644
--- a/js/forms/generalSubjectForm.js
+++ b/js/forms/generalSubjectForm.js
@@ -56,7 +56,7 @@
 	
  function validateGeneralSubject(){
 	if ($("#updateVal").val() == ''){
-		$("#span_errors").html('Error - Please enter a value');
+		$("#span_errors").html(_("Error - Please enter a value"));
 		return false;
 	}else{
 		return true;
diff --git a/js/forms/licenseForm.js b/js/forms/licenseForm.js
index 6160731..bb358c9 100644
--- a/js/forms/licenseForm.js
+++ b/js/forms/licenseForm.js
@@ -137,7 +137,7 @@
 		var lID = $('.newLicenseTable').children().children().children().children('.licenseID').val();
 						
 		if ((lID == '') || (lID == null)){
-			$('#div_errorLicense').html('Error - Please choose a valid license');
+			$('#div_errorLicense').html(_("Error - Please choose a valid license"));
 			return false;
 			
 		}else{
@@ -152,8 +152,8 @@
 
 			$('.newLicenseTR').children().children().children('.addLicense').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this license',
-			  title: 'remove this license'
+			  alt: _("remove this license"),
+			  title: _("remove this license")
 			});
 			$('.newLicenseTR').children().children().children('.addLicense').addClass('remove');
 			$('.licenseRoleID').addClass('changeSelect');
@@ -253,7 +253,7 @@ function validateForm(){
 	var lName = $('.newLicenseTable').children().children().children().children('.licenseName').val();
 
 	if (((lID == '') || (lID == null)) && (lName != '')){
-		$('#div_errorLicense').html('Error - Please choose a valid license');
+		$('#div_errorLicense').html(_("Error - Please choose a valid license"));
 		return false;
 	}else{
 		return true;
diff --git a/js/forms/resourceNewForm.js b/js/forms/resourceNewForm.js
index feb1266..69a36b1 100644
--- a/js/forms/resourceNewForm.js
+++ b/js/forms/resourceNewForm.js
@@ -96,7 +96,7 @@
 				if (exists == "0"){
 					$("#span_error_titleText").html("");
 				}else{
-				  	$("#span_error_titleText").html("<br />Warning: this name already exists.");
+				  	$("#span_error_titleText").html("<br />"+_("Warning: this name already exists."));
 				}
 			 }
 		  });
@@ -219,13 +219,13 @@
 
 						
 		if (((pAmount == '') || (pAmount == null)) && ((fName == '') || (fName == null))){
-			$('#div_errorPayment').html('Error - Either price or fund is required');
+			$('#div_errorPayment').html(_("Error - Either price or fund is required"));
 			return false;		
 		}else if((typeID == '') || (typeID == null)){
-			$('#div_errorPayment').html('Error - order type is a required field');
+			$('#div_errorPayment').html(_("Error - order type is a required field"));
 			return false;
 		}else if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-			$('#div_errorPayment').html('Error - price is not numeric');
+			$('#div_errorPayment').html(_("Error - price is not numeric"));
 			return false;		
 		}else{
 
@@ -243,8 +243,8 @@
 
 			$('.newPaymentTR').children().children().children('.addPayment').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this payment',
-			  title: 'remove this payment'
+			  alt: _("remove this payment"),
+			  title: _("remove this payment")
 			});
 			$('.newPaymentTR').children().children().children('.addPayment').addClass('remove');
 			$('.newPaymentTR').children().children('.paymentAmount').val(pAmount);			
@@ -279,7 +279,7 @@
  
  function validateNewResource (){
  	myReturn=0;
- 	if (!validateRequired('titleText','<br />Title must be entered to continue.<br />')) myReturn="1";
+ 	if (!validateRequired('titleText','<br />'+_("Title must be entered to continue.")+'<br />')) myReturn="1";
 
 	var fName = $('.newPaymentTable').children().children().children().children('.fundName').val();
 	var typeID = $('.newPaymentTable').children().children().children().children('.orderTypeID').val();
@@ -287,17 +287,17 @@
 
 	//also perform same checks on the current record in case add button wasn't clicked
 	if ((((pAmount == '') || (pAmount == null)) && ((fName == '') || (fName == null))) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - Either price or fund is required');
+		$('#div_errorPayment').html(_("Error - Either price or fund is required"));
 		myReturn="1";		
 	}
 	
 	if(((typeID == '') || (typeID == null)) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - order type is a required field');
+		$('#div_errorPayment').html(_("Error - order type is a required field"));
 		myReturn="1";
 	}
 	
 	if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-		$('#div_errorPayment').html('Error - price is not numeric');
+		$('#div_errorPayment').html(_("Error - price is not numeric"));
 		myReturn="1";		
 	}
  	
diff --git a/js/forms/resourceNoteForm.js b/js/forms/resourceNoteForm.js
index 43ddd0a..b4c0b55 100644
--- a/js/forms/resourceNoteForm.js
+++ b/js/forms/resourceNoteForm.js
@@ -31,7 +31,7 @@
  
  function validateForm (){
  	myReturn=0;
- 	if (!validateRequired('noteText','<br />Note must be entered to continue.')) myReturn="1";
+ 	if (!validateRequired('noteText',"<br />"+_("Note must be entered to continue."))) myReturn="1";
  	
  
  	if (myReturn == "1"){
diff --git a/js/forms/resourceUpdateForm.js b/js/forms/resourceUpdateForm.js
index c331ac6..cbc2e5b 100644
--- a/js/forms/resourceUpdateForm.js
+++ b/js/forms/resourceUpdateForm.js
@@ -85,7 +85,7 @@
 			$("#parentResourceID").val(data[1]);
 			$('#span_error_parentResourceName').html('');
 		}else{
-			$('#span_error_parentResourceName').html('<br />Error - Parent cannot be the same as the child');
+			$('#span_error_parentResourceName').html("<br />"+_("Error - Parent cannot be the same as the child"));
 		}
 	});
 
@@ -205,7 +205,7 @@
 		var aName = $('.newAliasTable').children().children().children().children('.aliasName').val();
 						
 		if ((aName == '') || (aName == null) || (typeID == '') || (typeID == null)){
-			$('#div_errorAlias').html('Error - Both fields are required');
+			$('#div_errorAlias').html(_("Error - Both fields are required"));
 			return false;
 			
 		}else{
@@ -220,8 +220,8 @@
 
 			$('.newAliasTR').children().children().children('.addAlias').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this alias',
-			  title: 'remove this alias'
+			  alt: _("remove this alias"),
+			  title: _("remove this alias")
 			});
 			$('.newAliasTR').children().children().children('.addAlias').addClass('remove');
 			$('.aliasTypeID').addClass('changeSelect');
@@ -255,9 +255,9 @@
 						
 		if ((orgID == '') || (orgID == null) || (typeID == '') || (typeID == null)){
 			if ((orgName== '') || (orgName == null) || (typeID == '') || (typeID == null)){
-				$('#div_errorOrganization').html('Error - Both fields are required');
+				$('#div_errorOrganization').html(_("Error - Both fields are required"));
 			}else{
-				$('#div_errorOrganization').html('Error - Organization is not found.  Please use the Autocomplete.');
+				$('#div_errorOrganization').html(_("Error - Organization is not found.  Please use the Autocomplete."));
 			}
 			
 			return false;
@@ -274,8 +274,8 @@
 
 			$('.newOrganizationTR').children().children().children('.addOrganization').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this organization',
-			  title: 'remove this organization'
+			  alt: _("remove this organization"),
+			  title: _("remove this organization")
 			});
 			$('.newOrganizationTR').children().children().children('.addOrganization').addClass('remove');
 			$('.organizationRoleID').addClass('changeSelect');
@@ -337,7 +337,7 @@
 
  function validateForm (){
  	myReturn=0;
- 	if (!validateRequired('titleText','<br />Name must be entered to continue.')) myReturn="1";
+ 	if (!validateRequired('titleText',"<br />"+_("Name must be entered to continue."))) myReturn="1";
 
 
 	//for verifying org and aliases
@@ -351,9 +351,9 @@
 	//check organizations fields
 	if (((orgID == '') || (orgID == null) || (roleID == '') || (roleID == null)) && ((roleID != '') || (orgID != ''))){
 		if ((orgName== '') || (orgName == null) || (typeID == '') || (typeID == null)){
-			$('#div_errorOrganization').html('Error - Both fields are required');
+			$('#div_errorOrganization').html(_("Error - Both fields are required"));
 		}else{
-			$('#div_errorOrganization').html('Error - Organization is not found.  Please use Autocomplete.');
+			$('#div_errorOrganization').html(_("Error - Organization is not found.  Please use Autocomplete."));
 		}
 
 		myReturn="1";
@@ -362,7 +362,7 @@
 
 	//check aliases
 	if (((aName == '') || (aName == null) || (typeID == '') || (typeID == null)) && ((aName != '') || (typeID != ''))){
-		$('#div_errorAlias').html('Error - Both fields are required');
+		$('#div_errorAlias').html(_("Error - Both fields are required"));
 		myReturn="1";
 
 	}
@@ -370,7 +370,7 @@
 	//check parent resource
 	//if there is no parent resource ID then this is an invalid name
 	if (($("#parentResourceID").val() == '') && ($("#parentResourceName").val() != '')){
-		$('#span_error_parentResourceName').html('<br />Error - Parent resource is not found.  Please use Autocomplete.');
+		$('#span_error_parentResourceName').html("<br />"+_("Error - Parent resource is not found.  Please use Autocomplete."));
 		myReturn="1";
 	}
 
diff --git a/js/forms/userGroupForm.js b/js/forms/userGroupForm.js
index 414e68a..b156bb7 100644
--- a/js/forms/userGroupForm.js
+++ b/js/forms/userGroupForm.js
@@ -98,7 +98,7 @@ $(document).ready(function(){
 		var loginID = $('.newUserTable').children().children().children().children('.loginID').val();
 						
 		if ((loginID == '') || (loginID == null)){
-			$('#div_errorUser').html('Error - User is required');
+			$('#div_errorUser').html(_("Error - User is required"));
 			return false;
 			
 		}else{
@@ -114,8 +114,8 @@ $(document).ready(function(){
 
 			$('.newUserTR').children().children().children('.addUser').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove user from group',
-			  title: 'remove from group'
+			  alt: _("remove user from group"),
+			  title: _("remove from group")
 			});
 			
 			$('.newUserTR').children().children().children('.addUser').addClass('remove');
@@ -160,7 +160,7 @@ $(document).ready(function(){
 
  function validateUserGroup(){
  	myReturn=0;
- 	if (!validateRequired('groupName','<br />Group name must be entered to continue.<br />')) myReturn="1";
+ 	if (!validateRequired('groupName',"<br />"+_("Group name must be entered to continue.")+"<br />")) myReturn="1";
 	
  	 
  	if (myReturn == "1"){
diff --git a/js/forms/workflowForm.js b/js/forms/workflowForm.js
index f6571de..ca8dbaf 100644
--- a/js/forms/workflowForm.js
+++ b/js/forms/workflowForm.js
@@ -182,7 +182,8 @@
 		var sName = $('.newStepTable').children().children().children().children('.stepName').val();
 		
 		if ((sName == '') || (sName == null)){
-			$('#div_errorStep').html('Error - Step name is required');
+			$('#div_errorStep').html(_("Error - Step name is required"));
+            $('.newStepTable').children().children().children().children('.stepName').focus();
 			return false;			
 		}else{
 
@@ -197,8 +198,8 @@
 
 			$('.newStepTR').children().children().children('.addStep').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this step',
-			  title: 'remove this step'
+			  alt: _("remove this step"),
+			  title: _("remove this step")
 			});
 			$('.newStepTR').children().children().children('.addStep').addClass('removeStep').css("text-align","center");
 			$('.stepName').addClass('changeInput');
@@ -338,15 +339,15 @@ function setArrows(){
 			}else{
 				//first gets down arrow only
 				if (thisKey == 1){
-					$('.seqOrder[key="1"]').html("<img src='images/transparent.gif' style='width:20px;height:20px;' />&nbsp;<a href='javascript:void(0);' class='moveArrow' direction='down'><img src='images/arrow_down.gif'></a>");
+					$('.seqOrder[key="1"]').html("<img src='images/transparent.gif' style='width:20px;height:20px;' />&nbsp;<a href='javascript:void(0);' class='moveArrow' direction='down'><img src='images/arrow_down.gif' /></a>");
 
 				//if this is the last one it gets up arrow only
 				}else if (thisKey == lastKey){
-					$(".seqOrder[key='" + thisKey + "']").html("<a href='javascript:void(0);' class='moveArrow' direction='up'><img src='images/arrow_up.gif'></a>&nbsp;<img src='images/transparent.gif' style='width:20px;height:20px;' />");
+					$(".seqOrder[key='" + thisKey + "']").html("<a href='javascript:void(0);' class='moveArrow' direction='up'><img src='images/arrow_up.gif' /></a>&nbsp;<img src='images/transparent.gif' style='width:20px;height:20px;' />");
 
 				//otherwise display both arrows
 				}else{
-					$(".seqOrder[key='" + thisKey + "']").html("<a href='javascript:void(0);' class='moveArrow' direction='up'><img src='images/arrow_up.gif'></a>&nbsp;<a href='javascript:void(0);' class='moveArrow' direction='down'><img src='images/arrow_down.gif'></a>");
+					$(".seqOrder[key='" + thisKey + "']").html("<a href='javascript:void(0);' class='moveArrow' direction='up'><img src='images/arrow_up.gif' /></a>&nbsp;<a href='javascript:void(0);' class='moveArrow' direction='down'><img src='images/arrow_down.gif' /></a>");
 
 
 				}
@@ -369,13 +370,13 @@ function setArrows(){
  	
  	//if no steps are added
  	if (stepNameList == ':::'){
- 		$("#span_errors").html('Please add at least one step to this workflow.');
+ 		$("#span_errors").html(_("Please add at least one step to this workflow."));
  		myReturn = 1;
  	}
  	
  	
  	if (stepNameList.indexOf(':::') != '0'){
- 		$("#span_errors").html('Please click the Add button to the first step before submitting this workflow.');
+ 		$("#span_errors").html(_("Please click the Add button to the first step before submitting this workflow."));
  		myReturn = 1;
  	} 		
  	
diff --git a/js/index.js b/js/index.js
index 578c86b..24d8fd3 100644
--- a/js/index.js
+++ b/js/index.js
@@ -15,6 +15,47 @@
 **************************************************************************************************************************
 */
 
+function getCookie(clave){
+    var valCookie= ""; 
+    var buscar= clave + "="; 
+    if(document.cookie.length > 0) { 
+        pos=document.cookie.indexOf(buscar); 
+        if (pos != -1) {
+            pos += buscar.length; 
+            fin= document.cookie.indexOf(";", pos); 
+            if (fin == -1) 
+                fin= document.cookie.length; 
+            valCookie= unescape(document.cookie.substring(pos,fin)) 
+        }
+    } 
+    return valCookie; 
+} 
+
+function fLang() {
+    var langBrowser = '';
+    // Search the language according to the browser
+    if(getCookie('lang')=='' || getCookie('lang')==undefined){
+        if (navigator.languages==undefined) {
+            if (navigator.language==undefined) {
+                // Internet Explorer Compatibility
+                langBrowser= navigator.userLanguage.slice(0,2);
+            } else {
+                // Old navigator compatibility
+                langBrowser= navigator.language.slice(0,2);
+            }
+        } else { 
+            // Recent navigators
+            langBrowser= navigator.languages[0].slice(0,2);                                
+        }
+    }else{
+        langBrowser = getCookie('lang');
+    }
+    return langBrowser;
+}
+var gt = new Gettext({ 'domain' : 'messages' });
+function _(msgid) {
+    return gt.gettext(msgid);
+}
 
 $(document).ready(function(){
 
@@ -110,7 +151,7 @@ $(document).ready(function(){
  });
  
 function updateSearch(pageNumber) {
-  $("#div_feedback").html("<img src='images/circle.gif'>  <span style='font-size:90%'>Processing...</span>");
+  $("#div_feedback").html("<img src='images/circle.gif'>  <span style='font-size:90%'>"+_("Processing...")+"</span>");
   if (!pageNumber) {
     pageNumber = 1;
   }
@@ -234,5 +275,5 @@ function setNumberOfRecords(recordsPerPageNumber){
   
   $("#hideOptions").click(function () {
   	$("#div_additionalSearch").css({'display':'none'}); 
-  	$("#hideShowOptions").html("<a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'>more options...</a>");
+  	$("#hideShowOptions").html("<a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'>"+_("more options...")+"</a>");
   });
diff --git a/js/plugins/Gettext.js b/js/plugins/Gettext.js
new file mode 100755
index 0000000..8a905e6
--- /dev/null
+++ b/js/plugins/Gettext.js
@@ -0,0 +1,1265 @@
+/*
+Pure Javascript implementation of Uniforum message translation.
+Copyright (C) 2008 Joshua I. Miller <unrtst@cpan.org>, all rights reserved
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU Library General Public License as published
+by the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
+
+=head1 NAME
+
+Javascript Gettext - Javascript implemenation of GNU Gettext API.
+
+=head1 SYNOPSIS
+
+ // //////////////////////////////////////////////////////////
+ // Optimum caching way
+ <script language="javascript" src="/path/LC_MESSAGES/myDomain.json"></script>
+ <script language="javascript" src="/path/Gettext.js'></script>
+
+ // assuming myDomain.json defines variable json_locale_data
+ var params = {  "domain" : "myDomain",
+                 "locale_data" : json_locale_data
+              };
+ var gt = new Gettext(params);
+ // create a shortcut if you'd like
+ function _ (msgid) { return gt.gettext(msgid); }
+ alert(_("some string"));
+ // or use fully named method
+ alert(gt.gettext("some string"));
+ // change to use a different "domain"
+ gt.textdomain("anotherDomain");
+ alert(gt.gettext("some string"));
+
+
+ // //////////////////////////////////////////////////////////
+ // The other way to load the language lookup is a "link" tag
+ // Downside is that not all browsers cache XMLHttpRequests the
+ // same way, so caching of the language data isn't guarenteed
+ // across page loads.
+ // Upside is that it's easy to specify multiple files
+ <link rel="gettext" href="/path/LC_MESSAGES/myDomain.json" />
+ <script language="javascript" src="/path/Gettext.js'></script>
+
+ var gt = new Gettext({ "domain" : "myDomain" });
+ // rest is the same
+
+
+ // //////////////////////////////////////////////////////////
+ // The reson the shortcuts aren't exported by default is because they'd be
+ // glued to the single domain you created. So, if you're adding i18n support
+ // to some js library, you should use it as so:
+
+ if (typeof(MyNamespace) == 'undefined') MyNamespace = {};
+ MyNamespace.MyClass = function () {
+     var gtParms = { "domain" : 'MyNamespace_MyClass' };
+     this.gt = new Gettext(gtParams);
+     return this;
+ };
+ MyNamespace.MyClass.prototype._ = function (msgid) {
+     return this.gt.gettext(msgid);
+ };
+ MyNamespace.MyClass.prototype.something = function () {
+     var myString = this._("this will get translated");
+ };
+
+ // //////////////////////////////////////////////////////////
+ // Adding the shortcuts to a global scope is easier. If that's
+ // ok in your app, this is certainly easier.
+ var myGettext = new Gettext({ 'domain' : 'myDomain' });
+ function _ (msgid) {
+     return myGettext.gettext(msgid);
+ }
+ alert( _("text") );
+
+ // //////////////////////////////////////////////////////////
+ // Data structure of the json data
+ // NOTE: if you're loading via the <script> tag, you can only
+ // load one file, but it can contain multiple domains.
+ var json_locale_data = {
+     "MyDomain" : {
+         "" : {
+             "header_key" : "header value",
+             "header_key" : "header value",
+         "msgid" : [ "msgid_plural", "msgstr", "msgstr_plural", "msgstr_pluralN" ],
+         "msgctxt\004msgid" : [ null, "msgstr" ],
+         },
+     "AnotherDomain" : {
+         },
+     }
+
+=head1 DESCRIPTION
+
+This is a javascript implementation of GNU Gettext, providing internationalization support for javascript. It differs from existing javascript implementations in that it will support all current Gettext features (ex. plural and context support), and will also support loading language catalogs from .mo, .po, or preprocessed json files (converter included).
+
+The locale initialization differs from that of GNU Gettext / POSIX. Rather than setting the category, domain, and paths, and letting the libs find the right file, you must explicitly load the file at some point. The "domain" will still be honored. Future versions may be expanded to include support for set_locale like features.
+
+
+=head1 INSTALL
+
+To install this module, simply copy the file lib/Gettext.js to a web accessable location, and reference it from your application.
+
+
+=head1 CONFIGURATION
+
+Configure in one of two ways:
+
+=over
+
+=item 1. Optimal. Load language definition from statically defined json data.
+
+    <script language="javascript" src="/path/locale/domain.json"></script>
+
+    // in domain.json
+    json_locale_data = {
+        "mydomain" : {
+            // po header fields
+            "" : {
+                "plural-forms" : "...",
+                "lang" : "en",
+                },
+            // all the msgid strings and translations
+            "msgid" : [ "msgid_plural", "translation", "plural_translation" ],
+        },
+    };
+    // please see the included bin/po2json script for the details on this format
+
+This method also allows you to use unsupported file formats, so long as you can parse them into the above format.
+
+=item 2. Use AJAX to load language file.
+
+Use XMLHttpRequest (actually, SJAX - syncronous) to load an external resource.
+
+Supported external formats are:
+
+=over
+
+=item * Javascript Object Notation (.json)
+
+(see bin/po2json)
+
+    type=application/json
+
+=item * Uniforum Portable Object (.po)
+
+(see GNU Gettext's xgettext)
+
+    type=application/x-po
+
+=item * Machine Object (compiled .po) (.mo)
+
+NOTE: .mo format isn't actually supported just yet, but support is planned.
+
+(see GNU Gettext's msgfmt)
+
+    type=application/x-mo
+
+=back
+
+=back
+
+=head1 METHODS
+
+The following methods are implemented:
+
+  new Gettext(args)
+  textdomain  (domain)
+  gettext     (msgid)
+  dgettext    (domainname, msgid)
+  dcgettext   (domainname, msgid, LC_MESSAGES)
+  ngettext    (msgid, msgid_plural, count)
+  dngettext   (domainname, msgid, msgid_plural, count)
+  dcngettext  (domainname, msgid, msgid_plural, count, LC_MESSAGES)
+  pgettext    (msgctxt, msgid)
+  dpgettext   (domainname, msgctxt, msgid)
+  dcpgettext  (domainname, msgctxt, msgid, LC_MESSAGES)
+  npgettext   (msgctxt, msgid, msgid_plural, count)
+  dnpgettext  (domainname, msgctxt, msgid, msgid_plural, count)
+  dcnpgettext (domainname, msgctxt, msgid, msgid_plural, count, LC_MESSAGES)
+  strargs     (string, args_array)
+
+
+=head2 new Gettext (args)
+
+Several methods of loading locale data are included. You may specify a plugin or alternative method of loading data by passing the data in as the "locale_data" option. For example:
+
+    var get_locale_data = function () {
+        // plugin does whatever to populate locale_data
+        return locale_data;
+    };
+    var gt = new Gettext( 'domain' : 'messages',
+                          'locale_data' : get_locale_data() );
+
+The above can also be used if locale data is specified in a statically included <SCRIPT> tag. Just specify the variable name in the call to new. Ex:
+
+    var gt = new Gettext( 'domain' : 'messages',
+                          'locale_data' : json_locale_data_variable );
+
+Finally, you may load the locale data by referencing it in a <LINK> tag. Simply exclude the 'locale_data' option, and all <LINK rel="gettext" ...> items will be tried. The <LINK> should be specified as:
+
+    <link rel="gettext" type="application/json" href="/path/to/file.json">
+    <link rel="gettext" type="text/javascript"  href="/path/to/file.json">
+    <link rel="gettext" type="application/x-po" href="/path/to/file.po">
+    <link rel="gettext" type="application/x-mo" href="/path/to/file.mo">
+
+args:
+
+=over
+
+=item domain
+
+The Gettext domain, not www.whatev.com. It's usually your applications basename. If the .po file was "myapp.po", this would be "myapp".
+
+=item locale_data
+
+Raw locale data (in json structure). If specified, from_link data will be ignored.
+
+=back
+
+=cut
+
+*/
+
+Gettext = function (args) {
+    this.domain         = 'messages';
+    // locale_data will be populated from <link...> if not specified in args
+    this.locale_data    = undefined;
+
+    // set options
+    var options = [ "domain", "locale_data" ];
+    if (this.isValidObject(args)) {
+        for (var i in args) {
+            for (var j=0; j<options.length; j++) {
+                if (i == options[j]) {
+                    // don't set it if it's null or undefined
+                    if (this.isValidObject(args[i]))
+                        this[i] = args[i];
+                }
+            }
+        }
+    }
+
+
+    // try to load the lang file from somewhere
+    this.try_load_lang();
+
+    return this;
+}
+
+Gettext.context_glue = "\004";
+Gettext._locale_data = {};
+
+Gettext.prototype.try_load_lang = function() {
+    // check to see if language is statically included
+    if (typeof(this.locale_data) != 'undefined') {
+        // we're going to reformat it, and overwrite the variable
+        var locale_copy = this.locale_data;
+        this.locale_data = undefined;
+        this.parse_locale_data(locale_copy);
+
+        if (typeof(Gettext._locale_data[this.domain]) == 'undefined') {
+            throw new Error("Error: Gettext 'locale_data' does not contain the domain '"+this.domain+"'");
+        }
+    }
+
+
+    // try loading from JSON
+    // get lang links
+    var lang_link = this.get_lang_refs();
+
+    if (typeof(lang_link) == 'object' && lang_link.length > 0) {
+        // NOTE: there will be a delay here, as this is async.
+        // So, any i18n calls made right after page load may not
+        // get translated.
+        // XXX: we may want to see if we can "fix" this behavior
+        for (var i=0; i<lang_link.length; i++) {
+            var link = lang_link[i];
+            if (link.type == 'application/json') {
+                if (! this.try_load_lang_json(link.href) ) {
+                    throw new Error("Error: Gettext 'try_load_lang_json' failed. Unable to exec xmlhttprequest for link ["+link.href+"]");
+                }
+            } else if (link.type == 'application/x-po') {
+                if (! this.try_load_lang_po(link.href) ) {
+                    throw new Error("Error: Gettext 'try_load_lang_po' failed. Unable to exec xmlhttprequest for link ["+link.href+"]");
+                }
+            } else {
+                // TODO: implement the other types (.mo)
+                throw new Error("TODO: link type ["+link.type+"] found, and support is planned, but not implemented at this time.");
+            }
+        }
+    }
+};
+
+// This takes the bin/po2json'd data, and moves it into an internal form
+// for use in our lib, and puts it in our object as:
+//  Gettext._locale_data = {
+//      domain : {
+//          head : { headfield : headvalue },
+//          msgs : {
+//              msgid : [ msgid_plural, msgstr, msgstr_plural ],
+//          },
+Gettext.prototype.parse_locale_data = function(locale_data) {
+    if (typeof(Gettext._locale_data) == 'undefined') {
+        Gettext._locale_data = { };
+    }
+
+    // suck in every domain defined in the supplied data
+    for (var domain in locale_data) {
+        // skip empty specs (flexibly)
+        if ((! locale_data.hasOwnProperty(domain)) || (! this.isValidObject(locale_data[domain])))
+            continue;
+        // skip if it has no msgid's
+        var has_msgids = false;
+        for (var msgid in locale_data[domain]) {
+            has_msgids = true;
+            break;
+        }
+        if (! has_msgids) continue;
+
+        // grab shortcut to data
+        var data = locale_data[domain];
+
+        // if they specifcy a blank domain, default to "messages"
+        if (domain == "") domain = "messages";
+        // init the data structure
+        if (! this.isValidObject(Gettext._locale_data[domain]) )
+            Gettext._locale_data[domain] = { };
+        if (! this.isValidObject(Gettext._locale_data[domain].head) )
+            Gettext._locale_data[domain].head = { };
+        if (! this.isValidObject(Gettext._locale_data[domain].msgs) )
+            Gettext._locale_data[domain].msgs = { };
+
+        for (var key in data) {
+            if (key == "") {
+                var header = data[key];
+                for (var head in header) {
+                    var h = head.toLowerCase();
+                    Gettext._locale_data[domain].head[h] = header[head];
+                }
+            } else {
+                Gettext._locale_data[domain].msgs[key] = data[key];
+            }
+        }
+    }
+
+    // build the plural forms function
+    for (var domain in Gettext._locale_data) {
+        if (this.isValidObject(Gettext._locale_data[domain].head['plural-forms']) &&
+            typeof(Gettext._locale_data[domain].head.plural_func) == 'undefined') {
+            // untaint data
+            var plural_forms = Gettext._locale_data[domain].head['plural-forms'];
+            var pf_re = new RegExp('^(\\s*nplurals\\s*=\\s*[0-9]+\\s*;\\s*plural\\s*=\\s*(?:\\s|[-\\?\\|&=!<>+*/%:;a-zA-Z0-9_\(\)])+)', 'm');
+            if (pf_re.test(plural_forms)) {
+                //ex english: "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+                //pf = "nplurals=2; plural=(n != 1);";
+                //ex russian: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2)
+                //pf = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)";
+
+                var pf = Gettext._locale_data[domain].head['plural-forms'];
+                if (! /;\s*$/.test(pf)) pf = pf.concat(';');
+                /* We used to use eval, but it seems IE has issues with it.
+                 * We now use "new Function", though it carries a slightly
+                 * bigger performance hit.
+                var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };';
+                Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
+                */
+                var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
+                Gettext._locale_data[domain].head.plural_func = new Function("n", code);
+            } else {
+                throw new Error("Syntax error in language file. Plural-Forms header is invalid ["+plural_forms+"]");
+            }   
+
+        // default to english plural form
+        } else if (typeof(Gettext._locale_data[domain].head.plural_func) == 'undefined') {
+            Gettext._locale_data[domain].head.plural_func = function (n) {
+                var p = (n != 1) ? 1 : 0;
+                return { 'nplural' : 2, 'plural' : p };
+                };
+        } // else, plural_func already created
+    }
+
+    return;
+};
+
+
+// try_load_lang_po : do an ajaxy call to load in the .po lang defs
+Gettext.prototype.try_load_lang_po = function(uri) {
+    var data = this.sjax(uri);
+    if (! data) return;
+
+    var domain = this.uri_basename(uri);
+    var parsed = this.parse_po(data);
+
+    var rv = {};
+    // munge domain into/outof header
+    if (parsed) {
+        if (! parsed[""]) parsed[""] = {};
+        if (! parsed[""]["domain"]) parsed[""]["domain"] = domain;
+        domain = parsed[""]["domain"];
+        rv[domain] = parsed;
+
+        this.parse_locale_data(rv);
+    }
+
+    return 1;
+};
+
+Gettext.prototype.uri_basename = function(uri) {
+    var rv;
+    if (rv = uri.match(/^(.*\/)?(.*)/)) {
+        var ext_strip;
+        if (ext_strip = rv[2].match(/^(.*)\..+$/))
+            return ext_strip[1];
+        else
+            return rv[2];
+    } else {
+        return "";
+    }
+};
+
+Gettext.prototype.parse_po = function(data) {
+    var rv = {};
+    var buffer = {};
+    var lastbuffer = "";
+    var errors = [];
+    var lines = data.split("\n");
+    for (var i=0; i<lines.length; i++) {
+        // chomp
+        lines[i] = lines[i].replace(/(\n|\r)+$/, '');
+
+        var match;
+
+        // Empty line / End of an entry.
+        if (/^$/.test(lines[i])) {
+            if (typeof(buffer['msgid']) != 'undefined') {
+                var msg_ctxt_id = (typeof(buffer['msgctxt']) != 'undefined' &&
+                                   buffer['msgctxt'].length) ?
+                                  buffer['msgctxt']+Gettext.context_glue+buffer['msgid'] :
+                                  buffer['msgid'];
+                var msgid_plural = (typeof(buffer['msgid_plural']) != 'undefined' &&
+                                    buffer['msgid_plural'].length) ?
+                                   buffer['msgid_plural'] :
+                                   null;
+
+                // find msgstr_* translations and push them on
+                var trans = [];
+                for (var str in buffer) {
+                    var match;
+                    if (match = str.match(/^msgstr_(\d+)/))
+                        trans[parseInt(match[1])] = buffer[str];
+                }
+                trans.unshift(msgid_plural);
+
+                // only add it if we've got a translation
+                // NOTE: this doesn't conform to msgfmt specs
+                if (trans.length > 1) rv[msg_ctxt_id] = trans;
+
+                buffer = {};
+                lastbuffer = "";
+            }
+
+        // comments
+        } else if (/^#/.test(lines[i])) {
+            continue;
+
+        // msgctxt
+        } else if (match = lines[i].match(/^msgctxt\s+(.*)/)) {
+            lastbuffer = 'msgctxt';
+            buffer[lastbuffer] = this.parse_po_dequote(match[1]);
+
+        // msgid
+        } else if (match = lines[i].match(/^msgid\s+(.*)/)) {
+            lastbuffer = 'msgid';
+            buffer[lastbuffer] = this.parse_po_dequote(match[1]);
+
+        // msgid_plural
+        } else if (match = lines[i].match(/^msgid_plural\s+(.*)/)) {
+            lastbuffer = 'msgid_plural';
+            buffer[lastbuffer] = this.parse_po_dequote(match[1]);
+
+        // msgstr
+        } else if (match = lines[i].match(/^msgstr\s+(.*)/)) {
+            lastbuffer = 'msgstr_0';
+            buffer[lastbuffer] = this.parse_po_dequote(match[1]);
+
+        // msgstr[0] (treak like msgstr)
+        } else if (match = lines[i].match(/^msgstr\[0\]\s+(.*)/)) {
+            lastbuffer = 'msgstr_0';
+            buffer[lastbuffer] = this.parse_po_dequote(match[1]);
+
+        // msgstr[n]
+        } else if (match = lines[i].match(/^msgstr\[(\d+)\]\s+(.*)/)) {
+            lastbuffer = 'msgstr_'+match[1];
+            buffer[lastbuffer] = this.parse_po_dequote(match[2]);
+
+        // continued string
+        } else if (/^"/.test(lines[i])) {
+            buffer[lastbuffer] += this.parse_po_dequote(lines[i]);
+
+        // something strange
+        } else {
+            errors.push("Strange line ["+i+"] : "+lines[i]);
+        }
+    }
+
+
+    // handle the final entry
+    if (typeof(buffer['msgid']) != 'undefined') {
+        var msg_ctxt_id = (typeof(buffer['msgctxt']) != 'undefined' &&
+                           buffer['msgctxt'].length) ?
+                          buffer['msgctxt']+Gettext.context_glue+buffer['msgid'] :
+                          buffer['msgid'];
+        var msgid_plural = (typeof(buffer['msgid_plural']) != 'undefined' &&
+                            buffer['msgid_plural'].length) ?
+                           buffer['msgid_plural'] :
+                           null;
+
+        // find msgstr_* translations and push them on
+        var trans = [];
+        for (var str in buffer) {
+            var match;
+            if (match = str.match(/^msgstr_(\d+)/))
+                trans[parseInt(match[1])] = buffer[str];
+        }
+        trans.unshift(msgid_plural);
+
+        // only add it if we've got a translation
+        // NOTE: this doesn't conform to msgfmt specs
+        if (trans.length > 1) rv[msg_ctxt_id] = trans;
+
+        buffer = {};
+        lastbuffer = "";
+    }
+
+
+    // parse out the header
+    if (rv[""] && rv[""][1]) {
+        var cur = {};
+        var hlines = rv[""][1].split(/\\n/);
+        for (var i=0; i<hlines.length; i++) {
+            if (! hlines.length) continue;
+
+            var pos = hlines[i].indexOf(':', 0);
+            if (pos != -1) {
+                var key = hlines[i].substring(0, pos);
+                var val = hlines[i].substring(pos +1);
+                var keylow = key.toLowerCase();
+
+                if (cur[keylow] && cur[keylow].length) {
+                    errors.push("SKIPPING DUPLICATE HEADER LINE: "+hlines[i]);
+                } else if (/#-#-#-#-#/.test(keylow)) {
+                    errors.push("SKIPPING ERROR MARKER IN HEADER: "+hlines[i]);
+                } else {
+                    // remove begining spaces if any
+                    val = val.replace(/^\s+/, '');
+                    cur[keylow] = val;
+                }
+
+            } else {
+                errors.push("PROBLEM LINE IN HEADER: "+hlines[i]);
+                cur[hlines[i]] = '';
+            }
+        }
+
+        // replace header string with assoc array
+        rv[""] = cur;
+    } else {
+        rv[""] = {};
+    }
+
+    // TODO: XXX: if there are errors parsing, what do we want to do?
+    // GNU Gettext silently ignores errors. So will we.
+    // alert( "Errors parsing po file:\n" + errors.join("\n") );
+
+    return rv;
+};
+
+
+Gettext.prototype.parse_po_dequote = function(str) {
+    var match;
+    if (match = str.match(/^"(.*)"/)) {
+        str = match[1];
+    }
+    // unescale all embedded quotes (fixes bug #17504)
+    str = str.replace(/\\"/g, "\"");
+    return str;
+};
+
+
+// try_load_lang_json : do an ajaxy call to load in the lang defs
+Gettext.prototype.try_load_lang_json = function(uri) {
+    var data = this.sjax(uri);
+    if (! data) return;
+
+    var rv = this.JSON(data);
+    this.parse_locale_data(rv);
+
+    return 1;
+};
+
+// this finds all <link> tags, filters out ones that match our
+// specs, and returns a list of hashes of those
+Gettext.prototype.get_lang_refs = function() {
+    var langs = new Array();
+    var links = document.getElementsByTagName("link");
+    // find all <link> tags in dom; filter ours
+    for (var i=0; i<links.length; i++) {
+        if (links[i].rel == 'gettext' && links[i].href) {
+            if (typeof(links[i].type) == 'undefined' ||
+                links[i].type == '') {
+                if (/\.json$/i.test(links[i].href)) {
+                    links[i].type = 'application/json';
+                } else if (/\.js$/i.test(links[i].href)) {
+                    links[i].type = 'application/json';
+                } else if (/\.po$/i.test(links[i].href)) {
+                    links[i].type = 'application/x-po';
+                } else if (/\.mo$/i.test(links[i].href)) {
+                    links[i].type = 'application/x-mo';
+                } else {
+                    throw new Error("LINK tag with rel=gettext found, but the type and extension are unrecognized.");
+                }
+            }
+
+            links[i].type = links[i].type.toLowerCase();
+            if (links[i].type == 'application/json') {
+                links[i].type = 'application/json';
+            } else if (links[i].type == 'text/javascript') {
+                links[i].type = 'application/json';
+            } else if (links[i].type == 'application/x-po') {
+                links[i].type = 'application/x-po';
+            } else if (links[i].type == 'application/x-mo') {
+                links[i].type = 'application/x-mo';
+            } else {
+                throw new Error("LINK tag with rel=gettext found, but the type attribute ["+links[i].type+"] is unrecognized.");
+            }
+
+            langs.push(links[i]);
+        }
+    }
+    return langs;
+};
+
+
+/*
+
+=head2 textdomain( domain )
+
+Set domain for future gettext() calls
+
+A  message  domain  is  a  set of translatable msgid messages. Usually,
+every software package has its own message domain. The domain  name  is
+used to determine the message catalog where a translation is looked up;
+it must be a non-empty string.
+
+The current message domain is used by the gettext, ngettext, pgettext,
+npgettext functions, and by the dgettext, dcgettext, dngettext, dcngettext,
+dpgettext, dcpgettext, dnpgettext and dcnpgettext functions when called
+with a NULL domainname argument.
+
+If domainname is not NULL, the current message domain is set to
+domainname.
+
+If domainname is undefined, null, or empty string, the function returns
+the current message domain.
+
+If  successful,  the  textdomain  function  returns the current message
+domain, after possibly changing it. (ie. if you set a new domain, the 
+value returned will NOT be the previous domain).
+
+=cut
+
+*/
+Gettext.prototype.textdomain = function (domain) {
+    if (domain && domain.length) this.domain = domain;
+    return this.domain;
+}
+
+/*
+
+=head2 gettext( MSGID )
+
+Returns the translation for B<MSGID>.  Example:
+
+    alert( gt.gettext("Hello World!\n") );
+
+If no translation can be found, the unmodified B<MSGID> is returned,
+i. e. the function can I<never> fail, and will I<never> mess up your
+original message.
+
+One common mistake is to interpolate a variable into the string like this:
+
+  var translated = gt.gettext("Hello " + full_name);
+
+The interpolation will happen before it's passed to gettext, and it's 
+unlikely you'll have a translation for every "Hello Tom" and "Hello Dick"
+and "Hellow Harry" that may arise.
+
+Use C<strargs()> (see below) to solve this problem:
+
+  var translated = Gettext.strargs( gt.gettext("Hello %1"), [full_name] );
+
+This is espeically useful when multiple replacements are needed, as they 
+may not appear in the same order within the translation. As an English to
+French example:
+
+  Expected result: "This is the red ball"
+  English: "This is the %1 %2"
+  French:  "C'est le %2 %1"
+  Code: Gettext.strargs( gt.gettext("This is the %1 %2"), ["red", "ball"] );
+
+(The example is stupid because neither color nor thing will get
+translated here ...).
+
+=head2 dgettext( TEXTDOMAIN, MSGID )
+
+Like gettext(), but retrieves the message for the specified 
+B<TEXTDOMAIN> instead of the default domain.  In case you wonder what
+a textdomain is, see above section on the textdomain() call.
+
+=head2 dcgettext( TEXTDOMAIN, MSGID, CATEGORY )
+
+Like dgettext() but retrieves the message from the specified B<CATEGORY>
+instead of the default category C<LC_MESSAGES>.
+
+NOTE: the categories are really useless in javascript context. This is
+here for GNU Gettext API compatability. In practice, you'll never need
+to use this. This applies to all the calls including the B<CATEGORY>.
+
+
+=head2 ngettext( MSGID, MSGID_PLURAL, COUNT )
+
+Retrieves the correct translation for B<COUNT> items.  In legacy software
+you will often find something like:
+
+    alert( count + " file(s) deleted.\n" );
+
+or
+
+    printf(count + " file%s deleted.\n", $count == 1 ? '' : 's');
+
+I<NOTE: javascript lacks a builtin printf, so the above isn't a working example>
+
+The first example looks awkward, the second will only work in English
+and languages with similar plural rules.  Before ngettext() was introduced,
+the best practice for internationalized programs was:
+
+    if (count == 1) {
+        alert( gettext("One file deleted.\n") );
+    } else {
+        printf( gettext("%d files deleted.\n"), count );
+    }
+
+This is a nuisance for the programmer and often still not sufficient
+for an adequate translation.  Many languages have completely different
+ideas on numerals.  Some (French, Italian, ...) treat 0 and 1 alike,
+others make no distinction at all (Japanese, Korean, Chinese, ...),
+others have two or more plural forms (Russian, Latvian, Czech,
+Polish, ...).  The solution is:
+
+    printf( ngettext("One file deleted.\n",
+                     "%d files deleted.\n",
+                     count), // argument to ngettext!
+            count);          // argument to printf!
+
+In English, or if no translation can be found, the first argument
+(B<MSGID>) is picked if C<count> is one, the second one otherwise.
+For other languages, the correct plural form (of 1, 2, 3, 4, ...)
+is automatically picked, too.  You don't have to know anything about
+the plural rules in the target language, ngettext() will take care
+of that.
+
+This is most of the time sufficient but you will have to prove your
+creativity in cases like
+
+    "%d file(s) deleted, and %d file(s) created.\n"
+
+That said, javascript lacks C<printf()> support. Supplied with Gettext.js
+is the C<strargs()> method, which can be used for these cases:
+
+    Gettext.strargs( gt.ngettext( "One file deleted.\n",
+                                  "%d files deleted.\n",
+                                  count), // argument to ngettext!
+                     count); // argument to strargs!
+
+NOTE: the variable replacement isn't done for you, so you must
+do it yourself as in the above.
+
+=head2 dngettext( TEXTDOMAIN, MSGID, MSGID_PLURAL, COUNT )
+
+Like ngettext() but retrieves the translation from the specified
+textdomain instead of the default domain.
+
+=head2 dcngettext( TEXTDOMAIN, MSGID, MSGID_PLURAL, COUNT, CATEGORY )
+
+Like dngettext() but retrieves the translation from the specified
+category, instead of the default category C<LC_MESSAGES>.
+
+
+=head2 pgettext( MSGCTXT, MSGID )
+
+Returns the translation of MSGID, given the context of MSGCTXT.
+
+Both items are used as a unique key into the message catalog.
+
+This allows the translator to have two entries for words that may
+translate to different foreign words based on their context. For
+example, the word "View" may be a noun or a verb, which may be
+used in a menu as File->View or View->Source.
+
+    alert( pgettext( "Verb: To View", "View" ) );
+    alert( pgettext( "Noun: A View", "View"  ) );
+
+The above will both lookup different entries in the message catalog.
+
+In English, or if no translation can be found, the second argument
+(B<MSGID>) is returned.
+
+=head2 dpgettext( TEXTDOMAIN, MSGCTXT, MSGID )
+
+Like pgettext(), but retrieves the message for the specified 
+B<TEXTDOMAIN> instead of the default domain.
+
+=head2 dcpgettext( TEXTDOMAIN, MSGCTXT, MSGID, CATEGORY )
+
+Like dpgettext() but retrieves the message from the specified B<CATEGORY>
+instead of the default category C<LC_MESSAGES>.
+
+
+=head2 npgettext( MSGCTXT, MSGID, MSGID_PLURAL, COUNT )
+
+Like ngettext() with the addition of context as in pgettext().
+
+In English, or if no translation can be found, the second argument
+(MSGID) is picked if B<COUNT> is one, the third one otherwise.
+
+=head2 dnpgettext( TEXTDOMAIN, MSGCTXT, MSGID, MSGID_PLURAL, COUNT )
+
+Like npgettext() but retrieves the translation from the specified
+textdomain instead of the default domain.
+
+=head2 dcnpgettext( TEXTDOMAIN, MSGCTXT, MSGID, MSGID_PLURAL, COUNT, CATEGORY )
+
+Like dnpgettext() but retrieves the translation from the specified
+category, instead of the default category C<LC_MESSAGES>.
+
+=cut
+
+*/
+
+// gettext
+Gettext.prototype.gettext = function (msgid) {
+    var msgctxt;
+    var msgid_plural;
+    var n;
+    var category;
+    return this.dcnpgettext(null, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dgettext = function (domain, msgid) {
+    var msgctxt;
+    var msgid_plural;
+    var n;
+    var category;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dcgettext = function (domain, msgid, category) {
+    var msgctxt;
+    var msgid_plural;
+    var n;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+// ngettext
+Gettext.prototype.ngettext = function (msgid, msgid_plural, n) {
+    var msgctxt;
+    var category;
+    return this.dcnpgettext(null, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dngettext = function (domain, msgid, msgid_plural, n) {
+    var msgctxt;
+    var category;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dcngettext = function (domain, msgid, msgid_plural, n, category) {
+    var msgctxt;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category, category);
+};
+
+// pgettext
+Gettext.prototype.pgettext = function (msgctxt, msgid) {
+    var msgid_plural;
+    var n;
+    var category;
+    return this.dcnpgettext(null, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dpgettext = function (domain, msgctxt, msgid) {
+    var msgid_plural;
+    var n;
+    var category;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dcpgettext = function (domain, msgctxt, msgid, category) {
+    var msgid_plural;
+    var n;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+// npgettext
+Gettext.prototype.npgettext = function (msgctxt, msgid, msgid_plural, n) {
+    var category;
+    return this.dcnpgettext(null, msgctxt, msgid, msgid_plural, n, category);
+};
+
+Gettext.prototype.dnpgettext = function (domain, msgctxt, msgid, msgid_plural, n) {
+    var category;
+    return this.dcnpgettext(domain, msgctxt, msgid, msgid_plural, n, category);
+};
+
+// this has all the options, so we use it for all of them.
+Gettext.prototype.dcnpgettext = function (domain, msgctxt, msgid, msgid_plural, n, category) {
+    if (! this.isValidObject(msgid)) return '';
+
+    var plural = this.isValidObject(msgid_plural);
+    var msg_ctxt_id = this.isValidObject(msgctxt) ? msgctxt+Gettext.context_glue+msgid : msgid;
+
+    var domainname = this.isValidObject(domain)      ? domain :
+                     this.isValidObject(this.domain) ? this.domain :
+                                                       'messages';
+
+    // category is always LC_MESSAGES. We ignore all else
+    var category_name = 'LC_MESSAGES';
+    var category = 5;
+
+    var locale_data = new Array();
+    if (typeof(Gettext._locale_data) != 'undefined' &&
+        this.isValidObject(Gettext._locale_data[domainname])) {
+        locale_data.push( Gettext._locale_data[domainname] );
+
+    } else if (typeof(Gettext._locale_data) != 'undefined') {
+        // didn't find domain we're looking for. Search all of them.
+        for (var dom in Gettext._locale_data) {
+            locale_data.push( Gettext._locale_data[dom] );
+        }
+    }
+
+    var trans = [];
+    var found = false;
+    var domain_used; // so we can find plural-forms if needed
+    if (locale_data.length) {
+        for (var i=0; i<locale_data.length; i++) {
+            var locale = locale_data[i];
+            if (this.isValidObject(locale.msgs[msg_ctxt_id])) {
+                // make copy of that array (cause we'll be destructive)
+                for (var j=0; j<locale.msgs[msg_ctxt_id].length; j++) {
+                    trans[j] = locale.msgs[msg_ctxt_id][j];
+                }
+                trans.shift(); // throw away the msgid_plural
+                domain_used = locale;
+                found = true;
+                // only break if found translation actually has a translation.
+                if ( trans.length > 0 && trans[0].length != 0 )
+                    break;
+            }
+        }
+    }
+
+    // default to english if we lack a match, or match has zero length
+    if ( trans.length == 0 || trans[0].length == 0 ) {
+        trans = [ msgid, msgid_plural ];
+    }
+
+    var translation = trans[0];
+    if (plural) {
+        var p;
+        if (found && this.isValidObject(domain_used.head.plural_func) ) {
+            var rv = domain_used.head.plural_func(n);
+            if (! rv.plural) rv.plural = 0;
+            if (! rv.nplural) rv.nplural = 0;
+            // if plurals returned is out of bound for total plural forms
+            if (rv.nplural <= rv.plural) rv.plural = 0;
+            p = rv.plural;
+        } else {
+            p = (n != 1) ? 1 : 0;
+        }
+        if (this.isValidObject(trans[p]))
+            translation = trans[p];
+    }
+
+    return translation;
+};
+
+
+/*
+
+=head2 strargs (string, argument_array)
+
+  string : a string that potentially contains formatting characters.
+  argument_array : an array of positional replacement values
+
+This is a utility method to provide some way to support positional parameters within a string, as javascript lacks a printf() method.
+
+The format is similar to printf(), but greatly simplified (ie. fewer features).
+
+Any percent signs followed by numbers are replaced with the corrosponding item from the B<argument_array>.
+
+Example:
+
+    var string = "%2 roses are red, %1 violets are blue";
+    var args   = new Array("10", "15");
+    var result = Gettext.strargs(string, args);
+    // result is "15 roses are red, 10 violets are blue"
+
+The format numbers are 1 based, so the first itme is %1.
+
+A lone percent sign may be escaped by preceeding it with another percent sign.
+
+A percent sign followed by anything other than a number or another percent sign will be passed through as is.
+
+Some more examples should clear up any abmiguity. The following were called with the orig string, and the array as Array("[one]", "[two]") :
+
+  orig string "blah" becomes "blah"
+  orig string "" becomes ""
+  orig string "%%" becomes "%"
+  orig string "%%%" becomes "%%"
+  orig string "%%%%" becomes "%%"
+  orig string "%%%%%" becomes "%%%"
+  orig string "tom%%dick" becomes "tom%dick"
+  orig string "thing%1bob" becomes "thing[one]bob"
+  orig string "thing%1%2bob" becomes "thing[one][two]bob"
+  orig string "thing%1asdf%2asdf" becomes "thing[one]asdf[two]asdf"
+  orig string "%1%2%3" becomes "[one][two]"
+  orig string "tom%1%%2%aDick" becomes "tom[one]%2%aDick"
+
+This is especially useful when using plurals, as the string will nearly always contain the number.
+
+It's also useful in translated strings where the translator may have needed to move the position of the parameters.
+
+For example:
+
+  var count = 14;
+  Gettext.strargs( gt.ngettext('one banana', '%1 bananas', count), [count] );
+
+NOTE: this may be called as an instance method, or as a class method.
+
+  // instance method:
+  var gt = new Gettext(params);
+  gt.strargs(string, args);
+
+  // class method:
+  Gettext.strargs(string, args);
+
+=cut
+
+*/
+/* utility method, since javascript lacks a printf */
+Gettext.strargs = function (str, args) {
+    // make sure args is an array
+    if ( null == args ||
+         'undefined' == typeof(args) ) {
+        args = [];
+    } else if (args.constructor != Array) {
+        args = [args];
+    }
+
+    // NOTE: javascript lacks support for zero length negative look-behind
+    // in regex, so we must step through w/ index.
+    // The perl equiv would simply be:
+    //    $string =~ s/(?<!\%)\%([0-9]+)/$args[$1]/g;
+    //    $string =~ s/\%\%/\%/g; # restore escaped percent signs
+
+    var newstr = "";
+    while (true) {
+        var i = str.indexOf('%');
+        var match_n;
+
+        // no more found. Append whatever remains
+        if (i == -1) {
+            newstr += str;
+            break;
+        }
+
+        // we found it, append everything up to that
+        newstr += str.substr(0, i);
+
+        // check for escpaed %%
+        if (str.substr(i, 2) == '%%') {
+            newstr += '%';
+            str = str.substr((i+2));
+
+        // % followed by number
+        } else if ( match_n = str.substr(i).match(/^%(\d+)/) ) {
+            var arg_n = parseInt(match_n[1]);
+            var length_n = match_n[1].length;
+            if ( arg_n > 0 && args[arg_n -1] != null && typeof(args[arg_n -1]) != 'undefined' )
+                newstr += args[arg_n -1];
+            str = str.substr( (i + 1 + length_n) );
+
+        // % followed by some other garbage - just remove the %
+        } else {
+            newstr += '%';
+            str = str.substr((i+1));
+        }
+    }
+
+    return newstr;
+}
+
+/* instance method wrapper of strargs */
+Gettext.prototype.strargs = function (str, args) {
+    return Gettext.strargs(str, args);
+}
+
+/* verify that something is an array */
+Gettext.prototype.isArray = function (thisObject) {
+    return this.isValidObject(thisObject) && thisObject.constructor == Array;
+};
+
+/* verify that an object exists and is valid */
+Gettext.prototype.isValidObject = function (thisObject) {
+    if (null == thisObject) {
+        return false;
+    } else if ('undefined' == typeof(thisObject) ) {
+        return false;
+    } else {
+        return true;
+    }
+};
+
+Gettext.prototype.sjax = function (uri) {
+    var xmlhttp;
+    if (window.XMLHttpRequest) {
+        xmlhttp = new XMLHttpRequest();
+    } else if (navigator.userAgent.toLowerCase().indexOf('msie 5') != -1) {
+        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+    } else {
+        xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
+    }
+
+    if (! xmlhttp)
+        throw new Error("Your browser doesn't do Ajax. Unable to support external language files.");
+
+    xmlhttp.open('GET', uri, false);
+    try { xmlhttp.send(null); }
+    catch (e) { return; }
+
+    // we consider status 200 and 0 as ok.
+    // 0 happens when we request local file, allowing this to run on local files
+    var sjax_status = xmlhttp.status;
+    if (sjax_status == 200 || sjax_status == 0) {
+        return xmlhttp.responseText;
+    } else {
+        var error = xmlhttp.statusText + " (Error " + xmlhttp.status + ")";
+        if (xmlhttp.responseText.length) {
+            error += "\n" + xmlhttp.responseText;
+        }
+        alert(error);
+        return;
+    }
+}
+
+Gettext.prototype.JSON = function (data) {
+    return eval('(' + data + ')');
+}
+
+
+/*
+
+=head1 NOTES
+
+These are some notes on the internals
+
+=over
+
+=item LOCALE CACHING
+
+Loaded locale data is currently cached class-wide. This means that if two scripts are both using Gettext.js, and both share the same gettext domain, that domain will only be loaded once. This will allow you to grab a new object many times from different places, utilize the same domain, and share a single translation file. The downside is that a domain won't be RE-loaded if a new object is instantiated on a domain that had already been instantiated.
+
+=back
+
+=head1 BUGS / TODO
+
+=over
+
+=item error handling
+
+Currently, there are several places that throw errors. In GNU Gettext, there are no fatal errors, which allows text to still be displayed regardless of how broken the environment becomes. We should evaluate and determine where we want to stand on that issue.
+
+=item syncronous only support (no ajax support)
+
+Currently, fetching language data is done purely syncronous, which means the page will halt while those files are fetched/loaded.
+
+This is often what you want, as then following translation requests will actually be translated. However, if all your calls are done dynamically (ie. error handling only or something), loading in the background may be more adventagous.
+
+It's still recommended to use the statically defined <script ...> method, which should have the same delay, but it will cache the result.
+
+=item domain support
+
+domain support while using shortcut methods like C<_('string')> or C<i18n('string')>.
+
+Under normal apps, the domain is usually set globally to the app, and a single language file is used. Under javascript, you may have multiple libraries or applications needing translation support, but the namespace is essentially global.
+
+It's recommended that your app initialize it's own shortcut with it's own domain.  (See examples/wrapper/i18n.js for an example.)
+
+Basically, you'll want to accomplish something like this:
+
+    // in some other .js file that needs i18n
+    this.i18nObj = new i18n;
+    this.i18n = this.i18nObj.init('domain');
+    // do translation
+    alert( this.i18n("string") );
+
+If you use this raw Gettext object, then this is all handled for you, as you have your own object then, and will be calling C<myGettextObject.gettext('string')> and such.
+
+
+=item encoding
+
+May want to add encoding/reencoding stuff. See GNU iconv, or the perl module Locale::Recode from libintl-perl.
+
+=back
+
+
+=head1 COMPATABILITY
+
+This has been tested on the following browsers. It may work on others, but these are all those to which I have access.
+
+    FF1.5, FF2, FF3, IE6, IE7, Opera9, Opera10, Safari3.1, Chrome
+
+    *FF = Firefox
+    *IE = Internet Explorer
+
+
+=head1 REQUIRES
+
+bin/po2json requires perl, and the perl modules Locale::PO and JSON.
+
+=head1 SEE ALSO
+
+bin/po2json (included),
+examples/normal/index.html,
+examples/wrapper/i18n.html, examples/wrapper/i18n.js,
+Locale::gettext_pp(3pm), POSIX(3pm), gettext(1), gettext(3)
+
+=head1 AUTHOR
+
+Copyright (C) 2008, Joshua I. Miller E<lt>unrtst@cpan.orgE<gt>, all rights reserved. See the source code for details.
+
+=cut
+
+*/
+
diff --git a/js/resource.js b/js/resource.js
index caf4b13..97448dc 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -113,7 +113,7 @@ var showArchivedContacts = 0;
 
 function updateProduct(){
 
-  $("#icon_product").html("<img src='images/littlecircle.gif'>");
+  $("#icon_product").html("<img src='images/littlecircle.gif' />");
   
   $.ajax({
 	 type:       "GET",
@@ -124,7 +124,7 @@ function updateProduct(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_product").html("<img src='images/butterflyfishicon.jpg'>");
+		$("#icon_product").html("<img src='images/butterflyfishicon.jpg' />");
 	 }
 
 
@@ -135,7 +135,7 @@ function updateProduct(){
 
 
 function updateAcquisitions(){
-  $("#icon_acquisitions").html("<img src='images/littlecircle.gif'>");
+  $("#icon_acquisitions").html("<img src='images/littlecircle.gif' />");
 
   $.ajax({
 	 type:       "GET",
@@ -146,7 +146,7 @@ function updateAcquisitions(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_acquisitions").html("<img src='images/acquisitions.gif'>");
+		$("#icon_acquisitions").html("<img src='images/acquisitions.gif' />");
 	 }
 
 
@@ -156,7 +156,7 @@ function updateAcquisitions(){
 
 
 function updateAccess(){
-  $("#icon_access").html("<img src='images/littlecircle.gif'>");
+  $("#icon_access").html("<img src='images/littlecircle.gif' />");
 
   $.ajax({
 	 type:       "GET",
@@ -167,7 +167,7 @@ function updateAccess(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_access").html("<img src='images/key.gif'>");
+		$("#icon_access").html("<img src='images/key.gif' />");
 	 }
 
 
@@ -179,7 +179,7 @@ function updateAccess(){
 
 
 function updateContacts(){
-  $("#icon_contacts").html("<img src='images/littlecircle.gif'>");
+  $("#icon_contacts").html("<img src='images/littlecircle.gif' />");
   
   $.ajax({
 	 type:       "GET",
@@ -190,7 +190,7 @@ function updateContacts(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_contacts").html("<img src='images/contacts.gif'>");
+		$("#icon_contacts").html("<img src='images/contacts.gif' />");
 	 }
 
 
@@ -206,7 +206,7 @@ function updateArchivedContacts(showArchivedPassed){
   }
 
   
-  $("#div_archivedContactDetails").append("<img src='images/circle.gif'>  Refreshing Contents...");
+  $("#div_archivedContactDetails").append("<img src='images/circle.gif' />  "+_("Refreshing Contents..."));
   $.ajax({
 	 type:       "GET",
 	 url:        "ajax_htmldata.php",
@@ -225,7 +225,7 @@ function updateArchivedContacts(showArchivedPassed){
 
 
 function updateAccounts(){
-  $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
+  $("#icon_accounts").html("<img src='images/littlecircle.gif' />");
   $.ajax({
 	 type:       "GET",
 	 url:        "ajax_htmldata.php",
@@ -235,7 +235,7 @@ function updateAccounts(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_accounts").html("<img src='images/lock.gif'>");
+		$("#icon_accounts").html("<img src='images/lock.gif' />");
 	 }
 
 
@@ -245,7 +245,7 @@ function updateAccounts(){
 
 
 function updateAttachments(){
-  $("#icon_attachments").html("<img src='images/littlecircle.gif'>");
+  $("#icon_attachments").html("<img src='images/littlecircle.gif' />");
   $.ajax({
 	 type:       "GET",
 	 url:        "ajax_htmldata.php",
@@ -255,7 +255,7 @@ function updateAttachments(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_attachments").html("<img src='images/attachment.gif'>");
+		$("#icon_attachments").html("<img src='images/attachment.gif' />");
 	 }
 
 
@@ -272,9 +272,9 @@ function updateAttachmentsNumber(){
 	 data:       "action=getAttachmentsNumber&resourceID=" + $("#resourceID").val(),
 	 success:    function(remaining) {
 		if (remaining == "1"){
-			$(".span_AttachmentNumber").html("(" + remaining + " record)");
+			$(".span_AttachmentNumber").html("(" + remaining + _(" record)"));
 		}else{
-			$(".span_AttachmentNumber").html("(" + remaining + " records)");
+			$(".span_AttachmentNumber").html("(" + remaining + _(" records)"));
 		}
 	 }
  });
@@ -282,7 +282,7 @@ function updateAttachmentsNumber(){
  
 
 function updateRouting(){
-  $("#icon_routing").html("<img src='images/littlecircle.gif'>");
+  $("#icon_routing").html("<img src='images/littlecircle.gif' />");
   $.ajax({
 	 type:       "GET",
 	 url:        "ajax_htmldata.php",
@@ -292,7 +292,7 @@ function updateRouting(){
 		$(".div_mainContent").html(html);
 		tb_reinit();
 		bind_routing();
-		$("#icon_routing").html("<img src='images/routing.gif'>");
+		$("#icon_routing").html("<img src='images/routing.gif' />");
 	 }
 
 
@@ -301,7 +301,7 @@ function updateRouting(){
 } 
 
 function updateCataloging(){
-  $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
+  $("#icon_accounts").html("<img src='images/littlecircle.gif' />");
   $.ajax({
 	 type:       "GET",
 	 url:        "resources/cataloging.php",
@@ -311,7 +311,7 @@ function updateCataloging(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
-		$("#icon_cataloging").html("<img src='images/cataloging.gif'>");
+		$("#icon_cataloging").html("<img src='images/cataloging.gif' />");
 	 }
 
   });
@@ -320,7 +320,7 @@ function updateCataloging(){
 
 
 function updateRightPanel(){
-  $("#div_rightPanel").append("<img src='images/circle.gif'>  Refreshing Contents...");
+  $("#div_rightPanel").append("<img src='images/circle.gif'>  "+_("Refreshing Contents..."));
   $.ajax({
 	 type:       "GET",
 	 url:        "ajax_htmldata.php",
@@ -366,7 +366,7 @@ function bind_removes(){
 
 
    $(".removeContact").unbind('click').click(function () {
-	  if (confirm("Do you really want to delete this contact?") == true) {
+	  if (confirm(_("Do you really want to delete this contact?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -384,7 +384,7 @@ function bind_removes(){
    });
 
    $(".removeAccount").unbind('click').click(function () {
-	  if (confirm("Do you really want to delete this account?") == true) {
+	  if (confirm(_("Do you really want to delete this account?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -402,7 +402,7 @@ function bind_removes(){
 
 
    $(".removeAttachment").unbind('click').click(function () {
-	  if (confirm("Do you really want to delete this attachment?") == true) {
+	  if (confirm(_("Do you really want to delete this attachment?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -422,7 +422,7 @@ function bind_removes(){
 
 
    $(".removeResource").unbind('click').click(function () {
-	  if (confirm("Do you really want to delete this resource?") == true) {
+	  if (confirm(_("Do you really want to delete this resource?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -444,7 +444,7 @@ function bind_removes(){
 
    	  tabName = $(this).attr("tab");
 	  
-	  if (confirm("Do you really want to remove this Subject?") == true) {
+	  if (confirm(_("Do you really want to remove this Subject?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -462,7 +462,7 @@ function bind_removes(){
    
    	  tabName = $(this).attr("tab");
 
-	  if (confirm("Do you really want to delete this note?") == true) {
+	  if (confirm(_("Do you really want to delete this note?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -505,7 +505,7 @@ function bind_routing(){
 
 
    $(".restartWorkflow").unbind('click').click(function () {
-	  if (confirm("Warning!  You are about to remove any steps that have been started and completed.  Are you sure you wish to continue?") == true) {
+	  if (confirm(_("Warning!  You are about to remove any steps that have been started and completed.  Are you sure you wish to continue?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
@@ -522,7 +522,7 @@ function bind_routing(){
 
 
    $(".markResourceComplete").unbind('click').click(function () {
-	  if (confirm("Do you really want to mark this resource complete?  This action cannot be undone.") == true) {   
+	  if (confirm(_("Do you really want to mark this resource complete?  This action cannot be undone.")) == true) {   
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 0212a3b52370776738d79bdd35e94435b80bbd95..623e8469bd3abb483da6d823b583ab0ea7d52be4 100644
GIT binary patch
literal 29447
zcmcJX37lO;o$rqlgapDSOOWk^#VmB+Y(St{Leoh|LMLg`SqLC_`rgysC%Jv^<(_-f
zbX-7L1Q8UK0og?bf<6Qh=b<nzjfe}+eR+bof;x&00**2>I^SPao#l3SGMV|jcRy5r
zPt~caQ_H{p^{*v7yWgZ6JboW}jprQ-kDKaw3tsDa-EUB+=S@4x^Y(=Y!`<Pr(1*vt
zNpPJDKNoi6FFOANa8LY?K*f8)@#~OJc;AA`?^!q*{u&+xUxbQ3`Do93J=_cK508ZV
zz=crdSq7E<T(}!7LVa&Dd>y<PD&8e7{CcSTZ+GuM1NX!K7&PU9d*Oc;DxVjizV|9r
zK6@NvzjGLzg#Q@m!`W~TcosYuZh-pEMNs)&?cU!6mG4L4bod}t{@-=szk;gIi%{ua
zh01608$ItZI2|4W7eS>v4^D$+sB~ArUEy_5_4*(@0Nw-Devd)r`yJQ@e-5X>y=K_<
zIvA=QeW?6q!d>7zsCdV_@YA8>WI0s7^+V-bgL}hEU^{#-RR28&_5E+V_s>I>@6S-}
zI(eq&(Zt>%Q0;R%)c00Gy*~#k{wApW-v(9xYoYq>b{GB$_&WTLLiNum+#Nm%mG8Hq
z+T&TMa=#3Bhkt{+!QEzA|K3pXr$Lqb7^wE|aN*}b)hmQ5#|Tt8-wl=Dtx)ptF*qAO
z2-P0XIR6v^kHvpHqzSyh@oE?Tp!5F(p3VDRiOi$70nUZ*gi7}iRDVAW_kcf#D)$Re
z<$V=u2v2LXa<Txb{kk2`hkN2LL$%`wWaxSCa{iCQ$@m{}{!yrUf7^vW2bJF+-TS{g
zPNlMvheO~Ia5mf%u7GOi4bX=dLiPKljvs?Gk@q!7mv}G3Q{Z6*WCETG`OmwBKa1ek
zAVb8PGRMl}T&Q}lgc=u{AtLTw?%sbK9*+M>_x{)LNc?Kl5pWb#d)@}8z>h%5)BRB8
ze%SdRgOabuq2hlP?hU^QB`-gPd%>68`(5VQ{3b*7)BaHX=R@VY3`%Z#pz_@aQNP{=
zQ0*2#rK`Xda4S@~zYJB*-$2EC34RxP^F6Nwz6aHRCoQn=yWmv(Jy74h0IJ;mQ03hM
z75@sj4}7oVolxI-(7k^Ys=QA?mFt`C{nN04|9SWRyyI+rN>Ja4p!D7dRJ+{*RqhW%
zjqm%R>itEietg{V7Z6ckz*xB{K#k+oQ2B*W{rxT|dAbuG0KW_+M^8i5XVM9_eg{D5
z)gz$NFNFKTjZo<}!_Dv=P~+zXsPgZ=(59aT)gDJerEiCdw;HNmo1o;T1||Q)a5lUV
zs{OwN)!yHNivLp={v1@kFF}>(Z!UbF6K%S~;r@iTL8b46ir3@b_d)eX4XS_N3e}&N
zLzU+`Sb#S`A3hFO!RH`N<Q;dCjkgJ^92Y^Qe=AhEuY}6?gD(757k)QX`+ORzA0LNm
z?;k>y?>A8Syb6`?qz=oy;eq(y02ObZ^LIJ_xlr?687lv)pz^;7syrWed<1G-e+5b|
zpNDGKKSIgZD^TtA+LLYl_Ju0PG&lnu1(okva2mV-s$Ykp+VewD@jvGL4?wl&qfqTJ
z3N>!O4pr}OLDlEyQ1bK=RJkUj%=Df8pxz$?Uk?{Ty*~@8oNM81ScH=2>!9TLA*k{`
z12z69oodT51FF6SsB#<!4~8efHLw>R1n-8b$3H=p^Q+GPW5?&9>i;iLayI!i+i!<M
z<v-K0;CLKVKXgE~^D=l0T<7=}sDAq}RJ|XBhr-99zW;OBgnxpn&mc-&?R5=QJAByj
z0Vp~7yyFj`?2;GYeE1?<439qDhDT8HHU!mw!%*#e8B{sm1J(X_K)rtu>iuI-<$VGw
z-VdP4`CF*^y$bbyw@&Ln2<rXOQ287Wl}{&B`B%928(sJ&7al{E|D8~BbR|^3T?^Gu
z?}z%{eef{&k5J$JzI*?id;cHKKjjQ7M@K@{`vj==IvuJXH$dfAhU%{osCe&!D#!Iu
z@o#`C&nKYbJp}drFG79)r%>|qM`*?~RJ=)DwjK6^N`Dm8xR?#q4)Yy5q3YKI)&7G}
z^1l_T{jPKVo1xO(5B1&0oc}4Pbk9JQ_YY9%cct?sw+BP{=R@_&QmA+vpyaCJ!Y_xD
z@ZSLS{${A}JqT6)FF^JGSD@<oW2kcc3aY*@i?2nWEV1KkpEGU0&xRVG3!ui!c~I>Y
zzzQrw$;Z>s<Oe6=e;F$NU!n5<J5;)<%WS($gBmwSL&fWa>X$PeLwE@O%N*~3yW{_y
z<Ks~IJ_UD!PeZlGFQMxBS9lcMbGfbmTqwC&2-V)*Q1LE+YNv~w|5B*-{s2_F-2;{X
z{csli3{<+GK_9*Z4~P4&u-{(*^?o^2KIcQFt3k!P+3^vm{`?X2;cp$MoMrvT!XpUp
zhRUxD)jpTN-QjIe<-QxLzaNIukKb^7-cgHJM9O;u)Ofi7s$QGn6j+DK?`=^1b|qA~
zu5sbF!Xxp23{HkmLbdaE9Df558SigU{jqqZE!P^y0IJ<<Q0;yNoB?ly%IEV?<@i2S
zyq~%7SD@;>$12;7heM^G50!2)RKJ`HRqj5h@(sYL@FJ-8y96r#JD}p<2NmyAa1Zz>
zRK8C_jpH9frTY`y6YjU#h93ddE(;x(LFKa%Dqaz`!5UluZ-edd+b;a?&fnH!=fQKK
z;$H#hz)!(G_zU<(xa4f+AXtXS!h4|l>AP@W_zYD0`~j*xU$e%_`z$ye|4Jx%s6xrd
z)ll+yCsaK@4VCU2Q0@6LRK8Pst^ZIcd7TfH{%q*OL8yMZ8mgUdcl-pLkN>l9ANT@P
zd;bj{4PUp`*7I1XdY=auz^h#Nqi`Mm-#eax2h+;C32ubnfhWSY^|n1iI2-@<P~nfl
z0(=D?1CQQd+hGNi9w|fh>s9blcrR3Y&N|1Ib3W9#=y3i{sQz6JrJs5oH^RN~UkDF`
zRX7b^36=g1sCK#A@zd}G{9l5~@2`%#P${*~R46$-07{OgI~L&i_)mtChnt|%e;z9T
zufkX04`CHPb*`QFPCd`|Z>Qr%sPA0l{3CFG{MSR}cQ<@Je8BN>sQiBfRi5YJH24zS
z5AI2!Bqv9}t#BSxJAMN00w0EZ!AGF_`AMkp`3h9}SK%Ar)Hm7qGvV?0+u%aj2Rq@-
zQ1yNW9s+l{z}kyPK*`fGI2R5<y}uov3_lC?oj=0^;N%PKJaYt;e4GL$2b-bFaSd$3
zyIuI9Z?^q=3RL~Oq1t03RQU#=#?2j2a`6?Yet!xo{CiOK{&%Q!vjW>53!&mKg_56c
zsQk}|2g3*|{$(!wdMNq29jZMahN{=&jz5Ho|IbkU`xobz5>dW;!BgQOa1PuEsiJo^
zJQw~JsyvH}HvS4IJ-GpD{PscR8@u;!alFd$2B>=61yznuL6!3hQ1bLmC^`G3<6q!m
z_@|a^J&uJ3;Xlp!*TbXmM^N>?*72iI^7c8X?>z;j4}StBcauZg{`*0d`(UViXG6*N
z8PK#hRR5n3kA~O4BjE$^MEG5(cH6Vx*5hEPdd-CD-xHwP<5cHg0`<LasPerDs@_%i
z{xYckdbfLj8&rFI67C8ghl>9-cp7{b&V+{zSUFw_=i`4TRJk99uY<pWO8+}J3BCxA
zfPaQt;DLiy|6L39y@#CtN$39qRJnGEY&#qXr{g~vD*R1Q?NEdI-rL}0csW#guXDT$
zsvkZB+u$#t+I{a$mNTH*cM()M`r!3&7`_os-fYV~7fSwnpz_}Y)&FmY(mOZ6UEuxj
zB={+~8vY*c22Uy5ep(Dw{x!}YLZy$P%JCkk{67g*o>3^h@gw*CW$5ESXvp^KiBS4u
zIXoO*2$kR4p}upY<9$&5|CsZC6RP~bfQQ1r!q>tBE4I7`!`<;uhbq@>sQgyK8Su?e
z?Qs><c(@Cy+)qFs{@C%~puT%()%ITj>U|GX{Vswk|CLbXxfSZW4?)%EQMfmJ8mixZ
z2WP@vYW90=P~|!uPKCWt-wRxL3@78i5>A2dgZl0*jt@YM_b)@0|Cdnh@vm?nxc@~~
z{~iNX&eNgFxgP4fLvUYsDO5i1hl=+AR6b8Y#rvh>pP|}wa^1E^8&thk!98F<)Hta_
zmGk{j<-Z4N9(WL{9^Zg!{~tnq??w0;_*2|XxUb>#yMn+1?yJ^o{@#v%D(*1cHMq-g
zce?kFL-p^g&i{URBJcHUK*ZUb3*UxY@50{&FLlrFfF<0wiFYyl1bho_CGPJy{r(wu
zJ@3@d`n`qcOU)Dep73hibGU19SK_YYy?%?~a`+YFqwQVzG4N3rCj8hvFDLvU7v~*>
z-No}8oc}8P+i)ZJ=eV$ULXFif_!L|U&w$6^lHapDOeY*M^tQtP4e!Ifn`ix|TX?77
z|1{6)LxzBNh<iW6^X)kO7P+totk*jaf6VhIanhOk&BJZLt;V&v_?Ppn-~YkgMA!|u
zy?B-$)b9ir?>KlaPV#a(T#KvX^c%+g15Uc)2*Tb9^^*>`1Q+7=#T|`%822XJVjSXY
ze&>+p2Rx19-p=zXxC!?!xC?Ms5%x6P4W0%!!a49(nEd+P^AvbGftSN2xFd0YOCsg?
zBF`&uMc)4wo(2!b-NEzAxPQle2!Has&^=tJFx)=^hP5||=h<*8ZVPUfOS6pU@8k6A
zCG1pO56`zjjkR{%Kk$4BF8})po_FH<2;UcX8_)ZViSu!n;G1wR?nd5!3vPfK*K2Ue
zZ$J0&VR#Ymcf~Qhy*r_F)cfJP;XOG0=HovDC%ZEFm3WYzJPs$l@<W_{Kf}F`xX;6%
z<Cft56?ZFc8R2K+hH($!zX0m@X7ktD`FcFSg)<d-$MgI?xQ7e7g6GLR@8bM;y^rY+
zzh7FIzaMhXkH9;K`-j}STX_BeVV`qh_rg<gU&kFwcmxl}orK$h|18|U@mz*|u!+;J
zh<htxd*PCw?;d*L&A8v-R`Y%yZXwSN+$p&8@z2hsJ1X~F;Qgm?`n{L%^WZ-jU+bT<
z@ji+B74FZuS9_A?K%9^J9pP8Q-EnWi4d7qz;;w}Y-18fGm;ddJ=Uf-i4Znzc9dSO4
z`?3pPkxO%k3+r$k;N8vc{ksTzk9&SSyuro!i{n!GLBbD$Z^Tu2UV!_Nd%r)=n{g-O
zUW2=v@Xxw;Lyk4V*YW%c?gbZiC}BtAPIUf#U>$$*Yx4Y2=Q$RB9`_N#u5)3XJb%eO
z-w4mdAL4$^bC(N0$}vH}L%;KM!i$p^@H4n;Nw42GEWE$M!*ILc{)oE^x5mZkftTT*
z=KN>zd>~H0BXDmfd@@`G2XVXdd_C?;p4;Fp@EZ6YT=H8-*e0BQPv8b|-S|(!y<LI)
z_U8F*_R*|K-J`LGU&1rPrT+lWhvHs~|4i5c1Kf9c-Ul84e}S9H^DOv#+&Q@K;l6|W
zzqm!XKj9V<C&EqTS-&sf{uk~exD#;t9nSk_;7X|92XXhCC+rq@q<fBe-|pgUBy2wJ
zG51dR5B>4igmJZ5FNQo6tMyXs`Mu4dp`bqE`9Zxn7;Onlez96<1jWY8c$Ob*38He)
zR}Krl=l6~9C%ia{8*#z&qu7rselzBk-%}2QIP`~t&7mJR>!Dw%`gQlEn2ZSx8-BCq
z4@ZqbzcFai_E+meK_jYG$gCU{!%7@_By702(>=f1&j+g&{izQGm1wJp?vb_1J}Y^M
zd5W9GVi?E$&2o8!50$GyDJ+q3qw0G{C6)C%lj=+q){zVBHtEL&ba*p+s7<9Y%bQ7K
zl_|r_O0^RD{nchA@yzmOQ^JdyQJuEzkHRvo-07DnR8$Nap^v9OD$`ocxZ(GOX=%Mq
zQw0Zqc_nS2Bxq&W7_63BeI4@h^@hK8q!!}g!*Qf$oj5@8&0DXtRH7{Wnd2`hMGXX@
zZ&O%o&{$>D&hcPWqvS+zU$D>Ru-@<&2O}{h^gByif=ZFkDwcV(WC)2NyhQ)I)D5I*
zaEMkj(Yma3+2>}R)+~+~&zWH*tOsR^vp8%hlcYf1QDw7<u__#<bXI`VfOT<Lx1MUl
z7DOTbne}S3rf}01WNTa3Uqviat}Hxlv3UI3uAmW=s{>JGVEnsrS@qPbr6w(yzEB&`
z;H9CcV*fIB!n!i+jZ9&A(GtX%n;@d{Fpb+AHX5X+{PM<Tw1gFn&yofs1GhgKXx8nh
zB5NaPM2>>kNrN7h8&ES?Dxi#O_&tM2v%C#|-I{J5YPEWGOHiIem7;#huLR4qEiawI
z;3<xyfeM9C)01u5<L;}i{#5egu#CWwj8Q736IGgF!Ru@`1`(FzV^*xkhw)VctMzCr
z8QA7*^_#YA4WjB@L8an!4E1Vi=+=D(Z`dEH0-M7Te<qPkulwtxa5(YM?zu<5w-Gd&
z@%RvZAr%=@_A!1U3<i~f&|itLltX;z5vQS4WaB4NwZyyXP^}yyDQ?jCYpP07ZIVK@
zpwTKCveI&0)h!I40eY{i9-?PT?x9-ux{_hGSo+7k_VOP8jIc2rh7|%C*oabK2ewpj
zcyTSVBIPX(<6=FkNeDXdw2abK!BFVJ)FD=xj0=ce2tBblifiRyM5Do5T=hq)P1I%}
z{XHC@&Ztuf`JljNz6h+ATeLG#Q*qmw*b+QuyPb;a+Hq&%mXLy-iAOhvI}<ONPIo3Q
zlX87~@tEs3+ZIi7M2f7GE%N=fnwn`1jq;)$DVm`wCDcM;J565?hY&rRr|b6ZeLNpE
zFd7ZJKpJgl64(|sQ<Z1_T8*AQYZ6R6IhCHDM{P3m;juGV?p5m)W?!TtWxtS(Y3Fy7
znu(kaH{)Bpc!S>`6vM_GRR0jhjdULEOFK6@e4D)6nm@7ip=(3?lumXgr`|x;S!<Y?
z{mk3ktY`cis`btN<?66EraJlgxx>9|gh+sNgE35`S&TuW;+fgSH}egifpQcNdQ0kc
zlxDksMipz$S~$kYORSzW!Wb3NS!RHjMto-Furwx8rZZ$&j>~BYh9k3jFl0;}zTS^e
z?kHxhPMcykZa?DcoK2~m(rRZ0Ed$ACmZ>Hqq>vVRClgcX?POr>$lM@P)EFJ=Ggs@`
z*q7<|T=aCz{&&mkEcD`FwMv}=pSdq8rDk{1p)MA)ui9FXnn<GS?cPRM^D8RhL>*+r
zZ=x4i>SWfyI90kJ?OH21Y3{baT(v6AA<U$rec6HjVGgpELjOS6h-c1XL`7w9NjfuG
z0rjo4mb|61ualw%PU`wXO*M3BsZc27q6`Hi$z;leR`Fv#6=5(I2ZK7Q5Q7F$4~A+y
z1eH>oACnE)U({rnw)v%M6Z6aZByMF)KKd`H%o#A#FjdEs%glVagTHmme=}(=H47on
zf;TdW2fd{TxcSrJC6;kAsgCj6T+U>LC8Gp;GAhQNwSUcD_g)6Ec_c&gY#Jz8g_u5P
z5Vn|N%ffQG+U9%9$h2A?>F}0SndFx*_LleduEJ1X-h0NX4sUr$<{EmS&U3$+$eFS$
zZknM>Y1B|c)aGN&XrbulTt%(>!%k6Qb69g2W20Ixc*`rra<hc6Rz`T0+VN3tU9`M{
zQoxeN)>&S`pr_Zms&T_x!Me5ASSqQlnKP5EM9S`y%|V4V%)3^v>Fh4}%c{d6c2t|s
zf+!Bdq1eymMO8wphe}awt!^@r-iVvETD2}ymPN9uRbRb2%rso^*XHtX^KCKmnUVlW
ztC%H5KBZqZc2?XbZNM71dvRwEwKE2vre`-))OwO@3Nk3o5e-p@YO|3kvEpD@+^i-a
zvo@gO)HLcJ(SqA7D+(M;CqikS*43DFu_$vMn%d1)37zd4r+#M|CzD!|K&5mxuYIL}
zBrfZ1yc(F@)uLHtkWA|?A8E4>GNzM2vpBKAt?fXyyG(thLJNafcG?!O^BSYqXjWMv
zjZmwH^+7#SKWZ4-agP+6rPLfFjC01dnzwSqKf4*C7R}H#31=E{jw%@M#=pZMr5GJv
z%Su+BRIwxJ%#Ew6{FhGkey>y#%dcc59#8xh>5wVg@|L=5Z-N#uee7GatAx&Dd}uKm
zC@<Gcxv`bo`f(97^P<4hEfgh-<0`sRa$j~POctSF(xryen51-aP__%}?SIuYEEUQ!
zRi5rser%RtXcvaE-AT&gnU9yNth4HNuA|MXY*00dgVXiI2qAezLT6^AkWDRx*Mbr4
zRO}$r*jQmQP?9upvu}vjr4jO>saj*nUyB)>*vNe>vE25SS$CS1P15x<Vp-ySQN=E@
zS$U1!%s~}q_MdO(3stm%TA?eA<T9$0FPm4PpBGQ$-Y&^WWS`V7JnmR#6{BT`&92PY
zU{hi>9Dm8FIn+mcQ*z`hPV)?W=5t<*eIE~+g)9q<KD+w#=b0KVIN^A2bys&6%DAi!
zid%gh-fEc?_OEZh>B4N?T5L13V$O#sYPOk3-g#f5pjrY+k&~9SLA*KkoIPfDQ4^mm
zB=_6_<Cva6U%E{dXIwGBvHY<Uq-wQyDEZJVWP~B>yD=79K1H2ffP$AqU^r;1#n2?@
zzGkDr<Y2OsIWHr_e4sC6l&BYttV--B{vO+~+Q2n4QIH$FCAKq*G6FR545K>CuCUi5
zGn*>1snxLCB|L7y{2B-etV;Phz3w*06uKp%|476}G;>yHcW<0eB{RD@WBl40855M|
zkfcEbZHH*mNT1R`cFzdyXS`vZ3}`NGFm7T^I%~oKvk%7*GRq~UNkf+RsA)-N^4B`4
z<h$CK5Vxbgq|%^u*4Uk2DUp~=+&eo~Gk>Dc^&J<*>=mUxGr^_4iN~Hqn`R*o9`v`V
zS)3^qDNNRiPD}NM+THhh-G&<ryI!`=to@me(?p3NJW{-NH;#D2M$^VlwibE4(NMFD
z@(ioZ*zEZE-4P0~!|Scq>mzL#M5!Xwv}0w7f^f*tYY!hx?U?$_PBM#K^N3hsT<KXG
zYZl~bYJ=dhwdE(a0imq{#G7#U+J%x`s-x9GMspLC?q;!aV4${ym@+BMSP;{_-Vw&p
zP^xd%GT^p5J}Ri>Y>X&se-%r5Sltsay2c*0AVx&u#V{sZ;MeL^j1u+=f-Op6#-dr7
z(=!uBbjK<odY5s@kfMXvMvdGd!-RcnqVQ>BSeZUqXP5hY$L+nb^f7wE8~Y}+FaO7<
zKI>xjsXE%OSrX-ImXdb;l0Ev2UN-bifDt$QXw4}T+A>JYEL|{hDl+co_?bRdYz20h
z*Ri+WEOWKj>wD%e8%xI6u|8|8hIlwvNh~m}X<8<Ur0_PDv&8<3Sk{20;a%S8c+Y}*
zIqIsEIG^(;dYO(UZ$nV8AS=^-e<N!eBV&E&15E^O(@o1L%>-t3+Q{1@8i%Mf85hY$
zM~Uw3w9^1nhI<%h??)LX%3)FR)eb8orlFJ7c5+U*Az9tc@w3kK(ooy0nO6nO-loMd
zr+{g!I^)-tnW@g(hykKXm#StdW(+MB>q8M!kG9z;u`_RtBs1o*!U`sdv3gkj=xDNK
zPHrM1{(xB}yNQ!QsLdL!L{kGR_VCGJRdb+Xp42$l;O1FYkbSUQ<+0loSBlW=!|_CA
zY$RvangkWeqN3@6(n}mOe>yFvLB(W;KS_fI3e&gw?<zyp&b+MVY#$Tg%wO{?VKEP;
z*|HiMZ$4t0UDj$I!sO9hMQ&n-EZxnYq#JSudm3&ksF*~`ZQhQLn$_LJ&MhNKrjcWt
zWzr2MQnFx>gd;hcURuKQVW#2CTf0p#t^_D&bI8~7IcNCWZ0S)mFs;wD&Omj#H;C0U
zUh{h_f*7ct*_Th`-TKhk7+tBfrGwKOk|pQ12V}jdPh&g7vs2b!5rg$rtA|@6&Cte&
z@kV{{AlEKHyY`+_4ha)cbHPa~I<KuVsv;367v5j54%yL?<dd{`Sx2`nmT6h{+#+}`
zENR2k>srzI$9yv<lrDk|$>bv+oQ$n}*hFP$k?nkBGZ<We5%ZQhvw6;Dvzdj}7n-Z7
zwNX-O_j#I<Jk~r6=rK1fV$W4h^98xfi$MkK?uEV2AocFa#0&=5ru4RGzRD~R>rX`w
z`&5Vd?aNE;>)E(O5q9`PXc{CVp3<{=ZM!)IB)EOCc6j{xbLSo3KKHox`E&hw3p?g7
zICk#5xpRrwz6L2$@*T$0{!shcdQge6j;r+!zblM`x_=5bO@%=hZY^-4SFJ?V0t<qm
zKJTQ{2c-TA$opwiy4n0{Qm*#3VKCI;r~VGVzkcD;HB(kDU%4c!#Js}XDP7ibZ#RaE
z-$3N&&;wEBWV6kRK0kHc+NJF$X7N<A{;=M@q*APEMcLt>*cUaXoYQW1QcaP2s%F&B
zE1Xc6H<wq|-+l(xR4r%>cKCC)1ob(?!^3mBuszFjlBT9P%N)6v+hya&9e$-|yz!~?
zPiDJQZ%&<A@lW&T%{n>D)!M-v1lK8Thi{9Ue$!g(J$$u&ZiipUB{PFuFP2<vHb+Z}
zu)TuOC{1?I;wic)!%mIv{jh^sshg!ueRLZWr_74x(C9YL%<4>BEGV3O@?IXcI%{+t
z1}Q#n)YRx$cMXV6B>*`mQ=i2LheKxXqTu(=;Qq!IqkYQ3=>3g0Z53fhY;8AzY?sdn
znnm{Yvyz#7P&j6nl5ew@6Bd2W&GLIOe9jDIuADG6QWol?m1x9mA+)RR0jYF$XxqZ5
z@><H(`JbDlk1Qtr#^|>4=r-;04~%ZJU(<jay;rxJOg=}kEJzZY1zoN&VlD^$_ujfM
z(dgq-X792KMq#C&2DUeh{06qjmeFnaOuOlh5ow07=2$931B^PRir8CT_R$X<nAmd(
znMd8)2H-FW#b2s2zmDEVQ?ypz>r|~to!dz(&0sDd)LS`vuWlW&w%BfnT|(FhW+K<X
zG~RS7H;atcATDs2gHW$?6B8g7i6gc;+r;KP!7uB)2%UlgqJLw$WfSK=X-o-_=1gpz
zB(d4w41KcX+-CGnzdVB-OLIlZe#LHpn$j85E3}qan!Xl|-it2ZRAoaW%asOA=ECGd
zC?RKcWzi6%%IG$GiK#TY&D@VDM+}Zq(-uAbj7naiOF3Z4je*>2`!;B%<0@=sEo4)-
zlrOXsuqu{}M5S1zojD(?&|P=JLswE43<XUJ6Got;vyPi62bscV`&Rql<GwIKkQ%@k
zPRweZw%zIe?7YWRF7ul1rpfY`r0f+G(~<<Ei}LAH`QR0cY5FER>@b33#ey>m8lY1b
z03cluGm{uCg64}DUuqua3U=qxK|@<*c@?-+m5Q>l`8)MjmtkmS`)EQ`inZuJZ>`ZX
zHQlS?!)%hUwzCiBZdIR=?bhp6bdXv7B3H&x7~MuHr(J0%KBU`Lqua>bj5G9Li_kLS
z8xy_AkN=or*?S0Nq-}HB!3u`i_u=?09m7TowD{N+p`HDJlks{)PR45{jwD3gqd1f`
z38Fz(QPPk_snoWq13JkJVe~Ls-rT{8xPHanTVPI&>4vUU(A<-3+g=&*w!q12cC^L@
z5;M_Eh<p|?X*CyQqIH=&SvtP;hwQy93Snjq)yt}4RceV*%K7VAsK?y>tkF+n`l+6b
z?Er17s@eljUDTq!s3gRbgSQ6Lp{{6+Zd3n?7-Edryk3!QX1c|^Mab=?Ep=29qOJdW
z=&cy5@04u2H@BQ>Vo+AF+=*%QDtldMSKlcv`eb~-Vw;k_TvDN-__PGaThB&*GPiH3
z2b@6?sx#3#k9AGr)Wa(3MLQR{MWS~y4I|aw<l3p?lw{a)^=juLqcG79I~iLmot=o9
z**-fFnLUb31uXJL-_78%##B7|IdlS@$P!Y!tTcC)vs#_)FSUJHlDY`fT%93($DE2%
zN=KwM47l{wr0Y3fn6P2ON?GUQ`i7C2?UX$1*OjNN=W{AlMu1Vk+e?~$LFMG)nQi#Q
zB=C|4&Fs!X$yp1|8ej}N17b#Q0Z${Lc(S<-<0gw|3pIh^Fg^}7Xt5o#80_7)sN(ER
zs)3}xT7s?A=E4FUO{BI(8aH=yY|Ndq(L34iP2+I`B{7n76--TrES_vDw=Bp~r$PCJ
zLiW1cVqIi;ZO8n`M;J~nq&Wj1F}zxulDR9fR?|yq=u#B(47+2d)dr@S%we5CQE^$3
z5=rF2$d%X0{hT1;G98!8n_T74oL>r?7bh08ne;J#u-1}DY;*HvBhfkiXO<+W!%Zmd
zK;|PV(Pp}X_=u}cy#nm<v;^uBTLRQ&L^k-@PwZ!Fm+3(^2<luWSC|y2O&5u58kDHk
zZ99&y0?o)Td;H1_HI?Qcw|1ClRc3WcxK)ie_MRJU_x~?f^v>wLtV6~tAl8>5i$|-s
z=yfyUwlsStqArjBH#Hr<X63dVdmnL3`)K&Mm8ZQ=kaR9hG(KS?sMSm&#nq&qiDEM2
zmS<=xWtpU2nn-3?a^y7r*l02^67_0zdDcYOFxLJ<AQ)UGsTMF=FQ$U#qIbyRF%p&&
z7>?^%#Y9XdX)N7J;ItHrK}+VU?#<hqcwVO&bZGU=+Ay;V*0jf%G6n{s?v|j*W&!_f
zNOyh4z0b>o=JT);v2I2Di{>((WQGw_qYzQRh;H|(9ebMPCX<`4;{`SDf7PqCL7oSi
z5v!{qOd7_{5DU7PeFq%{u`gmCbqmm}jCFuLdM`zFm+*3T@q)_eJyIr1HCD}Eoe9cL
zN*8;qci8?+mwxG5Z*`w7zDBaPn03mfvqyXVPAeyDuclkKjqznIV@@G75vFT*D$n`*
zghu-r)rwZW>6N_*6SK2eY%-$KYkH`liSO_6LYBSTx6!}H+Dd~(W)BAW;R>Hor}3D*
z9fqp0yNGSq+u1r!Dg?tM)%@m49}-C`l+_jaxj9>-ddnnzXi1sbqn~T|?rvZHT3@a?
z+|tdC2&d5M$$h@Au!hu9vo;+e#o-WhhN)EUTAySR5liwxSTfz|F7~lL(Z1J~s`gGQ
z!4~bfP`QHNqhZ+kQH0RUNL%x_{MZ8+GPVXq(XIw<maQt)Mq{&<C?k_G8#pGmU9bD*
z79fKJTaSBvM!i$sz?%A_+s5m7pK-_~zlh!$|5?`Y`EqD=t1CT2EN3}RGzywyv{3yj
zvC=Yk;_z<W{$f+kQM-(^lvzM&vdgW_C`7V@mqhN6dBFn0jC1!gmn3J+uu7{BFrwLa
zM0+gJrS+omW|vUazBDKGvMrXbk<$>n1kcCeR$;!4Tbj4vug@AVGfuLrg=hku3vB;F
zA+kg7Z~sD}8ieBo)9z9Ux%*m)7TBq=Pg-r~jN4NhACww1t5{L8WmuV^O+%Rqn&z_U
z)#};)$VtESn6<CXM&o~#N&{Sj#wK$&6MOiG)Oq@m)I5=r47ssq<7@mIU7xHLq$wqX
zx>v<ylh+){#$;}HmfKP8L$1KNce=b~3z5j0yT@qEvTVDXZQvxLHR@xxD@fvWPn<|}
zQntC!TCz-!WGRwdC8FlGW<EEsyR~N6r0K3kHga<MDWC5uYX@m^GuQjk{YeFi%zj1A
z9~q<Z^fXi_Zmjxfc?2|WGLcr;A!{uG`*!Y1<c=z1|HVd<SAOItCCI+TL4=fw>jq~A
zsYB9v0#(gE^)_YzpO`9~Jz%p70S#4iO)|oARx-CYmA@^?phTb8TUUy*CRym9-ey=)
zmxkg4$#!2lM`=GZKL(TCA}#7uWg-t+!<jFbhTL&fy4<w1gIOAFV`2xcl5VGj(wH-k
z^b}$hS*DjO?Z^6<f2fZ}0!^0b1?J}pt-_jP$MK9_=AI=Dv@_Q%$&U+`VV(Ox)|gB-
z)U3~2qx~+|hAqnvcdgPM!6a8M-GNM^?OPHg7cp%d?VgU_#SGUXn#q=&*-d7dfFaXk
zpmxNTc0SD~W)i4z=tMWI&9-2%Z^l?J%(FCRgXxjIc55U`2|DAPiBAW+Zsl5-Aa!ny
zkjnrwn}(S%epxo)R)(9|Y;^ZElS74^RqslWZq3>uZFXLER328scD9%LwMIp$%1xNi
zn$cr5S%5SlNOdF$Fc@W8vNMU6sz(<ytq!?8yxFs7D~PL|qxZ6dv4lIOZ1k~4cat#(
z&ZQ>1`%95b{!Md?b>y~*rJe_ahS?A16XQL}W^wYeH65a`d@--mb4&BdiNZR(6(QGv
z#>V6#Xlgb{&1e$S!lG$ze%gN>mu4=bGufZu-e*g=tD;Gdap4Xc?8%B6&uSEF#$@vw
zEu!1$8ntMNG~7#7l3UL7OD>Y(m79fg5p_k+*n?><OxspZPOL)g_*DCvfy%C}S#nYo
z_D>qxiCQyyAD^{TKwfRD(L$M+UT^-SfX}Z(8;5LS*p*$Tfwbn8p+Nte2G;dajuBSU
z)^&tWR)B7#=|&dc&##9TVK#EzfriU(E@2K3s(Yr!f@J48uCg)7zs$)SEXJ1Ll`f<r
z!I_bs%s2Tfr~Er(x1r9a4kM4{1)HPHiAL`_Bh{h98@<}-l<r7Er4m<*o7H4v19XRX
z{1K&DBgVW+rr31aTgoL5hC!b!RE-|2YEzmqflC=(`lkv~>gN00KOMbSw-(XxI~vjz
zH^FUhV0Y6KaWm49j~ffDR|wLiYj38g!Rcvxm~4(Qm|i%(>tpP*nQXc^9U1hkRWr#F
z-yEH9FRhv27zetfs#>}IU44#fAy%qvCR96^M7g}G0~Afq#-hjeP4|J=1c-HGfqEuq
z5bgdB-;ZB7F)`$?Ed0-JEF{yNnmxA*kdt;D?AQ~(Tp$WmXF>T@VzO5-CYBjJtzohn
z*j&hur<OCsykcuHI>x6n$MN~;bjLZH>$EC6leIm>Yf%Bo`XPObEF|keb9I)fkx|Ks
zzJ%0Fk*u4wI9zS+DmwGPUYI4WGon*7Zo<g+wvGOe77{s<xTRsHg54`!b;8PP4Ug>=
zTwTQ@wTsf4r3>uT7Madfru!V8aQ(p8)~*^g-6)_-lA{sSuJ%BPWo#F1NJTlrmxhvR
zLbb_OQ?sG`u!!S=zl6rgAN`OELr_+~Ifl!$?;`!5IBbc`J|7mM*$i}B+UANbTA+|!
zxSiupo?As{yc{MLh*OfN^rpWd+22ndY^g(;@$_Hz5&ogl=r%SmWPa<#>Sm<FCJyAe
zt3jV)wrQ%&?(k9?9rbMEUyay~wg-y3$7qhJG@~dXJ!^&w(Q>v}ax{_dsF=1wi7AOS
z{<43B%2ixr4%QR8tG$VVh9Yz#mqswQczSbV>={D(!XCi5)p_grQBsK9CUcs*G3-f2
zg}4!H%Vw78>Fp6aq$d7O>uFS02`yY)QK(LO*3_CmBOys)Vp9ZDyEHUcw%k^A?zR2_
zzW%M1GyJpclSO4qjqE^3gLL&Pu=lE6wV9}sd&fz^D8fXaPBu;R3ee-9|8(kfGpu{4
z33EP}KBT9Kb`LYRy`ar0ca~^Yp1N$5BqvoaCQ`WF<HfNDgINxwVL0fjkQqhUrG(sv
zjnXpL%JYSBdQ<vAQ=Qo;Xh}5D-a%G&E0C?Vv3H(Pb1fCi(#VR-mo~Z6lU2w51Al40
zTv76NZ&rhr&fy<n=wF3R_lhhKoW1Bq8jb4i!Gy8bix$QzkPg><3f+`O|H<TRIp<Ep
z8`zv`o<w7fi)ao5)N{ED)wwOR#0-|QNzEqD_}HJ_X0(!SieZxHY*4-TQsX0g;+9Hk
zk*NLM*v$edX`)|R0>`P9>}__05T|+DOJ`=qk<6~iypwi&mV<&?25K&&Tz_T>(9Y=+
zBv&Izp^iqp<XhPg&eA&F-EvI6q~*FmQsS{`T8fx`BGn05kl8)bhCr4@tD?xAyRdm{
zc9)nlbm26o)0{zzIpF3iBbKQou?BW4CW&EgnKPl-nj<52vJ!12o3BgrRh{h>w?&by
hQxO7ATM+Q+9zv$$<dJY|W>RT(Y-zx}IhFOye*%inyB`1m

delta 8276
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
NLvObAU!2<H{{RhSuVDZH

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index bb7b1c6..8822b3d 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-16 17:23+0100\n"
-"PO-Revision-Date: 2015-04-16 17:24+0100\n"
+"POT-Creation-Date: 2015-04-20 17:23+0100\n"
+"PO-Revision-Date: 2015-04-20 17:23+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -14,6 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
 
 #: admin.php:51 ajax_htmldata.php:2175 ajax_htmldata.php:2468
 msgid "Users"
@@ -51,7 +52,7 @@ msgstr "Type d'alias"
 
 #: admin.php:61
 msgid "Attachment Type"
-msgstr "Type de fixation"
+msgstr "Type de pièce jointe"
 
 #: admin.php:62 index.php:496
 msgid "Authentication Type"
@@ -249,7 +250,9 @@ msgstr "ajouter ce payment"
 msgid "add payment"
 msgstr "ajouter un payment"
 
-#: ajax_forms.php:446 ajax_forms.php:1220
+#: ajax_forms.php:446 ajax_forms.php:1220 js/forms/acquisitionsForm.js:142
+#: js/forms/acquisitionsForm.js:143 js/forms/resourceNewForm.js:246
+#: js/forms/resourceNewForm.js:247
 msgid "remove this payment"
 msgstr "effacer ce payment"
 
@@ -321,7 +324,8 @@ msgstr "ajouter cet alias"
 msgid "add alias"
 msgstr "ajouter alias"
 
-#: ajax_forms.php:912
+#: ajax_forms.php:912 js/forms/resourceUpdateForm.js:223
+#: js/forms/resourceUpdateForm.js:224
 msgid "remove this alias"
 msgstr "effacer cet alias"
 
@@ -500,11 +504,11 @@ msgstr "Email enregistré:"
 
 #: ajax_forms.php:2098
 msgid "Edit Attachment"
-msgstr "Modifier la fixation"
+msgstr "Modifier la pièce jointe"
 
 #: ajax_forms.php:2098
 msgid "Add Attachment"
-msgstr "Ajouter fixation"
+msgstr "Ajouter pièce jointe"
 
 #: ajax_forms.php:2137
 msgid "File:"
@@ -620,7 +624,8 @@ msgstr "Parent étape"
 msgid "add step"
 msgstr "ajouter une étape"
 
-#: ajax_forms.php:2851
+#: ajax_forms.php:2851 js/forms/workflowForm.js:201
+#: js/forms/workflowForm.js:202
 msgid "remove this step"
 msgstr "effacer cet étape"
 
@@ -652,7 +657,8 @@ msgstr "Utilisateurs asignés"
 msgid "add user"
 msgstr "Ajouter un utilisateur"
 
-#: ajax_forms.php:3019
+#: ajax_forms.php:3019 js/forms/generalDetailSubjectForm.js:135
+#: js/forms/userGroupForm.js:117
 msgid "remove user from group"
 msgstr "Supprimer un utilisateur du groupe"
 
@@ -671,13 +677,13 @@ msgstr "Sujet détaillé"
 
 #: ajax_forms.php:3242
 msgid "add detail subject"
-msgstr "Ajouter detail du sujet"
+msgstr "Ajouter sujet détaillé"
 
 #: ajax_forms.php:3272
 msgid "remove detailed subject"
 msgstr "Supprimer le sujet détaillé"
 
-#: ajax_forms.php:3274 ajax_htmldata.php:2615
+#: ajax_forms.php:3274 ajax_htmldata.php:2574 ajax_htmldata.php:2615
 msgid "subject in use"
 msgstr "Sujet en utilisation"
 
@@ -990,23 +996,23 @@ msgstr "Pas des comptes disponibles"
 
 #: ajax_htmldata.php:1350
 msgid "view attachment"
-msgstr "Regarder la fixation"
+msgstr "Regarder la pièce jointe"
 
 #: ajax_htmldata.php:1355
 msgid "edit attachment"
-msgstr "Modifier la fixation"
+msgstr "Modifier la pièce jointe"
 
 #: ajax_htmldata.php:1355
 msgid "remove this attachment"
-msgstr "suopprimer cette fixation"
+msgstr "Supprimer cette pièce jointe"
 
 #: ajax_htmldata.php:1387
 msgid "No attachments available"
-msgstr "Pas des fixations disponibles."
+msgstr "Pas des pièces jointes disponibles."
 
 #: ajax_htmldata.php:1392
 msgid "add new attachment"
-msgstr "Ajouter une nouvelle fixation"
+msgstr "Ajouter une nouvelle pièce jointe"
 
 #: ajax_htmldata.php:1416
 msgid ""
@@ -1198,7 +1204,7 @@ msgstr "Ajouter un nouveau utilisateur"
 
 #: ajax_htmldata.php:2264
 msgid "add new currency"
-msgstr "Ajouter une vouvelle concurrence"
+msgstr "Ajouter une nouvelle concurrence"
 
 #: ajax_htmldata.php:2286 ajax_htmldata.php:2518 ajax_htmldata.php:2559
 #: ajax_htmldata.php:2601
@@ -1233,7 +1239,7 @@ msgstr ""
 
 #: ajax_htmldata.php:2460
 msgid "User Group Setup"
-msgstr "Configuration de groupe d'utilisateur"
+msgstr "Configuration du groupe d'utilisateur"
 
 #: ajax_htmldata.php:2466
 msgid "Group Name"
@@ -1270,7 +1276,7 @@ msgstr "Il y avait un problème pour enregistrer votre fichier sur "
 #: ajax_processing.php:721
 msgid "Please ensure your attachments directory is writable."
 msgstr ""
-"S'il vous plaît, verifiez que votre dossier de attachement a des droits "
+"S'il vous plaît, verifiez que votre dossier des pièces jointes a des droits "
 "d'écriture."
 
 #: ajax_processing.php:740
@@ -1304,7 +1310,7 @@ msgstr "Il y a un doublon "
 msgid " exists."
 msgstr " existant."
 
-#: index.php:26 templates/header.php:98
+#: index.php:26 templates/header.php:111
 msgid "Home"
 msgstr "Accueil"
 
@@ -1350,7 +1356,7 @@ msgstr "ID d'enregistrement"
 msgid "Starts with"
 msgstr "Commence avec"
 
-#: index.php:339
+#: index.php:339 js/index.js:278
 msgid "more options..."
 msgstr "plus des options..."
 
@@ -1370,7 +1376,7 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: queue.php:22 queue.php:40 templates/header.php:100
+#: queue.php:22 queue.php:40 templates/header.php:113
 msgid "My Queue"
 msgstr "Ma liste"
 
@@ -1510,7 +1516,7 @@ msgstr "URL:"
 msgid "Additional Cataloging Notes"
 msgstr "Notes additionales du catalogue"
 
-#: templates/header.php:58
+#: templates/header.php:71
 msgid ""
 "JavaScript must be enabled in order for you to use CORAL. However, it seems "
 "JavaScript is either disabled or not supported by your browser. To use "
@@ -1521,35 +1527,35 @@ msgstr ""
 "utiliser CORAL, activez JavaScript en modifiant la configuration de votre "
 "navigateur, après "
 
-#: templates/header.php:58
+#: templates/header.php:71
 msgid "try again"
 msgstr "réessayez"
 
-#: templates/header.php:77
+#: templates/header.php:90
 msgid "Hello, "
 msgstr "Bonjour, "
 
-#: templates/header.php:87
+#: templates/header.php:100
 msgid "logout"
 msgstr "Se déconnecter"
 
-#: templates/header.php:99
+#: templates/header.php:112
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
-#: templates/header.php:101
+#: templates/header.php:114
 msgid "Admin"
 msgstr "Administrateur"
 
-#: templates/header.php:117
+#: templates/header.php:130
 msgid "Change Module"
 msgstr "Changer le module"
 
-#: templates/header.php:147 templates/header.php:148
+#: templates/header.php:160 templates/header.php:161
 msgid "French"
 msgstr "Français"
 
-#: templates/header.php:147 templates/header.php:148
+#: templates/header.php:160 templates/header.php:161
 msgid "English"
 msgstr "Anglais"
 
@@ -1561,6 +1567,249 @@ msgstr ""
 "La connexion ne marche pas. Vérifiez le fichier .htaccess et "
 "remoteAuthVariableName specifié en /admin/configuration.ini"
 
+#: js/admin.js:301
+msgid "Number of days must be a number"
+msgstr "Le nombre de jours doit être un nombre"
+
+#: js/admin.js:304
+msgid "Number of days should be between 1 and 365"
+msgstr "Le nombre de jours doit être entre 1 et 365"
+
+#: js/admin.js:325
+msgid "Do you really want to delete this data?"
+msgstr "Voulez-vous vraiment supprimer cette donnée?"
+
+#: js/admin.js:352 js/admin.js:380 js/admin.js:408 js/admin.js:497
+msgid "Do you really want to remove this data?"
+msgstr "Voulez-vous vraiment enlever cette donnée?"
+
+#: js/admin.js:438
+msgid "Do you really want to delete this user?"
+msgstr "Voulez-vous vraiment supprimer cet utilisateur?"
+
+#: js/admin.js:468
+msgid "Do you really want to remove this alert setting?"
+msgstr "Voulez-vous vraiment effacer cette configuration d'alerte?"
+
+#: js/admin.js:527
+msgid "Do you really want to delete this currency?"
+msgstr "Voulez-vous vraiment supprimer cette devise?"
+
+#: js/common.js:113
+msgid "No match!"
+msgstr "Pas des coincidences!"
+
+#: js/common.js:113
+msgid "Selected: "
+msgstr "Sélectionné: "
+
+#: js/forms/acquisitionsForm.js:118
+msgid "Error - Either amount or fund is required"
+msgstr "Erreur, les deux cantitées ou fonds sont réquises"
+
+#: js/forms/acquisitionsForm.js:121 js/forms/acquisitionsForm.js:248
+#: js/forms/resourceNewForm.js:225 js/forms/resourceNewForm.js:295
+msgid "Error - order type is a required field"
+msgstr "Erreur - le type d'ordre est un champ réquise"
+
+#: js/forms/acquisitionsForm.js:124 js/forms/acquisitionsForm.js:254
+#: js/forms/resourceNewForm.js:228 js/forms/resourceNewForm.js:300
+msgid "Error - price is not numeric"
+msgstr "Erreur: le price n'est pas numérique"
+
+#: js/forms/acquisitionsForm.js:242 js/forms/resourceNewForm.js:222
+#: js/forms/resourceNewForm.js:290
+msgid "Error - Either price or fund is required"
+msgstr "Erreur, les deux prices ou fonds sont réquises"
+
+#: js/forms/attachmentForm.js:94
+msgid "File name is already being used..."
+msgstr "Le nom du fichier est en use..."
+
+#: js/forms/attachmentForm.js:98
+msgid ""
+"File name may not contain special characters - ampersand, single quote, "
+"double quote or less than/greater than characters"
+msgstr ""
+"Le nom du fichier ne peut pas contenir des caractères spéciaux -  "
+"esperluètte, apostrophe, guillemet ou moins que / plus que."
+
+#: js/forms/attachmentForm.js:102
+msgid "The attachments directory is not writable."
+msgstr "Le dossier des pièces jointes n'a pas des droits d'écriture."
+
+#: js/forms/attachmentForm.js:124 js/forms/attachmentForm.js:146
+msgid " successfully uploaded."
+msgstr " téléchargé avec succès."
+
+#: js/forms/attachmentForm.js:159 js/forms/resourceUpdateForm.js:340
+msgid "Name must be entered to continue."
+msgstr "Le nom doit être écrit avant de continuer."
+
+#: js/forms/attachmentForm.js:160
+msgid "Attachment Type must be selected to continue."
+msgstr "Le type de pièce jointe doit être sélectionné avant de continuer."
+
+#: js/forms/attachmentForm.js:178
+msgid "A file must be uploaded"
+msgstr "Le fichier doit être téléchargé"
+
+#: js/forms/contactForm.js:179
+msgid "Please choose at least one role."
+msgstr "S'il vous plaît, choisissez au moins un rôle."
+
+#: js/forms/detailedSubjectForm.js:60 js/forms/generalSubjectForm.js:59
+msgid "Error - Please enter a value"
+msgstr "Erreur - S'il vous plaît, tappez un valeur"
+
+#: js/forms/generalDetailSubjectForm.js:87
+msgid "Error - Detailed Subject is required"
+msgstr "Erreur - Le sujet détaillé est nécessaire"
+
+#: js/forms/generalDetailSubjectForm.js:108
+#: js/forms/generalDetailSubjectForm.js:109
+msgid "Error - Detail Subject Already Added"
+msgstr "Erreur - Le sujet détaillé est déjà ajouté"
+
+#: js/forms/generalDetailSubjectForm.js:136 js/forms/userGroupForm.js:118
+msgid "remove from group"
+msgstr "Supprimer du groupe"
+
+#: js/forms/generalDetailSubjectForm.js:181
+msgid "Short Name must be entered to continue."
+msgstr "Un petit nom doit être tappé pour continuer."
+
+#: js/forms/licenseForm.js:140 js/forms/licenseForm.js:256
+msgid "Error - Please choose a valid license"
+msgstr "Erreur - S'il vous plaît, choisissez une licence valide"
+
+#: js/forms/licenseForm.js:155 js/forms/licenseForm.js:156
+msgid "remove this license"
+msgstr "Effacer cette licence"
+
+#: js/forms/resourceNewForm.js:99
+msgid "Warning: this name already exists."
+msgstr "Attention: le nom est déjà existant."
+
+#: js/forms/resourceNewForm.js:282
+msgid "Title must be entered to continue."
+msgstr "Le titre doit être écrit avant de continuer."
+
+#: js/forms/resourceNoteForm.js:34
+msgid "Note must be entered to continue."
+msgstr "Le nom de la note doit être écrit avant de continuer."
+
+#: js/forms/resourceUpdateForm.js:88
+msgid "Error - Parent cannot be the same as the child"
+msgstr "Erreur - Le père ne peut pas être pareil comme l'enfant"
+
+#: js/forms/resourceUpdateForm.js:208 js/forms/resourceUpdateForm.js:258
+#: js/forms/resourceUpdateForm.js:354 js/forms/resourceUpdateForm.js:365
+msgid "Error - Both fields are required"
+msgstr "Erreur, Les deux champs sont exigés"
+
+#: js/forms/resourceUpdateForm.js:260
+msgid "Error - Organization is not found.  Please use the Autocomplete."
+msgstr ""
+"Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
+"l'autocomplete."
+
+#: js/forms/resourceUpdateForm.js:277 js/forms/resourceUpdateForm.js:278
+msgid "remove this organization"
+msgstr "Supprimer cette organisation"
+
+#: js/forms/resourceUpdateForm.js:356
+msgid "Error - Organization is not found.  Please use Autocomplete."
+msgstr ""
+"Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
+"l'autocomplete."
+
+#: js/forms/resourceUpdateForm.js:373
+msgid "Error - Parent resource is not found.  Please use Autocomplete."
+msgstr ""
+"Erreur - Le ressource père n'est pas trouvé. S'il vous plaît, utilisez "
+"l'autocomplete."
+
+#: js/forms/userGroupForm.js:101
+msgid "Error - User is required"
+msgstr "Erreur, un utilisateur est nécessaire pour cette action"
+
+#: js/forms/userGroupForm.js:163
+msgid "Group name must be entered to continue."
+msgstr "Le nom du groupe doit être écrit avant de continuer."
+
+#: js/forms/workflowForm.js:185
+msgid "Error - Step name is required"
+msgstr "Erreur, Le nom de l'étape est nécessaire"
+
+#: js/forms/workflowForm.js:373
+msgid "Please add at least one step to this workflow."
+msgstr "S'il vous plaît, ajoutez au moins une étape à ce workflow."
+
+#: js/forms/workflowForm.js:379
+msgid ""
+"Please click the Add button to the first step before submitting this "
+"workflow."
+msgstr ""
+"S'il vous plaît, cliquez sur le button Ajouter pour cette étape avant de "
+"valider ce workflow."
+
+#: js/index.js:154
+msgid "Processing..."
+msgstr "En traitement..."
+
+#: js/resource.js:209 js/resource.js:323
+msgid "Refreshing Contents..."
+msgstr "Rechargements des contenus..."
+
+#: js/resource.js:275
+msgid " record)"
+msgstr " registre)"
+
+#: js/resource.js:277
+msgid " records)"
+msgstr " registres)"
+
+#: js/resource.js:369
+msgid "Do you really want to delete this contact?"
+msgstr "Voulez-vous vraiment supprimer cette contact?"
+
+#: js/resource.js:387
+msgid "Do you really want to delete this account?"
+msgstr "Voulez-vous vraiment supprimer cette compte?"
+
+#: js/resource.js:405
+msgid "Do you really want to delete this attachment?"
+msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
+
+#: js/resource.js:425
+msgid "Do you really want to delete this resource?"
+msgstr "Voulez-vous vraiment supprimer ce ressource?"
+
+#: js/resource.js:447
+msgid "Do you really want to remove this Subject?"
+msgstr "Voulez-vous vraiment enlever ce sujet?"
+
+#: js/resource.js:465
+msgid "Do you really want to delete this note?"
+msgstr "Voulez-vous vraiment supprimer cette note?"
+
+#: js/resource.js:508
+msgid ""
+"Warning!  You are about to remove any steps that have been started and "
+"completed.  Are you sure you wish to continue?"
+msgstr ""
+"Attention! Vous êtes sur le point d'effacer quelques étapes qui ont été "
+"commencés et complétés. Etes-vous sûrs que vous voulez continuer?"
+
+#: js/resource.js:525
+msgid ""
+"Do you really want to mark this resource complete?  This action cannot be "
+"undone."
+msgstr ""
+"Êtes-vous sûrs de marquer ce ressource comme complète? Cette action ne peut "
+"pas être annulée."
+
 #, fuzzy
 #~ msgid "CatalogingType"
 #~ msgstr "Stat de catalogue "
diff --git a/templates/header.php b/templates/header.php
index bcc81eb..832060d 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -52,6 +52,19 @@
 <script type="text/javascript" src="js/plugins/date.js"></script>
 <script type="text/javascript" src="js/plugins/jquery.datePicker.js"></script>
 <script type="text/javascript" src="js/plugins/jquery.autocomplete.js"></script>
+<script type="text/javascript" src="js/plugins/Gettext.js"></script>
+<?php
+   if(isset($_COOKIE["lang"])){
+        if($_COOKIE["lang"]=='fr'){
+            echo "<link rel='gettext' type='application/x-po' href='./locale/fr_FR/LC_MESSAGES/messages.po'>";
+        }
+    }else{
+        $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+        if($defLang=='fr'){
+            echo "<link rel='gettext' type='application/x-po' href='./locale/fr_FR/LC_MESSAGES/messages.po'>";
+        }
+    } 
+?>
 <script type="text/javascript" src="js/common.js"></script>
 </head>
 <body>
@@ -172,7 +185,7 @@
         
         function setLanguage(lang) {
 			var wl = window.location, now = new Date(), time = now.getTime();
-            var cookievalid=86400000; // 1 jour (1000*60*60*24)
+            var cookievalid=86400000; // 1 day (1000*60*60*24)
             time += cookievalid;
 			now.setTime(time);
 			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;

From e77ddcfe2443823899fe32f7f488387d9ac83006 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 22 Apr 2015 10:30:03 +0200
Subject: [PATCH 016/159] Updated translations and added some strings

---
 css/thickbox.css                     |   2 +-
 js/queue.js                          |  22 +++----
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 29447 -> 29703 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  94 ++++++++++++++++-----------
 resources/cataloging_edit.php        |   4 +-
 5 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/css/thickbox.css b/css/thickbox.css
index f3cff58..ae1cbbd 100644
--- a/css/thickbox.css
+++ b/css/thickbox.css
@@ -161,5 +161,5 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d
 	border:none;
 	margin-bottom:-1px;
 	margin-top:1px;
-	_margin-bottom:1px;
+	margin-bottom:1px;
 }
diff --git a/js/queue.js b/js/queue.js
index c0e722b..8b5c151 100644
--- a/js/queue.js
+++ b/js/queue.js
@@ -52,7 +52,7 @@
 	$("#OutstandingTasks").parent().parent().removeClass('selected');
  	$('#SavedRequests').parent().parent().addClass('selected');
  
-	$('#div_feedback').html("<img src = 'images/circle.gif' />Refreshing...");
+	$('#div_feedback').html("<img src = 'images/circle.gif' />"+_("Refreshing..."));
 
 	  $.ajax({
 		  type:       "GET",
@@ -86,7 +86,7 @@
 	$("#OutstandingTasks").parent().parent().removeClass('selected');
  	$('#SavedRequests').parent().parent().removeClass('selected');
  
-	$('#div_feedback').html("<img src = 'images/circle.gif' />Refreshing...");
+	$('#div_feedback').html("<img src = 'images/circle.gif' />"+_("Refreshing..."));
 
 	  $.ajax({
 		  type:       "GET",
@@ -120,7 +120,7 @@
  	$("#OutstandingTasks").parent().parent().addClass('selected');
   	$('#SavedRequests').parent().parent().removeClass('selected');
   
- 	$('#div_feedback').html("<img src = 'images/circle.gif' />Refreshing...");
+ 	$('#div_feedback').html("<img src = 'images/circle.gif' />"+_("Refreshing..."));
  
  	  $.ajax({
  		  type:       "GET",
@@ -150,9 +150,9 @@
  //currently you can only delete saved requests, updateSavedRequests() is hardcoded
  function deleteRequest(deleteID){
  
- 	if (confirm("Do you really want to delete this request?") == true) {
+ 	if (confirm(_("Do you really want to delete this request?")) == true) {
 
-	       $('#div_feedback').html("<img src = 'images/circle.gif' />Refreshing...");
+	       $('#div_feedback').html("<img src = 'images/circle.gif' />"+_("Refreshing..."));
 
 	       $.ajax({
 		  type:       "GET",
@@ -190,9 +190,9 @@
  	 data:       "action=getSavedRequestsNumber",
  	 success:    function(remaining) {
  		if (remaining == 1){
- 			$(".span_SavedRequestsNumber").html("(" + remaining + " record)");
+ 			$(".span_SavedRequestsNumber").html("(" + remaining + _(" record)"));
  		}else{
- 			$(".span_SavedRequestsNumber").html("(" + remaining + " records)");
+ 			$(".span_SavedRequestsNumber").html("(" + remaining + _(" records)"));
  		}
  	 }
   });
@@ -211,9 +211,9 @@
  	 data:       "action=getOutstandingTasksNumber",
  	 success:    function(remaining) {
  		if (remaining == 1){
- 			$(".span_OutstandingTasksNumber").html("(" + remaining + " record)");
+ 			$(".span_OutstandingTasksNumber").html("(" + remaining + _(" record)"));
  		}else{
- 			$(".span_OutstandingTasksNumber").html("(" + remaining + " records)");
+ 			$(".span_OutstandingTasksNumber").html("(" + remaining + _(" records)"));
  		}
  	 }
   });
@@ -232,9 +232,9 @@
  	 data:       "action=getSubmittedRequestsNumber",
  	 success:    function(remaining) {
  		if (remaining == 1){
- 			$(".span_SubmittedRequestsNumber").html("(" + remaining + " record)");
+ 			$(".span_SubmittedRequestsNumber").html("(" + remaining + _(" record)"));
  		}else{
- 			$(".span_SubmittedRequestsNumber").html("(" + remaining + " records)");
+ 			$(".span_SubmittedRequestsNumber").html("(" + remaining + _(" records)"));
  		}
  	 }
   });
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 623e8469bd3abb483da6d823b583ab0ea7d52be4..c22188b554ace1a87193de699a6c56a40bc7d963 100644
GIT binary patch
delta 9628
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

delta 9463
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 8822b3d..9a1e0a1 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-20 17:23+0100\n"
-"PO-Revision-Date: 2015-04-20 17:23+0100\n"
+"POT-Creation-Date: 2015-04-22 10:29+0100\n"
+"PO-Revision-Date: 2015-04-22 10:29+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -244,17 +244,17 @@ msgstr "Type:"
 
 #: ajax_forms.php:382 ajax_forms.php:1157
 msgid "add this payment"
-msgstr "ajouter ce payment"
+msgstr "Ajouter ce payment"
 
 #: ajax_forms.php:382 ajax_forms.php:1157
 msgid "add payment"
-msgstr "ajouter un payment"
+msgstr "Ajouter un payment"
 
 #: ajax_forms.php:446 ajax_forms.php:1220 js/forms/acquisitionsForm.js:142
 #: js/forms/acquisitionsForm.js:143 js/forms/resourceNewForm.js:246
 #: js/forms/resourceNewForm.js:247
 msgid "remove this payment"
-msgstr "effacer ce payment"
+msgstr "Effacer ce payment"
 
 #: ajax_forms.php:512
 msgid "Notes"
@@ -302,7 +302,7 @@ msgstr "Supprimer une organisation"
 
 #: ajax_forms.php:818 ajax_forms.php:1417
 msgid "remove "
-msgstr "supprimer "
+msgstr "Supprimer "
 
 #: ajax_forms.php:818
 msgid " organization"
@@ -318,20 +318,20 @@ msgstr "Alias:"
 
 #: ajax_forms.php:871
 msgid "add this alias"
-msgstr "ajouter cet alias"
+msgstr "Ajouter cet alias"
 
 #: ajax_forms.php:871
 msgid "add alias"
-msgstr "ajouter alias"
+msgstr "Ajouter alias"
 
 #: ajax_forms.php:912 js/forms/resourceUpdateForm.js:223
 #: js/forms/resourceUpdateForm.js:224
 msgid "remove this alias"
-msgstr "effacer cet alias"
+msgstr "Effacer cet alias"
 
 #: ajax_forms.php:1029
 msgid "Edit Acquisitions Information"
-msgstr "modifier l'information des acquisitions"
+msgstr "Modifier l'information des acquisitions"
 
 #: ajax_forms.php:1038 ajax_htmldata.php:547 summary.php:414
 msgid "Order"
@@ -376,11 +376,11 @@ msgstr "Licences entregistrées"
 
 #: ajax_forms.php:1390
 msgid "add license"
-msgstr "ajouter une licence"
+msgstr "Ajouter une licence"
 
 #: ajax_forms.php:1417
 msgid "remove license link"
-msgstr "supprimer lien de la licence"
+msgstr "Supprimer le lien de la licence"
 
 #: ajax_forms.php:1417
 msgid " license"
@@ -622,12 +622,12 @@ msgstr "Parent étape"
 
 #: ajax_forms.php:2768
 msgid "add step"
-msgstr "ajouter une étape"
+msgstr "Ajouter une étape"
 
 #: ajax_forms.php:2851 js/forms/workflowForm.js:201
 #: js/forms/workflowForm.js:202
 msgid "remove this step"
-msgstr "effacer cet étape"
+msgstr "Effacer cet étape"
 
 #: ajax_forms.php:2915
 msgid "Edit User Group"
@@ -701,7 +701,7 @@ msgstr "Détail du nom de sujet"
 
 #: ajax_forms.php:3338 ajax_forms.php:3345
 msgid "add"
-msgstr "ajouter"
+msgstr "Ajouter"
 
 #: ajax_forms.php:3356 ajax_htmldata.php:2214 ajax_htmldata.php:2261
 #: ajax_htmldata.php:2305 ajax_htmldata.php:2353 ajax_htmldata.php:2383
@@ -727,7 +727,7 @@ msgstr " ne pas etabli!"
 #: ajax_htmldata.php:2527 ajax_htmldata.php:2568 ajax_htmldata.php:2610
 #: ajax_htmldata.php:2659
 msgid "edit"
-msgstr "modifier"
+msgstr "Modifier"
 
 #: ajax_htmldata.php:95 ajax_htmldata.php:660 ajax_htmldata.php:821
 msgid "edit resource"
@@ -791,7 +791,7 @@ msgstr "Ressource URL secondaire de visite"
 
 #: ajax_htmldata.php:298
 msgid "edit product details"
-msgstr "modifier les détails du produit"
+msgstr "Modifier les détails du produit"
 
 #: ajax_htmldata.php:365
 msgid "remove subject"
@@ -815,7 +815,7 @@ msgstr "ajouter une note"
 #: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
 #: resources/cataloging.php:220
 msgid "edit note"
-msgstr "modifier une note"
+msgstr "Modifier une note"
 
 #: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
 #: ajax_htmldata.php:1044 resources/cataloging.php:220
@@ -824,7 +824,7 @@ msgstr "effacer une note"
 
 #: ajax_htmldata.php:550 resources/cataloging.php:106
 msgid "edit order information"
-msgstr "modifier l'order de l'information"
+msgstr "Modifier l'order de l'information"
 
 #: ajax_htmldata.php:586
 msgid "Purchasing Sites:"
@@ -840,7 +840,7 @@ msgstr "L'information du payment n'est pas disponible."
 
 #: ajax_htmldata.php:648
 msgid "edit acquisitions information"
-msgstr "modifier l'information des acquisitions"
+msgstr "Modifier l'information des acquisitions"
 
 #: ajax_htmldata.php:658 summary.php:503
 msgid "License"
@@ -896,7 +896,7 @@ msgstr "Pas d'information d'accès disponible."
 
 #: ajax_htmldata.php:902
 msgid "edit access information"
-msgstr "modifier l'accès à l'information"
+msgstr "Modifier l'accès à l'information"
 
 #: ajax_htmldata.php:998
 msgid "The following are archived contacts:"
@@ -952,11 +952,11 @@ msgstr " contact(s) archivée(s) disponible(s)."
 
 #: ajax_htmldata.php:1180
 msgid "show archived contacts"
-msgstr "montrer les contacts archivées"
+msgstr "Montrer les contacts archivées"
 
 #: ajax_htmldata.php:1184
 msgid "hide archived contacts"
-msgstr "cacher les contacts archivées"
+msgstr "Cacher les contacts archivées"
 
 #: ajax_htmldata.php:1211
 msgid "No Resource Specific Accounts"
@@ -964,7 +964,7 @@ msgstr "Il n'y a pas une ressource spécifié par les comptes"
 
 #: ajax_htmldata.php:1215 ajax_htmldata.php:1312
 msgid "add new account"
-msgstr "ajouter une nouvelle compte"
+msgstr "Ajouter une nouvelle compte"
 
 #: ajax_htmldata.php:1237
 msgid "edit account"
@@ -1051,7 +1051,7 @@ msgstr "Complète"
 
 #: ajax_htmldata.php:1458
 msgid "mark complete"
-msgstr "marquer comme complète"
+msgstr "Marquer comme complète"
 
 #: ajax_htmldata.php:1480 ajax_htmldata.php:1482
 msgid "Workflow completed on "
@@ -1067,7 +1067,7 @@ msgstr "Redémarrer le workflow"
 
 #: ajax_htmldata.php:1499
 msgid "mark entire workflow complete"
-msgstr "marquer tout le workflow comme complète"
+msgstr "Marquer tout le workflow comme complète"
 
 #: ajax_htmldata.php:1587
 msgid "Print View"
@@ -1125,11 +1125,11 @@ msgstr "Statut"
 
 #: ajax_htmldata.php:1729
 msgid "edit request"
-msgstr "modifier la requête"
+msgstr "Modifier la requête"
 
 #: ajax_htmldata.php:1730
 msgid "remove request"
-msgstr "supprimer la requête"
+msgstr "Supprimer la requête"
 
 #: ajax_htmldata.php:1755 queue.php:53
 msgid "Submitted Requests"
@@ -1173,7 +1173,7 @@ msgstr " ressources enregistrées"
 
 #: ajax_htmldata.php:2028
 msgid "next page"
-msgstr "page suivante"
+msgstr "Page suivante"
 
 #: ajax_htmldata.php:2044 index.php:154
 msgid "Creator"
@@ -1181,7 +1181,7 @@ msgstr "Créateur"
 
 #: ajax_htmldata.php:2091
 msgid "previous page"
-msgstr "page précédente"
+msgstr "Page précédente"
 
 #: ajax_htmldata.php:2142
 msgid "records per page"
@@ -1196,7 +1196,7 @@ msgstr "Modifier l'utilisateur"
 #: ajax_htmldata.php:2485 ajax_htmldata.php:2528 ajax_htmldata.php:2572
 #: ajax_htmldata.php:2613
 msgid "remove"
-msgstr "supprimer"
+msgstr "Supprimer"
 
 #: ajax_htmldata.php:2210 ajax_htmldata.php:2214
 msgid "add new user"
@@ -1213,7 +1213,7 @@ msgstr "Valeur"
 
 #: ajax_htmldata.php:2308 ajax_htmldata.php:2540 ajax_htmldata.php:2628
 msgid "add new "
-msgstr "ajouter un nouveau  "
+msgstr "Ajouter un nouveau  "
 
 #: ajax_htmldata.php:2356
 msgid "add email address"
@@ -1225,7 +1225,7 @@ msgstr "Jours à l'avance de expiration"
 
 #: ajax_htmldata.php:2389
 msgid "add days"
-msgstr "ajouter jours"
+msgstr "Ajouter jours"
 
 #: ajax_htmldata.php:2404
 msgid "Workflow Setup"
@@ -1438,7 +1438,7 @@ msgstr "Le catalogue d'information n'est pas disponible."
 
 #: resources/cataloging.php:165
 msgid "edit cataloging details"
-msgstr "modifier les détails du catalogage"
+msgstr "Modifier les détails du catalogage"
 
 #: resources/cataloging_edit.php:15
 msgid "Edit Cataloging"
@@ -1448,6 +1448,14 @@ msgstr "Modifier le catalogage"
 msgid "Record Set"
 msgstr "Jeu d'enregistrement"
 
+#: resources/cataloging_edit.php:36
+msgid "Identifier"
+msgstr "Identifiant"
+
+#: resources/cataloging_edit.php:42
+msgid "Source URL"
+msgstr "Source URL:"
+
 #: resources/cataloging_edit.php:68
 msgid "# Records Available"
 msgstr "# Enregistrements disponibles"
@@ -1758,18 +1766,26 @@ msgstr ""
 msgid "Processing..."
 msgstr "En traitement..."
 
-#: js/resource.js:209 js/resource.js:323
-msgid "Refreshing Contents..."
-msgstr "Rechargements des contenus..."
+#: js/queue.js:55 js/queue.js:89 js/queue.js:123 js/queue.js:155
+msgid "Refreshing..."
+msgstr "Rechargement..."
 
-#: js/resource.js:275
+#: js/queue.js:153
+msgid "Do you really want to delete this request?"
+msgstr "Voulez-vous vraiment supprimer cete rêquete?"
+
+#: js/queue.js:193 js/queue.js:214 js/queue.js:235 js/resource.js:275
 msgid " record)"
 msgstr " registre)"
 
-#: js/resource.js:277
+#: js/queue.js:195 js/queue.js:216 js/queue.js:237 js/resource.js:277
 msgid " records)"
 msgstr " registres)"
 
+#: js/resource.js:209 js/resource.js:323
+msgid "Refreshing Contents..."
+msgstr "Rechargements des contenus..."
+
 #: js/resource.js:369
 msgid "Do you really want to delete this contact?"
 msgstr "Voulez-vous vraiment supprimer cette contact?"
diff --git a/resources/cataloging_edit.php b/resources/cataloging_edit.php
index dfc595e..512591a 100644
--- a/resources/cataloging_edit.php
+++ b/resources/cataloging_edit.php
@@ -33,13 +33,13 @@
 	<td style="width:400px;">
 		<table>
 		<tr>
-		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('recordSetIdentifier', 'Identifier'); ?></td>
+		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('recordSetIdentifier', _('Identifier')); ?></td>
 		<td><?php echo Html::text_field('recordSetIdentifier', $resource, array('width' => '240px')) ?>
 		</td>
 		</tr>
 
 		<tr>
-		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('bibSourceURL', 'Source URL'); ?></td>
+		<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo Html::label_tag('bibSourceURL', _('Source URL')); ?></td>
 		<td><?php echo Html::text_field('bibSourceURL', $resource, array('width' => '240px')) ?>
 		</td>
 		</tr>

From 93cf28864798b9f84a1d1d4a8c7d393936c6c3b2 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 22 Apr 2015 15:13:51 +0200
Subject: [PATCH 017/159] Changed variables names of function getCookie

---
 js/common.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/common.js b/js/common.js
index 8400150..1e76527 100644
--- a/js/common.js
+++ b/js/common.js
@@ -14,17 +14,17 @@
 **
 **************************************************************************************************************************
 */
-function getCookie(clave){
+function getCookie(keyCo){
     var valCookie= ""; 
-    var buscar= clave + "="; 
+    var search= keyCo + "="; 
     if(document.cookie.length > 0) { 
-        pos=document.cookie.indexOf(buscar); 
+        pos=document.cookie.indexOf(search); 
         if (pos != -1) {
-            pos += buscar.length; 
-            fin= document.cookie.indexOf(";", pos); 
-            if (fin == -1) 
-                fin= document.cookie.length; 
-            valCookie= unescape(document.cookie.substring(pos,fin)) 
+            pos += search.length; 
+            end= document.cookie.indexOf(";", pos); 
+            if (end == -1) 
+                end= document.cookie.length; 
+            valCookie= unescape(document.cookie.substring(pos,end)) 
         }
     } 
     return valCookie; 

From 33525a716c1951d67a62a023d44ad1a164fe6938 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Thu, 23 Apr 2015 12:15:31 +0200
Subject: [PATCH 018/159] Translated data.js and jquery.datePicker.js to show
 the calendar according to the language used and internationalization
 functions moved to a separate file

---
 js/common.js                         |  42 +-----
 js/plugins/date.js                   |   8 +-
 js/plugins/jquery.datePicker.js      |  12 +-
 js/plugins/translate.js              |  41 ++++++
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 29703 -> 31228 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 202 +++++++++++++++++++++++++--
 templates/header.php                 |   5 +-
 7 files changed, 242 insertions(+), 68 deletions(-)
 create mode 100644 js/plugins/translate.js

diff --git a/js/common.js b/js/common.js
index 1e76527..84904e2 100644
--- a/js/common.js
+++ b/js/common.js
@@ -14,47 +14,7 @@
 **
 **************************************************************************************************************************
 */
-function getCookie(keyCo){
-    var valCookie= ""; 
-    var search= keyCo + "="; 
-    if(document.cookie.length > 0) { 
-        pos=document.cookie.indexOf(search); 
-        if (pos != -1) {
-            pos += search.length; 
-            end= document.cookie.indexOf(";", pos); 
-            if (end == -1) 
-                end= document.cookie.length; 
-            valCookie= unescape(document.cookie.substring(pos,end)) 
-        }
-    } 
-    return valCookie; 
-} 
-
-function fLang() {
-    var langBrowser = '';
-    // Search the language according to the browser
-    if(getCookie('lang')=='' || getCookie('lang')==undefined){
-        if (navigator.languages==undefined) {
-            if (navigator.language==undefined) {
-                // Internet Explorer Compatibility
-                langBrowser= navigator.userLanguage.slice(0,2);
-            } else {
-                // Old navigator compatibility
-                langBrowser= navigator.language.slice(0,2);
-            }
-        } else { 
-            // Recent navigators
-            langBrowser= navigator.languages[0].slice(0,2);                                
-        }
-    }else{
-        langBrowser = getCookie('lang');
-    }
-    return langBrowser;
-}
-var gt = new Gettext({ 'domain' : 'messages' });//gt = new Gettext({ 'domain' : 'messages' });
-function _(msgid) {
-    return gt.gettext(msgid);
-}
+
 //image preloader
 (function($) {
   var cache = [];
diff --git a/js/plugins/date.js b/js/plugins/date.js
index 274bb98..b2da5fa 100644
--- a/js/plugins/date.js
+++ b/js/plugins/date.js
@@ -27,7 +27,7 @@
  * @type Array
  * @cat Plugins/Methods/Date
  */
-Date.dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+Date.dayNames = [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')];
 
 /**
  * An Array of abbreviated day names starting with Sun.
@@ -39,7 +39,7 @@ Date.dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday
  * @type Array
  * @cat Plugins/Methods/Date
  */
-Date.abbrDayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+Date.abbrDayNames = [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')];
 
 /**
  * An Array of month names starting with Janurary.
@@ -51,7 +51,7 @@ Date.abbrDayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
  * @type Array
  * @cat Plugins/Methods/Date
  */
-Date.monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+Date.monthNames = [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')];
 
 /**
  * An Array of abbreviated month names starting with Jan.
@@ -63,7 +63,7 @@ Date.monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July
  * @type Array
  * @cat Plugins/Methods/Date
  */
-Date.abbrMonthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+Date.abbrMonthNames = [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')];
 
 /**
  * The first day of the week for this locale.
diff --git a/js/plugins/jquery.datePicker.js b/js/plugins/jquery.datePicker.js
index 1eea17d..436e593 100644
--- a/js/plugins/jquery.datePicker.js
+++ b/js/plugins/jquery.datePicker.js
@@ -1126,12 +1126,12 @@
 	};
 	// localisable text
 	$.dpText = {
-		TEXT_PREV_YEAR		:	'Previous year',
-		TEXT_PREV_MONTH		:	'Previous month',
-		TEXT_NEXT_YEAR		:	'Next year',
-		TEXT_NEXT_MONTH		:	'Next month',
-		TEXT_CLOSE			:	'Close',
-		TEXT_CHOOSE_DATE	:	'Choose date',
+		TEXT_PREV_YEAR		:	_("Previous year"),
+		TEXT_PREV_MONTH		:	_("Previous month"),
+		TEXT_NEXT_YEAR		:	_("Next year"),
+		TEXT_NEXT_MONTH		:	_("Next month"),
+		TEXT_CLOSE			:	_("Close"),
+		TEXT_CHOOSE_DATE	:	_("Choose date"),
 		HEADER_FORMAT		:	'mmmm yyyy'
 	};
 	// version
diff --git a/js/plugins/translate.js b/js/plugins/translate.js
new file mode 100644
index 0000000..9eed911
--- /dev/null
+++ b/js/plugins/translate.js
@@ -0,0 +1,41 @@
+function getCookie(keyCo){
+    var valCookie= ""; 
+    var search= keyCo + "="; 
+    if(document.cookie.length > 0) { 
+        pos=document.cookie.indexOf(search); 
+        if (pos != -1) {
+            pos += search.length; 
+            end= document.cookie.indexOf(";", pos); 
+            if (end == -1) 
+                end= document.cookie.length; 
+            valCookie= unescape(document.cookie.substring(pos,end)) 
+        }
+    } 
+    return valCookie; 
+} 
+
+function fLang() {
+    var langBrowser = '';
+    // Search the language according to the browser
+    if(getCookie('lang')=='' || getCookie('lang')==undefined){
+        if (navigator.languages==undefined) {
+            if (navigator.language==undefined) {
+                // Internet Explorer Compatibility
+                langBrowser= navigator.userLanguage.slice(0,2);
+            } else {
+                // Old navigator compatibility
+                langBrowser= navigator.language.slice(0,2);
+            }
+        } else { 
+            // Recent navigators
+            langBrowser= navigator.languages[0].slice(0,2);                                
+        }
+    }else{
+        langBrowser = getCookie('lang');
+    }
+    return langBrowser;
+}
+var gt = new Gettext({ 'domain' : 'messages' });//gt = new Gettext({ 'domain' : 'messages' });
+function _(msgid) {
+    return gt.gettext(msgid);
+}
\ No newline at end of file
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index c22188b554ace1a87193de699a6c56a40bc7d963..e87da099020dd5401070c1165a4b284b561b5dad 100644
GIT binary patch
delta 10801
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

delta 9342
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 9a1e0a1..9a29f8c 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-22 10:29+0100\n"
-"PO-Revision-Date: 2015-04-22 10:29+0100\n"
+"POT-Creation-Date: 2015-04-23 12:01+0100\n"
+"PO-Revision-Date: 2015-04-23 12:04+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -1310,7 +1310,7 @@ msgstr "Il y a un doublon "
 msgid " exists."
 msgstr " existant."
 
-#: index.php:26 templates/header.php:111
+#: index.php:26 templates/header.php:112
 msgid "Home"
 msgstr "Accueil"
 
@@ -1376,7 +1376,7 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: queue.php:22 queue.php:40 templates/header.php:113
+#: queue.php:22 queue.php:40 templates/header.php:114
 msgid "My Queue"
 msgstr "Ma liste"
 
@@ -1524,7 +1524,7 @@ msgstr "URL:"
 msgid "Additional Cataloging Notes"
 msgstr "Notes additionales du catalogue"
 
-#: templates/header.php:71
+#: templates/header.php:72
 msgid ""
 "JavaScript must be enabled in order for you to use CORAL. However, it seems "
 "JavaScript is either disabled or not supported by your browser. To use "
@@ -1535,35 +1535,35 @@ msgstr ""
 "utiliser CORAL, activez JavaScript en modifiant la configuration de votre "
 "navigateur, après "
 
-#: templates/header.php:71
+#: templates/header.php:72
 msgid "try again"
 msgstr "réessayez"
 
-#: templates/header.php:90
+#: templates/header.php:91
 msgid "Hello, "
 msgstr "Bonjour, "
 
-#: templates/header.php:100
+#: templates/header.php:101
 msgid "logout"
 msgstr "Se déconnecter"
 
-#: templates/header.php:112
+#: templates/header.php:113
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
-#: templates/header.php:114
+#: templates/header.php:115
 msgid "Admin"
 msgstr "Administrateur"
 
-#: templates/header.php:130
+#: templates/header.php:131
 msgid "Change Module"
 msgstr "Changer le module"
 
-#: templates/header.php:160 templates/header.php:161
+#: templates/header.php:161 templates/header.php:162
 msgid "French"
 msgstr "Français"
 
-#: templates/header.php:160 templates/header.php:161
+#: templates/header.php:161 templates/header.php:162
 msgid "English"
 msgstr "Anglais"
 
@@ -1603,11 +1603,11 @@ msgstr "Voulez-vous vraiment effacer cette configuration d'alerte?"
 msgid "Do you really want to delete this currency?"
 msgstr "Voulez-vous vraiment supprimer cette devise?"
 
-#: js/common.js:113
+#: js/common.js:73
 msgid "No match!"
 msgstr "Pas des coincidences!"
 
-#: js/common.js:113
+#: js/common.js:73
 msgid "Selected: "
 msgstr "Sélectionné: "
 
@@ -1766,6 +1766,178 @@ msgstr ""
 msgid "Processing..."
 msgstr "En traitement..."
 
+#: js/plugins/date.js:30
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: js/plugins/date.js:30
+msgid "Monday"
+msgstr "Lundi"
+
+#: js/plugins/date.js:30
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: js/plugins/date.js:30
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: js/plugins/date.js:30
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: js/plugins/date.js:30
+msgid "Friday"
+msgstr "Vendredi"
+
+#: js/plugins/date.js:30
+msgid "Saturday"
+msgstr "Samedi"
+
+#: js/plugins/date.js:42
+msgid "Sun"
+msgstr "Dim"
+
+#: js/plugins/date.js:42
+msgid "Mon"
+msgstr "Lun"
+
+#: js/plugins/date.js:42
+msgid "Tue"
+msgstr "Mar"
+
+#: js/plugins/date.js:42
+msgid "Wed"
+msgstr "Mer"
+
+#: js/plugins/date.js:42
+msgid "Thu"
+msgstr "Jeu"
+
+#: js/plugins/date.js:42
+msgid "Fri"
+msgstr "Ven"
+
+#: js/plugins/date.js:42
+msgid "Sat"
+msgstr "Sam"
+
+#: js/plugins/date.js:54
+msgid "January"
+msgstr "Janvier"
+
+#: js/plugins/date.js:54
+msgid "February"
+msgstr "Février"
+
+#: js/plugins/date.js:54
+msgid "March"
+msgstr "Mars"
+
+#: js/plugins/date.js:54
+msgid "April"
+msgstr "Avril"
+
+#: js/plugins/date.js:54 js/plugins/date.js:66
+msgid "May"
+msgstr "Mai"
+
+#: js/plugins/date.js:54
+msgid "June"
+msgstr "Juin"
+
+#: js/plugins/date.js:54
+msgid "July"
+msgstr "Juillet"
+
+#: js/plugins/date.js:54
+msgid "August"
+msgstr "Août"
+
+#: js/plugins/date.js:54
+msgid "September"
+msgstr "Septembre"
+
+#: js/plugins/date.js:54
+msgid "October"
+msgstr "Octobre"
+
+#: js/plugins/date.js:54
+msgid "November"
+msgstr "Novembre"
+
+#: js/plugins/date.js:54
+msgid "December"
+msgstr "Décembre"
+
+#: js/plugins/date.js:66
+msgid "Jan"
+msgstr "Jan"
+
+#: js/plugins/date.js:66
+msgid "Feb"
+msgstr "Fév"
+
+#: js/plugins/date.js:66
+msgid "Mar"
+msgstr "Mar"
+
+#: js/plugins/date.js:66
+msgid "Apr"
+msgstr "Avr"
+
+#: js/plugins/date.js:66
+msgid "Jun"
+msgstr "Jui"
+
+#: js/plugins/date.js:66
+msgid "Jul"
+msgstr "Juil"
+
+#: js/plugins/date.js:66
+msgid "Aug"
+msgstr "Aoû"
+
+#: js/plugins/date.js:66
+msgid "Sep"
+msgstr "Sep"
+
+#: js/plugins/date.js:66
+msgid "Oct"
+msgstr "Oct"
+
+#: js/plugins/date.js:66
+msgid "Nov"
+msgstr "Nov"
+
+#: js/plugins/date.js:66
+msgid "Dec"
+msgstr "Déc"
+
+#: js/plugins/jquery.datePicker.js:1129
+msgid "Previous year"
+msgstr "Année précédente"
+
+#: js/plugins/jquery.datePicker.js:1130
+msgid "Previous month"
+msgstr "Mois précédent"
+
+#: js/plugins/jquery.datePicker.js:1131
+msgid "Next year"
+msgstr "Année suivante"
+
+#: js/plugins/jquery.datePicker.js:1132
+msgid "Next month"
+msgstr "Mois suivant"
+
+#: js/plugins/jquery.datePicker.js:1133
+msgid "Close"
+msgstr "Fermer"
+
+#: js/plugins/jquery.datePicker.js:1134
+msgid "Choose date"
+msgstr "Choissir la date"
+
 #: js/queue.js:55 js/queue.js:89 js/queue.js:123 js/queue.js:155
 msgid "Refreshing..."
 msgstr "Rechargement..."
diff --git a/templates/header.php b/templates/header.php
index 832060d..3337c1e 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -49,8 +49,6 @@
 <script type="text/javascript" src="js/plugins/jquery.js"></script>
 <script type="text/javascript" src="js/plugins/ajaxupload.3.5.js"></script>
 <script type="text/javascript" src="js/plugins/thickbox.js"></script>
-<script type="text/javascript" src="js/plugins/date.js"></script>
-<script type="text/javascript" src="js/plugins/jquery.datePicker.js"></script>
 <script type="text/javascript" src="js/plugins/jquery.autocomplete.js"></script>
 <script type="text/javascript" src="js/plugins/Gettext.js"></script>
 <?php
@@ -65,6 +63,9 @@
         }
     } 
 ?>
+<script type="text/javascript" src="js/plugins/translate.js"></script>
+<script type="text/javascript" src="js/plugins/date.js"></script>
+<script type="text/javascript" src="js/plugins/jquery.datePicker.js"></script>
 <script type="text/javascript" src="js/common.js"></script>
 </head>
 <body>

From 06fce6bf25923c99b4609116fe559b01ce9faf27 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Mon, 27 Apr 2015 16:18:13 +0200
Subject: [PATCH 019/159] Translated default data in the database and
 translations updated

---
 install/install.php                  |  48 +-
 install/protected/data/data_en.sql   | 639 +++++++++++++++++++++++
 install/protected/data/data_fr.sql   | 640 +++++++++++++++++++++++
 install/protected/install.sql        | 749 ++-------------------------
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 31228 -> 31389 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  12 +-
 resources/cataloging.php             |   4 +-
 7 files changed, 1389 insertions(+), 703 deletions(-)
 create mode 100644 install/protected/data/data_en.sql
 create mode 100644 install/protected/data/data_fr.sql

diff --git a/install/install.php b/install/install.php
index 1324fa8..b0c18eb 100644
--- a/install/install.php
+++ b/install/install.php
@@ -21,6 +21,7 @@
 	$database_username = trim($_POST['database_username']);
 	$database_password = trim($_POST['database_password']);
 	$database_name = trim($_POST['database_name']);
+    $database_lang = trim($_POST['lang_db']);
 
 	if (!$database_host) $errorMessage[] = 'Host name is required';
 	if (!$database_name) $errorMessage[] = 'Database name is required';
@@ -52,14 +53,18 @@
 					$errorMessage[] = "Please verify your database user has access to select from the information_schema MySQL metadata database.";
 				}else{
 					if ($row['count'] > 0){
-						$errorMessage[] = "The Resource tables already exist.  If you intend to upgrade, please run upgrade.php instead.  If you would like to perform a fresh install you will need to manually drop all of the Resource tables in this schema first.";
+						$errorMessage[] = "The Resource tables already exist.  If you intend to upgrade, please run update.php instead.  If you would like to perform a fresh install you will need to manually drop all of the Resource tables in this schema first.";
 					}else{
 
 						//passed db host, name check, can open/run file now
 						//make sure SQL file exists
 						$test_sql_file = "protected/test_create.sql";
-						$sql_file = "protected/install.sql";
-
+                        $sql_file = "protected/install.sql";
+                        $sql_data = "protected/data/data_".$database_lang.".sql";
+                        
+                        // Assign the charset to specials chars
+                        mysql_query("SET NAMES 'utf8'");
+                        
 						if (!file_exists($test_sql_file)) {
 							$errorMessage[] = "Could not open sql file: " . $test_sql_file . ".  If this file does not exist you must download new install files.";
 						}else{
@@ -115,6 +120,34 @@
 
 							}
 						}
+                        
+                        // Insert data according the language selected
+                        if (count($errorMessage) == 0){
+							if (!file_exists($sql_data)) {
+								$errorMessage[] = "Could not open sql file: " . $sql_data . ".  If this file does not exist you must download new install files.";
+							}else{
+								//run the file - checking for errors at each SQL execution
+								$f = fopen($sql_data,"r");
+								$sqlFile = fread($f,filesize($sql_data));
+								$sqlArray = explode(';',$sqlFile);
+
+								//Process the sql file by statements
+								foreach ($sqlArray as $stmt) {
+								   if (strlen(trim($stmt))>3){
+										//replace the DATABASE_NAME parameter with what was actually input
+										$stmt = str_replace("_DATABASE_NAME_", $database_name, $stmt);
+
+										$result = mysql_query($stmt);
+										if (!$result){
+											$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
+											 break;
+										}
+									}
+								}
+
+							}
+						} // end if(count($errorMessage) == 0)
+                        
 					}
 				}
 			}
@@ -501,6 +534,15 @@
 					<input type="password" name="database_password" size="30" value="<?php echo $database_password?>">
 				</td>
 			</tr>
+			<tr>
+			    <td>&nbsp;Data language</td>
+			    <td>
+			        <select name="lang_db" id="lang_db">
+			            <option value="en">English</option>
+			            <option value="fr">French</option>
+			        </select>
+			    </td>
+			</tr>
 			<tr>
 				<td colspan=2>&nbsp;</td>
 			</tr>
diff --git a/install/protected/data/data_en.sql b/install/protected/data/data_en.sql
new file mode 100644
index 0000000..ca311d0
--- /dev/null
+++ b/install/protected/data/data_en.sql
@@ -0,0 +1,639 @@
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Standalone CD');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('External Host');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Local Host');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Paid');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Free');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Trial');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Main Library');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abbreviation');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Alternate Name');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Name Change');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('User Guide');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Title List');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('General');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('IP Address');
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Username');
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Referring URL');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Main Campus');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Batch');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Completed');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'Ongoing');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejected');
+
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Support');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Accounting');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('General');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licensing');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Sales');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Training');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
+
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistics');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Support');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Pending');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completed');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('No License Required');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Product Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Acquisition Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Access Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('General');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Licensing Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Initial Note');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Ongoing');
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('One Time');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Library");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Platform");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Provider");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Publisher");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendor");
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('add/edit');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('view only');
+
+
+INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Main Library');
+
+
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Print + Electronic');
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronic');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('In Progress');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completed');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Saved');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archived');
+
+
+INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Reserve Book Room');
+
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (1, '2', '','1');
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (2, '2', '','2');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Access');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licensing');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Funding Approval');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Receipt');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (1, NULL, 'Funding Approval', 3, 1, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (2, NULL, 'Licensing', 2, 1, 2);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (3, 2, 'Order Processing', 4, 1, 3);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (4, 3, 'Activation', 1, 1, 4);
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (5, NULL, 'Licensing', 2, 2, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (6, NULL, 'Activation', 1, 2, 2);
diff --git a/install/protected/data/data_fr.sql b/install/protected/data/data_fr.sql
new file mode 100644
index 0000000..33f0319
--- /dev/null
+++ b/install/protected/data/data_fr.sql
@@ -0,0 +1,640 @@
+ 
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('CD Autonome');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Hôte externe');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Hôte local');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Payant');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Gratuit');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Démonstration');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Bibliothèque Unique');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abréviation');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Nom alternative');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Nom Change');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ("Guide d'Utilisateur");
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Liste des titres');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Géneral');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Adress IP');
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ("Nom d'utilisateur");
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('URL de Réference');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Campus Unique');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Lot');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Terminé');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'En cours');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejeté');
+
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Soutien');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Comptabilité');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Géneral');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licence');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Ventes');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Formation');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
+
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistiques');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Soutien');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('En suspens');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completé');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Aucune Licence requise');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails du Produit');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails Acquisition');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails Accès');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Géneral');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails de la Licence');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Note Initial');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('En cours');
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Une fois');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Bibliothèque");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Plate-forme");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Fornisseur");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Éditeur");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendeur");
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('ajouter/modifier');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('regarder seulement');
+
+
+INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Bibliothèque Unique');
+
+
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Imprimible + Electronique');
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronique');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('En Cours');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completé');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Enregistré');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archivé');
+
+
+INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Chambre des réserves des livres');
+
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (1, '2', '','1');
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (2, '2', '','2');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Accès');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licence');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Approbation du Financement');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Reçu');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (1, NULL, 'Approbation du financement', 3, 1, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (2, NULL, 'Licence', 2, 1, 2);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (3, 2, 'Process du commande', 4, 1, 3);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (4, 3, 'Activation', 1, 1, 4);
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (5, NULL, 'Licence', 2, 2, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (6, NULL, 'Activation', 1, 2, 2);
\ No newline at end of file
diff --git a/install/protected/install.sql b/install/protected/install.sql
index 0accd00..fd08dc6 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -3,7 +3,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AccessMethod` (
   `accessMethodID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`accessMethodID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AcquisitionType`;
@@ -12,7 +12,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AcquisitionType` (
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`acquisitionTypeID`),
   UNIQUE KEY `acquisitionTypeID` (`acquisitionTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AdministeringSite`;
@@ -20,7 +20,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AdministeringSite` (
   `administeringSiteID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`administeringSiteID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AlertDaysInAdvance`;
@@ -28,7 +28,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AlertDaysInAdvance` (
   `alertDaysInAdvanceID` int(11) NOT NULL auto_increment,
   `daysInAdvanceNumber` int(11) default NULL,
   PRIMARY KEY  (`alertDaysInAdvanceID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AlertEmailAddress`;
@@ -36,7 +36,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AlertEmailAddress` (
   `alertEmailAddressID` int(11) NOT NULL auto_increment,
   `emailAddress` varchar(200) default NULL,
   PRIMARY KEY  (`alertEmailAddressID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -47,7 +47,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Alias` (
   `aliasTypeID` int(11) default NULL,
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`aliasID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AliasType`;
@@ -56,7 +56,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AliasType` (
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`aliasTypeID`),
   UNIQUE KEY `aliasTypeID` (`aliasTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Attachment`;
@@ -68,7 +68,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Attachment` (
   `descriptionText` text,
   `attachmentURL` varchar(200) default NULL,
   PRIMARY KEY  (`attachmentID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AttachmentType`;
@@ -76,7 +76,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AttachmentType` (
   `attachmentTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`attachmentTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -85,7 +85,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`AuthenticationType` (
   `authenticationTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  USING BTREE (`authenticationTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`AuthorizedSite`;
@@ -93,21 +93,21 @@ CREATE TABLE  `_DATABASE_NAME_`.`AuthorizedSite` (
   `authorizedSiteID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`authorizedSiteID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`CatalogingType`;
 CREATE TABLE  `_DATABASE_NAME_`.`CatalogingType` (
   `catalogingTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`catalogingTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`CatalogingStatus`;
 CREATE TABLE  `_DATABASE_NAME_`.`CatalogingStatus` (
   `catalogingStatusID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`catalogingStatusID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Contact`;
 CREATE TABLE  `_DATABASE_NAME_`.`Contact` (
@@ -125,7 +125,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Contact` (
   `noteText` text,
   PRIMARY KEY  (`contactID`),
   UNIQUE KEY `contactID` (`contactID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -134,7 +134,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ContactRole` (
   `contactRoleID` int(11) NOT NULL auto_increment,
   `shortName` varchar(50) default NULL,
   PRIMARY KEY  (`contactRoleID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`ContactRoleProfile`;
@@ -142,7 +142,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ContactRoleProfile` (
   `contactID` int(10) unsigned NOT NULL,
   `contactRoleID` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`contactID`,`contactRoleID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Currency`;
@@ -151,7 +151,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Currency` (
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`currencyCode`),
   UNIQUE KEY `currencyCode` (`currencyCode`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`ExternalLogin`;
@@ -167,7 +167,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ExternalLogin` (
   `noteText` text,
   PRIMARY KEY  (`externalLoginID`),
   UNIQUE KEY `externalLoginID` (`externalLoginID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -177,7 +177,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ExternalLoginType` (
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`externalLoginTypeID`),
   UNIQUE KEY `externalLoginTypeID` (`externalLoginTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -187,7 +187,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`LicenseStatus` (
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`licenseStatusID`),
   UNIQUE KEY `licenseStatusID` (`licenseStatusID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -196,7 +196,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`NoteType` (
   `noteTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`noteTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`OrderType`;
@@ -204,7 +204,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`OrderType` (
   `orderTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`orderTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -213,7 +213,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Organization` (
   `organizationID` int(10) unsigned NOT NULL auto_increment,
   `shortName` tinytext NOT NULL,
   PRIMARY KEY  USING BTREE (`organizationID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`OrganizationRole`;
@@ -222,7 +222,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`OrganizationRole` (
   `shortName` varchar(50) default NULL,
   PRIMARY KEY  (`organizationRoleID`),
   UNIQUE KEY `organizationRoleID` (`organizationRoleID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -231,7 +231,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Privilege` (
   `privilegeID` int(10) unsigned NOT NULL auto_increment,
   `shortName` varchar(50) default NULL,
   PRIMARY KEY  USING BTREE (`privilegeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -240,7 +240,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`PurchaseSite` (
   `purchaseSiteID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`purchaseSiteID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -249,7 +249,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`RelationshipType` (
   `relationshipTypeID` int(11) NOT NULL auto_increment,
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`relationshipTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Resource`;
@@ -294,7 +294,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Resource` (
   `coverageText` VARCHAR(1000) NULL DEFAULT NULL,
   `resourceAltURL` VARCHAR(2000) NULL DEFAULT NULL,
   PRIMARY KEY  (`resourceID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -304,7 +304,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceAdministeringSiteLink` (
   `resourceID` int(11) default NULL,
   `administeringSiteID` int(11) default NULL,
   PRIMARY KEY  (`resourceAdministeringSiteLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -317,7 +317,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceAlert` (
   `sendDate` date default NULL,
   `alertText` text,
   PRIMARY KEY  (`resourceAlertID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -327,7 +327,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceAuthorizedSiteLink` (
   `resourceID` int(11) default NULL,
   `authorizedSiteID` int(11) default NULL,
   PRIMARY KEY  (`resourceAuthorizedSiteLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -337,7 +337,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceFormat` (
   `resourceFormatID` int(11) NOT NULL auto_increment,
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  USING BTREE (`resourceFormatID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -347,7 +347,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceLicenseLink` (
   `resourceID` int(11) default NULL,
   `licenseID` int(11) default NULL,
   PRIMARY KEY  (`resourceLicenseLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -359,7 +359,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceLicenseStatus` (
   `licenseStatusChangeDate` datetime default NULL,
   `licenseStatusChangeLoginID` varchar(45) default NULL,
   PRIMARY KEY  (`resourceLicenseStatusID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -373,7 +373,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceNote` (
   `updateLoginID` varchar(45) default NULL,
   `noteText` text,
   PRIMARY KEY  (`resourceNoteID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`ResourceOrganizationLink`;
@@ -383,7 +383,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceOrganizationLink` (
   `organizationID` int(11) default NULL,
   `organizationRoleID` int(11) default NULL,
   PRIMARY KEY  (`resourceOrganizationLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -397,7 +397,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourcePayment` (
   `orderTypeID` int(10) unsigned default NULL,
   `currencyCode` varchar(3) NOT NULL,
   PRIMARY KEY  (`resourcePaymentID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -407,7 +407,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourcePurchaseSiteLink` (
   `resourceID` int(11) default NULL,
   `purchaseSiteID` int(11) default NULL,
   PRIMARY KEY  (`resourcePurchaseSiteLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -418,7 +418,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceRelationship` (
   `relatedResourceID` int(11) default NULL,
   `relationshipTypeID` int(11) default NULL,
   PRIMARY KEY  (`resourceRelationshipID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -435,7 +435,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceStep` (
   `userGroupID` int(11) default NULL,
   `displayOrderSequence` int(10) unsigned default NULL,
   PRIMARY KEY  (`resourceStepID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`ResourceType`;
@@ -444,7 +444,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`ResourceType` (
   `shortName` varchar(200) default NULL,
   `includeStats` boolean default NULL,
   PRIMARY KEY  (`resourceTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -454,7 +454,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Status` (
   `statusID` int(11) NOT NULL auto_increment,
   `shortName` varchar(200) default NULL,
   PRIMARY KEY  (`statusID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -467,7 +467,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Step` (
   `workflowID` int(11) default NULL,
   `displayOrderSequence` int(10) unsigned default NULL,
   PRIMARY KEY  (`stepID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`StorageLocation`;
@@ -475,7 +475,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`StorageLocation` (
   `storageLocationID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`storageLocationID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -488,7 +488,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`User` (
   `accountTabIndicator` int(1) unsigned default '0',
   `emailAddress` varchar(200) default NULL,
   PRIMARY KEY  (`loginID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
 
@@ -499,7 +499,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`UserGroup` (
   `emailAddress` varchar(200) default NULL,
   `emailText` varchar(2000) default NULL,
   PRIMARY KEY  (`userGroupID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -509,7 +509,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`UserGroupLink` (
   `loginID` varchar(200) default NULL,
   `userGroupID` int(11) default NULL,
   PRIMARY KEY  (`userGroupLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 
@@ -519,7 +519,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`UserLimit` (
   `userLimitID` int(11) NOT NULL auto_increment,
   `shortName` varchar(45) default NULL,
   PRIMARY KEY  (`userLimitID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Workflow`;
@@ -530,7 +530,7 @@ CREATE TABLE  `_DATABASE_NAME_`.`Workflow` (
   `resourceTypeIDValue` varchar(45) default NULL,
   `acquisitionTypeIDValue` varchar(45) default NULL,
   PRIMARY KEY  (`workflowID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`GeneralSubject`;
@@ -538,7 +538,7 @@ CREATE TABLE `_DATABASE_NAME_`.`GeneralSubject` (
   `generalSubjectID` int(11) NOT NULL AUTO_INCREMENT,
   `shortName` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`generalSubjectID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`DetailedSubject`;
@@ -546,7 +546,7 @@ CREATE TABLE `_DATABASE_NAME_`.`DetailedSubject` (
   `detailedSubjectID` int(11) NOT NULL AUTO_INCREMENT,
   `shortName` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`detailedSubjectID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`GeneralDetailSubjectLink`;
@@ -555,7 +555,7 @@ CREATE TABLE `_DATABASE_NAME_`.`GeneralDetailSubjectLink` (
   `generalSubjectID` int(11) DEFAULT NULL,
   `detailedSubjectID` int(11) DEFAULT NULL,
   PRIMARY KEY (`generalDetailSubjectLinkID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`ResourceSubject`;
@@ -564,7 +564,7 @@ CREATE TABLE `_DATABASE_NAME_`.`ResourceSubject` (
   `resourceID` int(11) DEFAULT NULL,
   `generalDetailSubjectLinkID` int(11) DEFAULT NULL,
   PRIMARY KEY (`resourceSubjectID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 
 ALTER TABLE `_DATABASE_NAME_`.`Alias` ADD INDEX `Index_resourceID`(`resourceID`),
@@ -642,646 +642,3 @@ ALTER TABLE `_DATABASE_NAME_`.`ResourceSubject` ADD INDEX `resourceSubjectID` (
  ADD INDEX `Index_All` (`resourceID` ASC, `generalDetailSubjectLinkID` ASC), 
  ADD INDEX `Index_ResourceID` (`resourceID` ASC), 
  ADD INDEX `Index_GeneralDetailLink` (`generalDetailSubjectLinkID` ASC) ;
- 
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Standalone CD');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('External Host');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Local Host');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Paid');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Free');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Trial');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Main Library');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abbreviation');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Alternate Name');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Name Change');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('User Guide');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Title List');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('General');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('IP Address');
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Username');
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Referring URL');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Main Campus');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Batch');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Completed');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'Ongoing');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejected');
-
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Support');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Accounting');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('General');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licensing');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Sales');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Training');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
-
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistics');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Support');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Pending');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completed');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('No License Required');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Product Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Acquisition Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Access Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('General');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Licensing Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Initial Note');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Ongoing');
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('One Time');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Library");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Platform");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Provider");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Publisher");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendor");
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('add/edit');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('view only');
-
-
-INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Main Library');
-
-
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Print + Electronic');
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronic');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('In Progress');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completed');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Saved');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archived');
-
-
-INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Reserve Book Room');
-
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (1, '2', '','1');
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (2, '2', '','2');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Access');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licensing');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Funding Approval');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Receipt');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (1, NULL, 'Funding Approval', 3, 1, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (2, NULL, 'Licensing', 2, 1, 2);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (3, 2, 'Order Processing', 4, 1, 3);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (4, 3, 'Activation', 1, 1, 4);
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (5, NULL, 'Licensing', 2, 2, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (6, NULL, 'Activation', 1, 2, 2);
-
-
-
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e87da099020dd5401070c1165a4b284b561b5dad..6f8e9dc46b33a67b505c02a7d8ce666f00d84f60 100644
GIT binary patch
delta 9722
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

delta 9595
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 9a29f8c..cdb722a 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-23 12:01+0100\n"
-"PO-Revision-Date: 2015-04-23 12:04+0100\n"
+"POT-Creation-Date: 2015-04-27 15:49+0100\n"
+"PO-Revision-Date: 2015-04-27 15:49+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -1412,10 +1412,18 @@ msgstr "Type de catalogage:"
 msgid "Cataloging Status:"
 msgstr "Statut de catalogage:"
 
+#: resources/cataloging.php:141
+msgid "Number of Records Available"
+msgstr "Nombre des enregistrements disponibles"
+
 #: resources/cataloging.php:142 summary.php:757
 msgid "# Records Available:"
 msgstr "# Enregistrements disponibles"
 
+#: resources/cataloging.php:147
+msgid "Number of Records Loaded"
+msgstr "Nombre des enregistrements chargées"
+
 #: resources/cataloging.php:148 summary.php:763
 msgid "# Records Loaded:"
 msgstr "# Enregistrements chargées"
diff --git a/resources/cataloging.php b/resources/cataloging.php
index e96db1a..de38858 100644
--- a/resources/cataloging.php
+++ b/resources/cataloging.php
@@ -138,13 +138,13 @@
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsAvailable) { ?>
-  	<tr title="Number of Records Available">
+  	<tr title="<?= _("Number of Records Available");?>">
     	<td style='vertical-align:top;width:130px;'><?= _("# Records Available:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsAvailable ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsLoaded) { ?>
-  	<tr title="Number of Records Loaded">
+  	<tr title="<?= _("Number of Records Loaded");?>">
     	<td style='vertical-align:top;width:130px;'><?= _("# Records Loaded:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsLoaded ?></td>
   	</tr>

From fd319d06d7d87db32e1d7cbf5befc8f643841203 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Thu, 30 Apr 2015 17:35:48 +0200
Subject: [PATCH 020/159] Translate of update started

---
 ajax_forms/getAccessForm.php              | 26 +++++++++++------------
 ajax_forms/getAccountForm.php             | 18 ++++++++--------
 ajax_forms/getAdminAlertDaysForm.php      |  6 +++---
 ajax_forms/getAdminAlertEmailForm.php     |  6 +++---
 ajax_forms/getAdminCurrencyUpdateForm.php | 10 ++++-----
 ajax_forms/getAdminUpdateForm.php         |  8 +++----
 ajax_forms/getAdminUserGroupForm.php      | 18 ++++++++--------
 ajax_forms/getAdminUserUpdateForm.php     | 18 ++++++++--------
 ajax_forms/getAdminWorkflowForm.php       | 26 +++++++++++------------
 ajax_forms/getAttachmentForm.php          | 16 +++++++-------
 ajax_forms/getContactForm.php             | 26 +++++++++++------------
 11 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/ajax_forms/getAccessForm.php b/ajax_forms/getAccessForm.php
index b5fed50..24c0406 100644
--- a/ajax_forms/getAccessForm.php
+++ b/ajax_forms/getAccessForm.php
@@ -56,7 +56,7 @@
 		<form id='accessForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'>Edit Access</span></div>
+		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Access");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -65,14 +65,14 @@
 		<td style='vertical-align:top;' colspan='2'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b>Access</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?= _("Access");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:610px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:570px; margin:15px 20px 10px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'>Authentication Type:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'><?= _("Authentication Type:");?></label></td>
 					<td>
 						<select name='authenticationTypeID' id='authenticationTypeID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -87,11 +87,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'>Username:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'><?= _("Username:");?></label></td>
 					<td><input type='text' id='authenticationUserName' name='authenticationUserName' value = '<?php echo $resource->authenticationUserName; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'>Access Method:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'><?= _("Access Method:");?></label></td>
 					<td>
 						<select name='accessMethodID' id='accessMethodID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -106,11 +106,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'>Password:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'><?= _("Password:");?></label></td>
 					<td><input type='text' id='authenticationPassword' name='authenticationPassword' value = '<?php echo $resource->authenticationPassword; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'>Storage Location:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'><?= _("Storage Location:");?></label></td>
 					<td>
 						<select name='storageLocationID' id='storageLocationID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -125,7 +125,7 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'>Simultaneous User Limit:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'><?= _("Simultaneous User Limit:");?></label></td>
 					<td>
 						<select name='userLimitID' id='userLimitID' style='width:100px;' class='changeSelect' >
 						<option value=''></option>
@@ -142,7 +142,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'>Coverage:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'><?= _("Coverage:");?></label></td>
 					<td colspan='3'>
 						<input type='text' id='coverageText' name='coverageText' value = "<?php echo $resource->coverageText; ?>" style='width:405px;' class='changeInput'  />
 					</td>
@@ -160,7 +160,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b>Authorized Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Authorized Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -205,7 +205,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b>Administering Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Administering Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -248,8 +248,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitAccessChanges' id ='submitAccessChanges'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAccessChanges' id ='submitAccessChanges'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAccountForm.php b/ajax_forms/getAccountForm.php
index 0dda8fe..e09317c 100644
--- a/ajax_forms/getAccountForm.php
+++ b/ajax_forms/getAccountForm.php
@@ -14,7 +14,7 @@
 		<input type='hidden' name='editExternalLoginID' id='editExternalLoginID' value='<?php echo $externalLoginID; ?>'>
 
 
-		<div class='formTitle' style='width:385px;'><span class='headerText' style='margin-left:7px;'><?php if ($externalLoginID){ echo "Edit Account"; } else { echo "Add Account"; } ?></span></div>
+		<div class='formTitle' style='width:385px;'><span class='headerText' style='margin-left:7px;'><?php if ($externalLoginID){ echo _("Edit Account"); } else { echo _("Add Account"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -24,7 +24,7 @@
 
 			<table class='noBorder' style='width:350px; margin:10px 15px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b>Login Type:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b><?= _("Login Type:");?></b></label></td>
 				<td>
 				<select name='externalLoginTypeID' id='externalLoginTypeID' class='changeSelect'>
 				<?php
@@ -41,35 +41,35 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='loginURL'><b>URL:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='loginURL'><b><?= _("URL:");?></b></label></td>
 				<td>
 				<input type='text' id='loginURL' name='loginURL' value = '<?php echo $externalLogin->loginURL; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b>Registered Email:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Registered Email:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $externalLogin->emailAddress; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='username'><b>Username:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='username'><b><?= _("Username:");?></b></label></td>
 				<td>
 				<input type='text' id='username' name='username' value = '<?php echo $externalLogin->username; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='password'><b>Password:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='password'><b><?= _("Password:");?></b></label></td>
 				<td>
 				<input type='text' id='password' name='password' value = '<?php echo $externalLogin->password; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='noteText'><b>Notes:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='noteText'><b><?= _("Notes:");?></b></label></td>
 				<td><textarea rows='3' id='noteText' name='noteText' style='width:200px'><?php echo $externalLogin->noteText; ?></textarea></td>
 				</td>
 				</tr>
@@ -83,8 +83,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminAlertDaysForm.php b/ajax_forms/getAdminAlertDaysForm.php
index 3127a32..d60c6b4 100644
--- a/ajax_forms/getAdminAlertDaysForm.php
+++ b/ajax_forms/getAdminAlertDaysForm.php
@@ -11,7 +11,7 @@
 
 		<input type='hidden' id='editAlertDaysInAdvanceID' value='<?php echo $alertDaysInAdvanceID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertDaysInAdvanceID){ echo "Edit Alert Days In Advance"; } else { echo "Add Alert Days In Advance"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertDaysInAdvanceID){ echo _("Edit Alert Days In Advance"); } else { echo _("Add Alert Days In Advance"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -31,8 +31,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminAlertEmailForm.php b/ajax_forms/getAdminAlertEmailForm.php
index f98570e..844bfde 100644
--- a/ajax_forms/getAdminAlertEmailForm.php
+++ b/ajax_forms/getAdminAlertEmailForm.php
@@ -11,7 +11,7 @@
 
 		<input type='hidden' id='editAlertEmailAddressID' value='<?php echo $alertEmailAddressID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertEmailAddressID){ echo "Edit Alert Email Address"; } else { echo "Add Alert Email Address"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($alertEmailAddressID){ echo _("Edit Alert Email Address"); } else { echo _("Add Alert Email Address"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -31,8 +31,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminCurrencyUpdateForm.php b/ajax_forms/getAdminCurrencyUpdateForm.php
index 8e02eae..136350e 100644
--- a/ajax_forms/getAdminCurrencyUpdateForm.php
+++ b/ajax_forms/getAdminCurrencyUpdateForm.php
@@ -11,7 +11,7 @@
 
 		<input type='hidden' id='editCurrencyCode' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit Currency"; } else { echo "Add Currency"; } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit Currency"); } else { echo _("Add Currency"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -21,10 +21,10 @@
 
 			<table class='noBorder' style='width:200px; margin:10px;'>
 			<tr>
-			<td>Code</td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
+			<td><?= _("Code");?></td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
 			</tr>
 			<tr>
-			<td>Name</td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
+			<td><?= _("Name");?></td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
 			</tr>
 			</table>
 
@@ -35,8 +35,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUpdateForm.php b/ajax_forms/getAdminUpdateForm.php
index a07c734..856ef8f 100644
--- a/ajax_forms/getAdminUpdateForm.php
+++ b/ajax_forms/getAdminUpdateForm.php
@@ -13,7 +13,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -28,7 +28,7 @@
 			<?php
 				if($className == 'ResourceType' && ($config->settings->usageModule == 'Y')){
 					if($instance->includeStats == 1){$stats = 'checked';}else{$stats='';}
-					echo "<tr><td><label for='stats'>Show stats button?</label>";
+					echo "<tr><td><label for='stats'>"._("Show stats button?")."</label>";
 					echo "<input type='checkbox' id='stats' ".$stats." /></td></tr>";
 				}
 			?>
@@ -41,8 +41,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUserGroupForm.php b/ajax_forms/getAdminUserGroupForm.php
index d2658bd..7ae9487 100644
--- a/ajax_forms/getAdminUserGroupForm.php
+++ b/ajax_forms/getAdminUserGroupForm.php
@@ -14,7 +14,7 @@
 		<form id='userGroupForm'>
 		<input type='hidden' name='editUserGroupID' id='editUserGroupID' value='<?php echo $userGroupID; ?>'>
 
-		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php if ($userGroupID){ echo "Edit User Group"; } else { echo "Add User Group"; } ?></span></div>
+		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php if ($userGroupID){ echo _("Edit User Group"); } else { echo _("Add User Group"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -23,7 +23,7 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>User Group</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("User Group");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -31,14 +31,14 @@
 
 				<table class='noBorder' style='width:235px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b>Group Name:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b><?= _("Group Name:");?></b></label></td>
 				<td>
 				<input type='text' id='groupName' name='groupName' value = '<?php echo $userGroup->groupName; ?>' style='width:110px' class='changeInput' /><span id='span_error_groupName' class='smallDarkRedText'></span>
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b>Email Address:</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Email Address:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $userGroup->emailAddress; ?>' style='width:110px' class='changeInput' />
 				</td>
@@ -55,7 +55,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b>Assigned Users</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b><?= _("Assigned Users");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -79,7 +79,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt='add user' title='add user'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt="<?= _("add user");?>" title="<?= _("add user");?>"></a>
 				</td>
 				</tr>
 				</table>
@@ -118,7 +118,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove user from group' title='remove user from group' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt="<?= _("remove user from group");?>" title="<?= _("remove user from group");?>" class='remove' /></a>
 						</td>
 						</tr>
 					<?php
@@ -144,8 +144,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUserUpdateForm.php b/ajax_forms/getAdminUserUpdateForm.php
index b1b80db..a4a862a 100644
--- a/ajax_forms/getAdminUserUpdateForm.php
+++ b/ajax_forms/getAdminUserUpdateForm.php
@@ -18,7 +18,7 @@
 
 		<input type='hidden' id='editLoginID' value='<?php echo $loginID; ?>'>
 
-		<div class='formTitle' style='width:295px;'><span class='headerText' style='margin-left:7px;'><?php if ($loginID){ echo "Edit User"; } else { echo "Add New User"; } ?></span></div>
+		<div class='formTitle' style='width:295px;'><span class='headerText' style='margin-left:7px;'><?php if ($loginID){ echo _("Edit User"); } else { echo _("Add New User"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -29,11 +29,11 @@
 			<table class='noBorder' style='width:260px; margin:10px;'>
 
 
-				<tr><td><label for='loginID'><b>Login ID</b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
-				<tr><td><label for='firstName'><b>First Name</b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='lastName'><b>Last Name</b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='emailAddress'><b>Email Address</b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='privilegeID'><b>Privilege</b></label</td>
+				<tr><td><label for='loginID'><b><?= _("Login ID");?></b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
+				<tr><td><label for='firstName'><b><?= _("First Name");?></b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='lastName'><b><?= _("Last Name");?></b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='emailAddress'><b><?= _("Email Address");?></b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='privilegeID'><b><?= _("Privilege");?></b></label</td>
 				<td>
 				<select id='privilegeID' style='width:155px'>
 				<?php
@@ -51,7 +51,7 @@
 				</td>
 				</tr>
 
-				<tr><td><label for='accountTab'><b>View Accounts</b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
+				<tr><td><label for='accountTab'><b><?= _("View Accounts");?></b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
 
 
 			</table>
@@ -63,8 +63,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminWorkflowForm.php b/ajax_forms/getAdminWorkflowForm.php
index 86397e3..aea1434 100644
--- a/ajax_forms/getAdminWorkflowForm.php
+++ b/ajax_forms/getAdminWorkflowForm.php
@@ -39,7 +39,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editWFID' id='editWFID' value='<?php echo $workflowID; ?>'>
 
-		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'>Edit Workflow</span></div>
+		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'><?= _("Edit Workflow");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -48,14 +48,14 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>Resource Entry Requirements</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("Resource Entry Requirements");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:660px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'>Acquisition Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'><?= _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect' >
 				<?php
@@ -71,7 +71,7 @@
 				</td>
 
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'>Format:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?= _("Format:");?></label></td>
 				<td>
 				<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
 				<?php
@@ -86,7 +86,7 @@
 				</select>
 				</td>
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'>Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'><?= _("Type:");?></label></td>
 				<td>
 				<select name='resourceTypeID' id='resourceTypeID' style='width:100px;' class='changeSelect' >
 				<option value=''></option>
@@ -111,7 +111,7 @@
 			<div style='height:20px;'>&nbsp;</div>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b>Workflow Steps</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b><?= _("Workflow Steps");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
@@ -120,9 +120,9 @@
 				<table class='noBorder noMargin newStepTable' style='width:660px;  margin:15px 20px 0px 20px;'>
 				<tr>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;width:48px;'>&nbsp;</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'>Name:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'>Approval/Notification Group:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'>Parent Step</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'><?= _("Name:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'><?= _("Approval/Notification Group:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'><?= _("Parent Step");?></td>
 					<td style='vertical-align:top;text-align:center;width:40px;'>&nbsp;</td>
 				</tr>
 
@@ -152,7 +152,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:center;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt='add step' title='add step'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt="<?= _("add step");?>" title="<?= _("add step");?>"></a>
 				</td>
 
 				</tr>
@@ -235,7 +235,7 @@
 
 
 						<td style='vertical-align:top;text-align:center;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this step' title='remove this step' class='removeStep' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt="<?= _("remove this step");?>" title="<?= _("remove this step");?>" class='removeStep' /></a>
 						</td>
 
 						</tr>
@@ -263,8 +263,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAttachmentForm.php b/ajax_forms/getAttachmentForm.php
index 70df694..a6c3a3b 100644
--- a/ajax_forms/getAttachmentForm.php
+++ b/ajax_forms/getAttachmentForm.php
@@ -13,7 +13,7 @@
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 		<input type='hidden' name='editAttachmentID' id='editAttachmentID' value='<?php echo $attachmentID; ?>'>
 
-		<div class='formTitle' style='width:345px;'><span class='headerText' style='margin-left:7px;'><?php if ($attachmentID){ echo "Edit Attachment"; } else { echo "Add Attachment"; } ?></span></div>
+		<div class='formTitle' style='width:345px;'><span class='headerText' style='margin-left:7px;'><?php if ($attachmentID){ echo _("Edit Attachment"); } else { echo _("Add Attachment"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -24,7 +24,7 @@
 			<table class='noBorder' style='width:310px; margin:10px 15px;'>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b>Name:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b><?= _("Name:");?></b></label></td>
 			<td>
 			<input type='text' class='changeInput' id='shortName' name='shortName' value = '<?php echo $attachment->shortName; ?>' style='width:230px' /><span id='span_error_shortName' class='smallDarkRedText'></span>
 			</td>
@@ -32,7 +32,7 @@
 
 			<tr>
 
-			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b>Type:</b></label></td>
+			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b><?= _("Type:");?></b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 
 			<select name='attachmentTypeID' id='attachmentTypeID'>
@@ -52,13 +52,13 @@
 			</tr>
 
 			<tr>
-			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b>File:</b></label></td>
+			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b><?= _("File:");?></b></label></td>
 			<td>
 			<?php
 
 			//if editing
 			if ($attachmentID){
-				echo "<div id='div_uploadFile'>" . $attachment->attachmentURL . "<br /><a href='javascript:replaceFile();'>replace with new file</a>";
+				echo "<div id='div_uploadFile'>" . $attachment->attachmentURL . "<br /><a href='javascript:replaceFile();'>"._("replace with new file")."</a>";
 				echo "<input type='hidden' id='upload_button' name='upload_button' value='" . $attachment->attachmentURL . "'></div>";
 
 			//if adding
@@ -73,7 +73,7 @@
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b>Details:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b><?= _("Details:");?></b></label></td>
 			<td><textarea rows='5' class='changeInput' id='descriptionText' name='descriptionText' style='width:230px'><?php echo $attachment->descriptionText; ?></textarea></td>
 			</td>
 			</tr>
@@ -86,8 +86,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove()"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getContactForm.php b/ajax_forms/getContactForm.php
index 8941891..52d5937 100644
--- a/ajax_forms/getContactForm.php
+++ b/ajax_forms/getContactForm.php
@@ -27,7 +27,7 @@
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 		<input type='hidden' name='editContactID' id='editContactID' value='<?php echo $contactID; ?>'>
 
-		<div class='formTitle' style='width:603px;'><span class='headerText' style='margin-left:7px;'><?php if ($contactID){ echo "Edit Contact"; } else { echo "Add Contact"; } ?></span></div>
+		<div class='formTitle' style='width:603px;'><span class='headerText' style='margin-left:7px;'><?php if ($contactID){ echo _("Edit Contact"); } else { echo _("Add Contact"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -40,56 +40,56 @@
 
 				<table class='noBorder'>
 					<tr>
-					<td style='text-align:left'><label for='contactName'><b>Name:</b></label></td>
+					<td style='text-align:left'><label for='contactName'><b><?= _("Name:");?></b></label></td>
 					<td>
 					<input type='text' id='contactName' name='contactName' value = '<?php echo $contact->name; ?>' style='width:150px' class='changeInput' /><span id='span_error_contactName' class='smallDarkRedText'>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='contactTitle'><b>Title:</b></label></td>
+					<td style='text-align:left'><label for='contactTitle'><b><?= _("Title:");?></b></label></td>
 					<td>
 					<input type='text' id='contactTitle' name='contactTitle' value = '<?php echo $contact->title; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='phoneNumber'><b>Phone:</b></label></td>
+					<td style='text-align:left'><label for='phoneNumber'><b><?= _("Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='phoneNumber' name='phoneNumber' value = '<?php echo $contact->phoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='altPhoneNumber'><b>Alt Phone:</b></label></td>
+					<td style='text-align:left'><label for='altPhoneNumber'><b><?= _("Alt Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='altPhoneNumber' name='altPhoneNumber' value = '<?php echo $contact->altPhoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='faxNumber'><b>Fax:</b></label></td>
+					<td style='text-align:left'><label for='faxNumber'><b><?= _("Fax:");?></b></label></td>
 					<td>
 					<input type='text' id='faxNumber' name='faxNumber' value = '<?php echo $contact->faxNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='emailAddress'><b>Email:</b></label></td>
+					<td style='text-align:left'><label for='emailAddress'><b><?= _("Email:");?></b></label></td>
 					<td>
 					<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $contact->emailAddress; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='addressText'><b>Address:</b></label></td>
+					<td style='text-align:left'><label for='addressText'><b><?= _("Address:");?></b></label></td>
 					<td>
 					<textarea rows='3' id='addressText' style='width:150px'><?php echo $contact->addressText; ?></textarea>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='invalidInd'><b>Archived:</b></label></td>
+					<td style='text-align:left'><label for='invalidInd'><b><?= _("Archived:");?></b></label></td>
 					<td>
 					<input type='checkbox' id='invalidInd' name='invalidInd' <?php echo $invalidChecked; ?> />
 					</td>
@@ -99,7 +99,7 @@
 			<td>
 				<table class='noBorder'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b>Role(s):</b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b><?= _("Role(s):");?></b></label></td>
 				<td>
 
 					<table>
@@ -135,7 +135,7 @@
 
 
 				<tr>
-				<td style='text-align:left'><label for='addressText'><b>Notes:</b></label></td>
+				<td style='text-align:left'><label for='addressText'><b><?= _("Notes:");?></b></label></td>
 				<td>
 				<textarea rows='3' id='noteText' style='width:220px'><?php echo $contact->noteText; ?></textarea>
 				</td>
@@ -158,8 +158,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitContactForm' id ='submitContactForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitContactForm' id ='submitContactForm'></td>
+				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 

From 9c676b005393e3966e4e7bc5fc77f7c823b4dc36 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Mon, 4 May 2015 17:18:31 +0200
Subject: [PATCH 021/159] Translated all files of recent update (v1.3)

---
 admin.php                                     |   58 +-
 ajax_forms/getAccessForm.php                  |   26 +-
 ajax_forms/getAccountForm.php                 |   16 +-
 ajax_forms/getAdminAlertDaysForm.php          |    4 +-
 ajax_forms/getAdminAlertEmailForm.php         |    4 +-
 ajax_forms/getAdminCurrencyUpdateForm.php     |    8 +-
 ajax_forms/getAdminUpdateForm.php             |    4 +-
 ajax_forms/getAdminUserGroupForm.php          |   16 +-
 ajax_forms/getAdminUserUpdateForm.php         |   16 +-
 ajax_forms/getAdminWorkflowForm.php           |   26 +-
 ajax_forms/getAttachmentForm.php              |   12 +-
 ajax_forms/getContactForm.php                 |   24 +-
 ajax_forms/getCostForm.php                    |   30 +-
 ajax_forms/getDetailSubjectUpdateForm.php     |    6 +-
 ajax_forms/getGeneralDetailSubjectForm.php    |   16 +-
 ajax_forms/getGeneralSubjectUpdateForm.php    |    6 +-
 ajax_forms/getLicenseForm.php                 |   22 +-
 ajax_forms/getNewResourceForm.php             |   32 +-
 ajax_forms/getNoteForm.php                    |   10 +-
 ajax_forms/getOrderForm.php                   |   22 +-
 ajax_forms/getResourceSubjectForm.php         |   14 +-
 ajax_forms/getUpdateProductForm.php           |   48 +-
 ajax_htmldata/getAccessDetails.php            |   36 +-
 ajax_htmldata/getAccountDetails.php           |   28 +-
 ajax_htmldata/getAcquisitionsDetails.php      |   94 +-
 ajax_htmldata/getAdminAlertDisplay.php        |   22 +-
 ajax_htmldata/getAdminCurrencyDisplay.php     |   12 +-
 ajax_htmldata/getAdminDisplay.php             |   10 +-
 ajax_htmldata/getAdminSubjectDisplay.php      |   32 +-
 ajax_htmldata/getAdminUserDisplay.php         |   20 +-
 ajax_htmldata/getAdminWorkflowDisplay.php     |   34 +-
 ajax_htmldata/getAttachmentDetails.php        |   12 +-
 ajax_htmldata/getContactDetails.php           |   48 +-
 ajax_htmldata/getGeneralSubjectDisplay.php    |   10 +-
 ajax_htmldata/getOutstandingQueue.php         |   14 +-
 ajax_htmldata/getProductDetails.php           |   66 +-
 ajax_htmldata/getRightPanel.php               |   16 +-
 ajax_htmldata/getRoutingDetails.php           |   38 +-
 ajax_htmldata/getSavedQueue.php               |   18 +-
 ajax_htmldata/getSearchResources.php          |   26 +-
 ajax_htmldata/getSubmittedQueue.php           |   14 +-
 ajax_processing/deleteDetailedSubject.php     |    2 +-
 ajax_processing/deleteGeneralSubject.php      |    2 +-
 ajax_processing/deleteInstance.php            |    4 +-
 ajax_processing/deleteResource.php            |    2 +-
 ajax_processing/deleteResourceAndChildren.php |    2 +-
 ajax_processing/deleteResourceNote.php        |    2 +-
 .../removeResourceSubjectRelationship.php     |    2 +-
 ajax_processing/updateDetailedSubject.php     |    2 +-
 ajax_processing/updateGeneralSubject.php      |    2 +-
 ajax_processing/updateUserData.php            |    2 +-
 ajax_processing/uploadAttachment.php          |    2 +-
 import.php                                    |   54 +-
 index.php                                     |   88 +-
 install/install.php                           |   38 -
 install/protected/data/data_en.sql            |  639 -----
 install/protected/data/data_fr.sql            |  640 -----
 install/protected/install.sql                 |  639 +++++
 js/forms/costForm.js                          |   16 +-
 locale/fr_FR/LC_MESSAGES/messages.mo          |  Bin 31389 -> 35657 bytes
 locale/fr_FR/LC_MESSAGES/messages.po          | 2140 ++++++++++-------
 queue.php                                     |   10 +-
 resource.php                                  |    4 +-
 resources/cataloging.php                      |   36 +-
 resources/cataloging_edit.php                 |    8 +-
 summary.php                                   |   88 +-
 templates/header.php                          |   14 +-
 67 files changed, 2570 insertions(+), 2838 deletions(-)
 delete mode 100644 install/protected/data/data_en.sql
 delete mode 100644 install/protected/data/data_fr.sql

diff --git a/admin.php b/admin.php
index b238962..7d002ea 100644
--- a/admin.php
+++ b/admin.php
@@ -37,7 +37,7 @@
 		<table style='width:100%; margin:0 0 11px 0;padding:0;'>
 		<tr style='vertical-align:top'>
 		<td>
-		<span class="headerText"><?= _("Administration");?></span>
+		<span class="headerText"><?php echo _("Administration");?></span>
 		<br />
 		</td>
 		</tr>
@@ -48,51 +48,51 @@
 		<tr>
 		<td style='width:170px;vertical-align:top;'>
 			<table class='adminMenuTable' style='width:170px;'>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='UserAdminLink'><?= _("Users");?></a></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='WorkflowAdminLink'><?= _("Workflow / User Group");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AccessMethod' class='AdminLink'><?= _("Access Method");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ExternalLoginType' class='AdminLink'><?= _("Account Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AcquisitionType' class='AdminLink'><?= _("Acquisition Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AdministeringSite' class='AdminLink'><?= _("Administering Site");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='UserAdminLink'><?php echo _("Users");?></a></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='WorkflowAdminLink'><?php echo _("Workflow / User Group");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AccessMethod' class='AdminLink'><?php echo _("Access Method");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ExternalLoginType' class='AdminLink'><?php echo _("Account Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AcquisitionType' class='AdminLink'><?php echo _("Acquisition Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AdministeringSite' class='AdminLink'><?php echo _("Administering Site");?></div></td></tr>
 				<?php if ($config->settings->enableAlerts == 'Y'){ ?>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='AlertAdminLink'><?= _("Alert Settings");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='AlertAdminLink'><?php echo _("Alert Settings");?></div></td></tr>
 				<?php } ?>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AliasType' class='AdminLink'><?= _("Alias Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AttachmentType' class='AdminLink'><?= _("Attachment Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthenticationType' class='AdminLink'><?= _("Authentication Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthorizedSite' class='AdminLink'><?= _("Authorized Site");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingStatus' class='AdminLink'><?= _("Cataloging Status");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingType' class='AdminLink'><?= _("CatalogingType");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ContactRole' class='AdminLink'><?= _("Contact Role");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AliasType' class='AdminLink'><?php echo _("Alias Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AttachmentType' class='AdminLink'><?php echo _("Attachment Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthenticationType' class='AdminLink'><?php echo _("Authentication Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='AuthorizedSite' class='AdminLink'><?php echo _("Authorized Site");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingStatus' class='AdminLink'><?php echo _("Cataloging Status");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CatalogingType' class='AdminLink'><?php echo _("CatalogingType");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ContactRole' class='AdminLink'><?php echo _("Contact Role");?></div></td></tr>
 				<?php if ($config->settings->enhancedCostHistory == 'Y'){ ?>
-					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CostDetails' class='AdminLink'><?= _("Cost Details");?></div></td></tr>
+					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CostDetails' class='AdminLink'><?php echo _("Cost Details");?></div></td></tr>
 				<?php } ?>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='CurrencyLink'><?= _("Currency");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'><?= _("License Status");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'><?= _("Note Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'><?= _("Order Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='CurrencyLink'><?php echo _("Currency");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'><?php echo _("License Status");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'><?php echo _("Note Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'><?php echo _("Order Type");?></div></td></tr>
 				<?php
 
 				//For Organizations links
 				//if the org module is not installed, display provider list for updates
 				if ($config->settings->organizationsModule == 'N'){ ?>
 
-					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrganizationRole' class='AdminLink'><?= _("Organization Role");?></div></td></tr>
-					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='Organization' class='AdminLink'><?= _("Organizations");?></div></td></tr>
+					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrganizationRole' class='AdminLink'><?php echo _("Organization Role");?></div></td></tr>
+					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='Organization' class='AdminLink'><?php echo _("Organizations");?></div></td></tr>
 
 				<?php } ?>
 
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='PurchaseSite' class='AdminLink'><?= _("Purchasing Site");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceFormat' class='AdminLink'><?= _("Resource Format");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceType' class='AdminLink'><?= _("Resource Type");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='StorageLocation' class='AdminLink'><?= _("Storage Location");?></div></td></tr>
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='SubjectsAdminLink'><?= _("Subjects");?></div></td></tr>				
-				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='UserLimit' class='AdminLink'><?= _("User Limit");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='PurchaseSite' class='AdminLink'><?php echo _("Purchasing Site");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceFormat' class='AdminLink'><?php echo _("Resource Format");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='ResourceType' class='AdminLink'><?php echo _("Resource Type");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='StorageLocation' class='AdminLink'><?php echo _("Storage Location");?></div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='SubjectsAdminLink'><?php echo _("Subjects");?></div></td></tr>				
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='UserLimit' class='AdminLink'><?php echo _("User Limit");?></div></td></tr>
 			</table>
 		</td>
 		<td class='adminRightPanel' style='width:530px;margin:0;'>
 			<div style='margin-top:5px;' id='div_AdminContent'>
-			<img src = "images/circle.gif" /><?= _("Loading...");?>
+			<img src = "images/circle.gif" /><?php echo _("Loading...");?>
 			</div>
 			<div style='margin-top:5px;' class='smallDarkRedText' id='div_error'></div>
 
diff --git a/ajax_forms/getAccessForm.php b/ajax_forms/getAccessForm.php
index 24c0406..12401c6 100644
--- a/ajax_forms/getAccessForm.php
+++ b/ajax_forms/getAccessForm.php
@@ -56,7 +56,7 @@
 		<form id='accessForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Access");?></span></div>
+		<div class='formTitle' style='width:617px; margin-bottom:5px;'><span class='headerText'><?php echo _("Edit Access");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -65,14 +65,14 @@
 		<td style='vertical-align:top;' colspan='2'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?= _("Access");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?php echo _("Access");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:610px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:570px; margin:15px 20px 10px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'><?= _("Authentication Type:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationTypeID'><?php echo _("Authentication Type:");?></label></td>
 					<td>
 						<select name='authenticationTypeID' id='authenticationTypeID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -87,11 +87,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'><?= _("Username:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationUserName'><?php echo _("Username:");?></label></td>
 					<td><input type='text' id='authenticationUserName' name='authenticationUserName' value = '<?php echo $resource->authenticationUserName; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'><?= _("Access Method:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='accessMethodID'><?php echo _("Access Method:");?></label></td>
 					<td>
 						<select name='accessMethodID' id='accessMethodID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -106,11 +106,11 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'><?= _("Password:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='authenticationPassword'><?php echo _("Password:");?></label></td>
 					<td><input type='text' id='authenticationPassword' name='authenticationPassword' value = '<?php echo $resource->authenticationPassword; ?>' style='width:95px;' class='changeInput'  /></td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'><?= _("Storage Location:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='storageLocationID'><?php echo _("Storage Location:");?></label></td>
 					<td>
 						<select name='storageLocationID' id='storageLocationID' style='width:100px;' class='changeSelect'>
 						<option value=''></option>
@@ -125,7 +125,7 @@
 						?>
 						</select>
 					</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'><?= _("Simultaneous User Limit:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='userLimitID'><?php echo _("Simultaneous User Limit:");?></label></td>
 					<td>
 						<select name='userLimitID' id='userLimitID' style='width:100px;' class='changeSelect' >
 						<option value=''></option>
@@ -142,7 +142,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'><?= _("Coverage:");?></label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;white-space: nowrap;'><label for='coverageText'><?php echo _("Coverage:");?></label></td>
 					<td colspan='3'>
 						<input type='text' id='coverageText' name='coverageText' value = "<?php echo $resource->coverageText; ?>" style='width:405px;' class='changeInput'  />
 					</td>
@@ -160,7 +160,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Authorized Site(s)");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?php echo _("Authorized Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -205,7 +205,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?= _("Administering Site(s)");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='authorizedSiteID'><b><?php echo _("Administering Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:295px;'>
 			<tr>
@@ -248,8 +248,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAccessChanges' id ='submitAccessChanges'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitAccessChanges' id ='submitAccessChanges'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAccountForm.php b/ajax_forms/getAccountForm.php
index e09317c..2f790c5 100644
--- a/ajax_forms/getAccountForm.php
+++ b/ajax_forms/getAccountForm.php
@@ -24,7 +24,7 @@
 
 			<table class='noBorder' style='width:350px; margin:10px 15px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b><?= _("Login Type:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='externalLoginTypeID'><b><?php echo _("Login Type:");?></b></label></td>
 				<td>
 				<select name='externalLoginTypeID' id='externalLoginTypeID' class='changeSelect'>
 				<?php
@@ -41,35 +41,35 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='loginURL'><b><?= _("URL:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='loginURL'><b><?php echo _("URL:");?></b></label></td>
 				<td>
 				<input type='text' id='loginURL' name='loginURL' value = '<?php echo $externalLogin->loginURL; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Registered Email:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?php echo _("Registered Email:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $externalLogin->emailAddress; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='username'><b><?= _("Username:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='username'><b><?php echo _("Username:");?></b></label></td>
 				<td>
 				<input type='text' id='username' name='username' value = '<?php echo $externalLogin->username; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='password'><b><?= _("Password:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='password'><b><?php echo _("Password:");?></b></label></td>
 				<td>
 				<input type='text' id='password' name='password' value = '<?php echo $externalLogin->password; ?>' style='width:200px' class='changeInput' />
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='noteText'><b><?= _("Notes:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='noteText'><b><?php echo _("Notes:");?></b></label></td>
 				<td><textarea rows='3' id='noteText' name='noteText' style='width:200px'><?php echo $externalLogin->noteText; ?></textarea></td>
 				</td>
 				</tr>
@@ -83,8 +83,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitExternalLoginForm' id ='submitExternalLoginForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminAlertDaysForm.php b/ajax_forms/getAdminAlertDaysForm.php
index d60c6b4..32ecd23 100644
--- a/ajax_forms/getAdminAlertDaysForm.php
+++ b/ajax_forms/getAdminAlertDaysForm.php
@@ -31,8 +31,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminAlertEmailForm.php b/ajax_forms/getAdminAlertEmailForm.php
index 844bfde..e7b7a30 100644
--- a/ajax_forms/getAdminAlertEmailForm.php
+++ b/ajax_forms/getAdminAlertEmailForm.php
@@ -31,8 +31,8 @@
 		<div class='smallDarkRedText' id='div_form_error'>&nbsp;</div>
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminCurrencyUpdateForm.php b/ajax_forms/getAdminCurrencyUpdateForm.php
index 136350e..0845659 100644
--- a/ajax_forms/getAdminCurrencyUpdateForm.php
+++ b/ajax_forms/getAdminCurrencyUpdateForm.php
@@ -21,10 +21,10 @@
 
 			<table class='noBorder' style='width:200px; margin:10px;'>
 			<tr>
-			<td><?= _("Code");?></td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
+			<td><?php echo _("Code");?></td><td><input type='text' id='currencyCode' value='<?php echo $instance->currencyCode; ?>' style='width:150px;'/></td>
 			</tr>
 			<tr>
-			<td><?= _("Name");?></td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
+			<td><?php echo _("Name");?></td><td><input type='text' id='shortName' value='<?php echo $instance->shortName; ?>' style='width:150px;'/></td>
 			</tr>
 			</table>
 
@@ -35,8 +35,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUpdateForm.php b/ajax_forms/getAdminUpdateForm.php
index 856ef8f..cb9c31b 100644
--- a/ajax_forms/getAdminUpdateForm.php
+++ b/ajax_forms/getAdminUpdateForm.php
@@ -41,8 +41,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUserGroupForm.php b/ajax_forms/getAdminUserGroupForm.php
index 7ae9487..64be023 100644
--- a/ajax_forms/getAdminUserGroupForm.php
+++ b/ajax_forms/getAdminUserGroupForm.php
@@ -23,7 +23,7 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("User Group");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?php echo _("User Group");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -31,14 +31,14 @@
 
 				<table class='noBorder' style='width:235px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b><?= _("Group Name:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='groupName'><b><?php echo _("Group Name:");?></b></label></td>
 				<td>
 				<input type='text' id='groupName' name='groupName' value = '<?php echo $userGroup->groupName; ?>' style='width:110px' class='changeInput' /><span id='span_error_groupName' class='smallDarkRedText'></span>
 				</td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?= _("Email Address:");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='emailAddress'><b><?php echo _("Email Address:");?></b></label></td>
 				<td>
 				<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $userGroup->emailAddress; ?>' style='width:110px' class='changeInput' />
 				</td>
@@ -55,7 +55,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b><?= _("Assigned Users");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='loginID'><b><?php echo _("Assigned Users");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -79,7 +79,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt="<?= _("add user");?>" title="<?= _("add user");?>"></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addUser' alt="<?php echo _("add user");?>" title="<?php echo _("add user");?>"></a>
 				</td>
 				</tr>
 				</table>
@@ -118,7 +118,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt="<?= _("remove user from group");?>" title="<?= _("remove user from group");?>" class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove user from group");?>" title="<?php echo _("remove user from group");?>" class='remove' /></a>
 						</td>
 						</tr>
 					<?php
@@ -144,8 +144,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitUserGroupForm' id ='submitUserGroupForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminUserUpdateForm.php b/ajax_forms/getAdminUserUpdateForm.php
index a4a862a..9d51092 100644
--- a/ajax_forms/getAdminUserUpdateForm.php
+++ b/ajax_forms/getAdminUserUpdateForm.php
@@ -29,11 +29,11 @@
 			<table class='noBorder' style='width:260px; margin:10px;'>
 
 
-				<tr><td><label for='loginID'><b><?= _("Login ID");?></b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
-				<tr><td><label for='firstName'><b><?= _("First Name");?></b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='lastName'><b><?= _("Last Name");?></b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='emailAddress'><b><?= _("Email Address");?></b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
-				<tr><td><label for='privilegeID'><b><?= _("Privilege");?></b></label</td>
+				<tr><td><label for='loginID'><b><?php echo _("Login ID");?></b></label</td><td><?php if (!$loginID) { ?><input type='text' id='loginID' value='<?php echo $loginID; ?>' style='width:150px;'/> <?php } else { echo $loginID; } ?></td></tr>
+				<tr><td><label for='firstName'><b><?php echo _("First Name");?></b></label</td><td><input type='text' id='firstName' value="<?php echo $user->firstName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='lastName'><b><?php echo _("Last Name");?></b></label</td><td><input type='text' id='lastName' value="<?php echo $user->lastName; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='emailAddress'><b><?php echo _("Email Address");?></b></label</td><td><input type='text' id='emailAddress' value="<?php echo $user->emailAddress; ?>" style='width:150px;'/></td></tr>
+				<tr><td><label for='privilegeID'><b><?php echo _("Privilege");?></b></label</td>
 				<td>
 				<select id='privilegeID' style='width:155px'>
 				<?php
@@ -51,7 +51,7 @@
 				</td>
 				</tr>
 
-				<tr><td><label for='accountTab'><b><?= _("View Accounts");?></b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
+				<tr><td><label for='accountTab'><b><?php echo _("View Accounts");?></b></label</td><td><input type='checkbox' id='accountTab' value='1' <?php echo $accountTab; ?> /></td></tr>
 
 
 			</table>
@@ -63,8 +63,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' id ='submitAddUpdate'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' id ='submitAddUpdate'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAdminWorkflowForm.php b/ajax_forms/getAdminWorkflowForm.php
index aea1434..c27501a 100644
--- a/ajax_forms/getAdminWorkflowForm.php
+++ b/ajax_forms/getAdminWorkflowForm.php
@@ -39,7 +39,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editWFID' id='editWFID' value='<?php echo $workflowID; ?>'>
 
-		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'><?= _("Edit Workflow");?></span></div>
+		<div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'><?php echo _("Edit Workflow");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -48,14 +48,14 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?= _("Resource Entry Requirements");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?php echo _("Resource Entry Requirements");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:660px; margin:15px 20px 10px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'><?= _("Acquisition Type:");?></label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'><?php echo _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect' >
 				<?php
@@ -71,7 +71,7 @@
 				</td>
 
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?= _("Format:");?></label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?php echo _("Format:");?></label></td>
 				<td>
 				<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
 				<?php
@@ -86,7 +86,7 @@
 				</select>
 				</td>
 
-				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'><?= _("Type:");?></label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceTypeID'><?php echo _("Type:");?></label></td>
 				<td>
 				<select name='resourceTypeID' id='resourceTypeID' style='width:100px;' class='changeSelect' >
 				<option value=''></option>
@@ -111,7 +111,7 @@
 			<div style='height:20px;'>&nbsp;</div>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b><?= _("Workflow Steps");?></b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='workflowSteps'><b><?php echo _("Workflow Steps");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:700px;'>
 			<tr>
@@ -120,9 +120,9 @@
 				<table class='noBorder noMargin newStepTable' style='width:660px;  margin:15px 20px 0px 20px;'>
 				<tr>
 					<td style='vertical-align:top;text-align:left;font-weight:bold;width:48px;'>&nbsp;</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'><?= _("Name:");?></td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'><?= _("Approval/Notification Group:");?></td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'><?= _("Parent Step");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:218px;'><?php echo _("Name:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:175px;'><?php echo _("Approval/Notification Group:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:110px;'><?php echo _("Parent Step");?></td>
 					<td style='vertical-align:top;text-align:center;width:40px;'>&nbsp;</td>
 				</tr>
 
@@ -152,7 +152,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:center;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt="<?= _("add step");?>" title="<?= _("add step");?>"></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addStep' alt="<?php echo _("add step");?>" title="<?php echo _("add step");?>"></a>
 				</td>
 
 				</tr>
@@ -235,7 +235,7 @@
 
 
 						<td style='vertical-align:top;text-align:center;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt="<?= _("remove this step");?>" title="<?= _("remove this step");?>" class='removeStep' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove this step");?>" title="<?php echo _("remove this step");?>" class='removeStep' /></a>
 						</td>
 
 						</tr>
@@ -263,8 +263,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitWorkflowForm' id ='submitWorkflowForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getAttachmentForm.php b/ajax_forms/getAttachmentForm.php
index a6c3a3b..1116aaa 100644
--- a/ajax_forms/getAttachmentForm.php
+++ b/ajax_forms/getAttachmentForm.php
@@ -24,7 +24,7 @@
 			<table class='noBorder' style='width:310px; margin:10px 15px;'>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b><?= _("Name:");?></b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b><?php echo _("Name:");?></b></label></td>
 			<td>
 			<input type='text' class='changeInput' id='shortName' name='shortName' value = '<?php echo $attachment->shortName; ?>' style='width:230px' /><span id='span_error_shortName' class='smallDarkRedText'></span>
 			</td>
@@ -32,7 +32,7 @@
 
 			<tr>
 
-			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b><?= _("Type:");?></b></label></td>
+			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b><?php echo _("Type:");?></b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 
 			<select name='attachmentTypeID' id='attachmentTypeID'>
@@ -52,7 +52,7 @@
 			</tr>
 
 			<tr>
-			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b><?= _("File:");?></b></label></td>
+			<td style='text-align:left;vertical-align:top;'><label for="uploadAttachment"><b><?php echo _("File:");?></b></label></td>
 			<td>
 			<?php
 
@@ -73,7 +73,7 @@
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b><?= _("Details:");?></b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><b><?php echo _("Details:");?></b></label></td>
 			<td><textarea rows='5' class='changeInput' id='descriptionText' name='descriptionText' style='width:230px'><?php echo $attachment->descriptionText; ?></textarea></td>
 			</td>
 			</tr>
@@ -86,8 +86,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitAttachmentForm' id ='submitAttachmentForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="tb_remove()"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getContactForm.php b/ajax_forms/getContactForm.php
index 52d5937..b68fdb0 100644
--- a/ajax_forms/getContactForm.php
+++ b/ajax_forms/getContactForm.php
@@ -40,56 +40,56 @@
 
 				<table class='noBorder'>
 					<tr>
-					<td style='text-align:left'><label for='contactName'><b><?= _("Name:");?></b></label></td>
+					<td style='text-align:left'><label for='contactName'><b><?php echo _("Name:");?></b></label></td>
 					<td>
 					<input type='text' id='contactName' name='contactName' value = '<?php echo $contact->name; ?>' style='width:150px' class='changeInput' /><span id='span_error_contactName' class='smallDarkRedText'>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='contactTitle'><b><?= _("Title:");?></b></label></td>
+					<td style='text-align:left'><label for='contactTitle'><b><?php echo _("Title:");?></b></label></td>
 					<td>
 					<input type='text' id='contactTitle' name='contactTitle' value = '<?php echo $contact->title; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='phoneNumber'><b><?= _("Phone:");?></b></label></td>
+					<td style='text-align:left'><label for='phoneNumber'><b><?php echo _("Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='phoneNumber' name='phoneNumber' value = '<?php echo $contact->phoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='altPhoneNumber'><b><?= _("Alt Phone:");?></b></label></td>
+					<td style='text-align:left'><label for='altPhoneNumber'><b><?php echo _("Alt Phone:");?></b></label></td>
 					<td>
 					<input type='text' id='altPhoneNumber' name='altPhoneNumber' value = '<?php echo $contact->altPhoneNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='faxNumber'><b><?= _("Fax:");?></b></label></td>
+					<td style='text-align:left'><label for='faxNumber'><b><?php echo _("Fax:");?></b></label></td>
 					<td>
 					<input type='text' id='faxNumber' name='faxNumber' value = '<?php echo $contact->faxNumber; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='emailAddress'><b><?= _("Email:");?></b></label></td>
+					<td style='text-align:left'><label for='emailAddress'><b><?php echo _("Email:");?></b></label></td>
 					<td>
 					<input type='text' id='emailAddress' name='emailAddress' value = '<?php echo $contact->emailAddress; ?>' style='width:150px' class='changeInput' />
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='addressText'><b><?= _("Address:");?></b></label></td>
+					<td style='text-align:left'><label for='addressText'><b><?php echo _("Address:");?></b></label></td>
 					<td>
 					<textarea rows='3' id='addressText' style='width:150px'><?php echo $contact->addressText; ?></textarea>
 					</td>
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='invalidInd'><b><?= _("Archived:");?></b></label></td>
+					<td style='text-align:left'><label for='invalidInd'><b><?php echo _("Archived:");?></b></label></td>
 					<td>
 					<input type='checkbox' id='invalidInd' name='invalidInd' <?php echo $invalidChecked; ?> />
 					</td>
@@ -99,7 +99,7 @@
 			<td>
 				<table class='noBorder'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b><?= _("Role(s):");?></b></label></td>
+				<td style='vertical-align:top;text-align:left;'><label for='orgRoles'><b><?php echo _("Role(s):");?></b></label></td>
 				<td>
 
 					<table>
@@ -135,7 +135,7 @@
 
 
 				<tr>
-				<td style='text-align:left'><label for='addressText'><b><?= _("Notes:");?></b></label></td>
+				<td style='text-align:left'><label for='addressText'><b><?php echo _("Notes:");?></b></label></td>
 				<td>
 				<textarea rows='3' id='noteText' style='width:220px'><?php echo $contact->noteText; ?></textarea>
 				</td>
@@ -158,8 +158,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='<?= _("submit");?>' name='submitContactForm' id ='submitContactForm'></td>
-				<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitContactForm' id ='submitContactForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getCostForm.php b/ajax_forms/getCostForm.php
index 8f5bd3f..d87a752 100644
--- a/ajax_forms/getCostForm.php
+++ b/ajax_forms/getCostForm.php
@@ -45,33 +45,33 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:<?php echo $baseWidth + 46 ?>px; margin-bottom:5px;'><span class='headerText'>Edit Cost Information</span></div>
+		<div class='formTitle' style='width:<?php echo $baseWidth + 46 ?>px; margin-bottom:5px;'><span class='headerText'><?php echo _("Edit Cost Information");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
 		<table class='noBorder' style='width:<?php echo $baseWidth + 45 ?>px;'>
 		<tr style='vertical-align:top;'>
 		<td>
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourcePayments'><b>Cost History</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourcePayments'><b><?php echo _("Cost History");?></b></label>&nbsp;&nbsp;</span>
 			<table class='surroundBox' style='width:<?php echo $baseWidth - 65; ?>px;'>
 			<tr>
 			<td>
 				<table class='noBorder smallPadding newPaymentTable' style='margin:7px 15px 0 15px;'>
 				<tr>
 					<?php if ($enhancedCostFlag){ ?>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Year</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Sub Start</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Sub End</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Year");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Sub Start");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Sub End");?></td>
 					<?php } ?>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Fund</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan=2>Payment</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Type</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Fund");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;' colspan=2><?php echo _("Payment");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Type");?></td>
 					<?php if ($enhancedCostFlag){ ?>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Cost Details</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Cost Details");?></td>
 					<?php } ?>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Note</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Note");?></td>
 					<?php if ($enhancedCostFlag){ ?>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'>Invoice</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><?php echo _("Invoice");?></td>
 					<?php } ?>
 					<td>&nbsp;</td>
 				</tr>
@@ -135,7 +135,7 @@
 			</td>
 		<?php } ?>
 		<td style='vertical-align:center;text-align:center;width:37px;'>
-		<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt='add this payment' title='add payment'></a>
+		<a href='javascript:void();'><img src='images/add.gif' class='addPayment' alt="<?php echo _("add this payment");?>" title="<?php echo _("add payment");?>"></a>
 		</td>
 		</tr>
 		<tr>
@@ -219,7 +219,7 @@
 			</td>
 		<?php } ?>
 		<td style='vertical-align:top;text-align:center;width:37px;'>
-			<a href='javascript:void();'><img src='images/cross.gif' alt='remove this payment' title='remove this payment' class='remove' /></a>
+			<a href='javascript:void();'><img src='images/cross.gif' alt='<?php echo _("remove this payment");?>' title='<?php echo _("remove this payment");?>' class='remove' /></a>
 		</td>
 		</tr>
 
@@ -249,8 +249,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitCost' id ='submitCost'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitCost' id ='submitCost'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getDetailSubjectUpdateForm.php b/ajax_forms/getDetailSubjectUpdateForm.php
index 0b8788f..b3256f1 100644
--- a/ajax_forms/getDetailSubjectUpdateForm.php
+++ b/ajax_forms/getDetailSubjectUpdateForm.php
@@ -13,7 +13,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -35,8 +35,8 @@
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
 
-				<td style='text-align:left'><input type='button' value='submit' name='submitDetailedSubjectForm' id ='submitDetailedSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitDetailedSubjectForm' id ='submitDetailedSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getGeneralDetailSubjectForm.php b/ajax_forms/getGeneralDetailSubjectForm.php
index ebb326a..d95e44f 100644
--- a/ajax_forms/getGeneralDetailSubjectForm.php
+++ b/ajax_forms/getGeneralDetailSubjectForm.php
@@ -15,7 +15,7 @@
 		<form id='detailedSubjectForm'>
 		<input type='hidden' name='editgeneralSubjectID' id='editgeneralSubjectID' value='<?php echo $generalSubjectID; ?>'>
 
-		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php echo "Add / Edit Subject Relationships"; ?></span></div>
+		<div class='formTitle' style='width:280px; margin-bottom:5px;position:relative;'><span class='headerText'><?php echo _("Add / Edit Subject Relationships"); ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -24,7 +24,7 @@
 		<td style='vertical-align:top;position:relative;'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>General Subject</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b><?php echo _("General Subject");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -50,7 +50,7 @@
 			<tr style='vertical-align:top;'>
 			<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='detailedSubjectID'><b>Detailed Subjects</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='detailedSubjectID'><b><?php echo _("Detailed Subjects");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:275px;'>
 			<tr>
@@ -72,7 +72,7 @@
 						</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='adddetailedSubject' alt='add detail subject' title='add detail subject'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='adddetailedSubject' alt="<?php echo _("add detail subject");?>" title="<?php echo _("add detail subject");?>"></a>
 				</td>
 				</tr>
 				</table>
@@ -102,9 +102,9 @@
 							// Check to see if detail subject is in use.  If not allow removal.
 							$subjectObj = new DetailedSubject();
 							if ($subjectObj->inUse($dsSubject->detailedSubjectID, $generalSubject->generalSubjectID) == 0)  { ?>
-								<a href='javascript:void();'><img src='images/cross.gif' alt='remove detailed subject' title='remove detailed subject' class='remove' /></a>
+								<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove detailed subject");?>" title="<?php echo _("remove detailed subject");?>" class='remove' /></a>
 						<?php } else { ?>
-								<img src='images/do_not_enter.png' alt='subject in use' title='subject in use' />
+								<img src='images/do_not_enter.png' alt="<?php echo _("subject in use");?>" title="<?= _("subject in use");?>" />
 						<?php }  ?>
 						</td>
 						</tr>
@@ -125,8 +125,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitDetailSubjectForm' id ='submitDetailSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitDetailSubjectForm' id ='submitDetailSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getGeneralSubjectUpdateForm.php b/ajax_forms/getGeneralSubjectUpdateForm.php
index 25d46fa..efc5d32 100644
--- a/ajax_forms/getGeneralSubjectUpdateForm.php
+++ b/ajax_forms/getGeneralSubjectUpdateForm.php
@@ -13,7 +13,7 @@
 		<input type='hidden' id='editClassName' value='<?php echo $className; ?>'>
 		<input type='hidden' id='editUpdateID' value='<?php echo $updateID; ?>'>
 
-		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo "Edit " . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo "Add " . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
+		<div class='formTitle' style='width:245px;'><span class='headerText' style='margin-left:7px;'><?php if ($updateID){ echo _("Edit ") . preg_replace("/[A-Z]/", " \\0" , $className); } else { echo _("Add ") . preg_replace("/[A-Z]/", " \\0" , $className); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -35,8 +35,8 @@
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
 
-				<td style='text-align:left'><input type='button' value='submit' name='submitGeneralSubjectForm' id ='submitGeneralSubjectForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitGeneralSubjectForm' id ='submitGeneralSubjectForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getLicenseForm.php b/ajax_forms/getLicenseForm.php
index 79e6f1b..d33f7ac 100644
--- a/ajax_forms/getLicenseForm.php
+++ b/ajax_forms/getLicenseForm.php
@@ -47,7 +47,7 @@
 		<form id='licenseForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:360px; margin-bottom:5px;'><span class='headerText'>Edit Licenses</span></div>
+		<div class='formTitle' style='width:360px; margin-bottom:5px;'><span class='headerText'><?php echo _("Edit Licenses");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -57,7 +57,7 @@
 
 
 			<?php if ($config->settings->licensingModule == 'Y'){ ?>
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseRecords'><b>License Records</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseRecords'><b><?php echo _("License Records");?></b></label>&nbsp;&nbsp;</span>
 
 
 			<table class='surroundBox' style='width:350px;'>
@@ -73,7 +73,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();' class='addLicense'><img src='images/add.gif' class='addLicense' alt='add license' title='add license'></a>
+				<a href='javascript:void();' class='addLicense'><img src='images/add.gif' class='addLicense' alt="<?php echo _("add license");?>" title="<?php echo _("add license");?>"></a>
 				</td>
 				</tr>
 				</table>
@@ -100,7 +100,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove license link' title='remove <?php echo $license['license']; ?> license' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?php echo _("remove license link");?>' title='<?php echo _("remove ").$license['license']._(" license"); ?>' class='remove' /></a>
 						</td>
 
 						</tr>
@@ -125,7 +125,7 @@
 
 			<?php } ?>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseStatus'><b>Licensing Status</b></label></span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='licenseStatus'><b><?php echo _("Licensing Status");?></b></label></span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -133,7 +133,7 @@
 
 				<table class='noBorder smallPadding' style='width:310px; margin:15px 20px 0px 20px'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;width:60px;'>Status:</td>
+				<td style='vertical-align:top;text-align:left;width:60px;'><?php echo _("Status:");?></td>
 				<td style='vertical-align:top;text-align:left;'>
 				<select class='changeSelect' id='licenseStatusID'>
 				<option value=''></option>
@@ -157,16 +157,16 @@
 
 				<table class='noBorder' style='width:310px; margin:5px 15px;'>
 				<tr>
-				<td style='vertical-align:top;width:60px;'>History:</td>
+				<td style='vertical-align:top;width:60px;'><?php echo _("History:");?></td>
 				<td>
 
 				<?php
 				if (count($resourceLicenseStatusArray) > 0){
 					foreach ($resourceLicenseStatusArray as $licenseStatus){
-						echo $licenseStatus['licenseStatus'] . " - <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . " by " . $licenseStatus['changeName'] . "</i><br />";
+						echo $licenseStatus['licenseStatus'] . " - <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . _(" by ") . $licenseStatus['changeName'] . "</i><br />";
 					}
 				}else{
-					echo "<i>No license status information available.</i>";
+					echo "<i>"._("No license status information available.")."</i>";
 				}
 
 				?>
@@ -188,8 +188,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitLicense' id ='submitLicense'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitLicense' id ='submitLicense'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getNewResourceForm.php b/ajax_forms/getNewResourceForm.php
index 585c4a6..26973b4 100644
--- a/ajax_forms/getNewResourceForm.php
+++ b/ajax_forms/getNewResourceForm.php
@@ -81,14 +81,14 @@
 
 		<input type='hidden' id='organizationID' value='<?php echo $orgID; ?>' />
 		<input type='hidden' id='editResourceID' value='<?php echo $resourceID; ?>' />
-		<div class='formTitle' style='width:745px;'><span class='headerText'><?php if ($resourceID) { echo "Edit Saved Resource"; }else{ echo "Add New Resource"; } ?></span></div>
-		<div class='smallDarkRedText' style='height:14px;margin:3px 0px 0px 0px;'>&nbsp;* required fields</div>
+		<div class='formTitle' style='width:745px;'><span class='headerText'><?php if ($resourceID) { echo _("Edit Saved Resource"); }else{ echo _("Add New Resource"); } ?></span></div>
+		<div class='smallDarkRedText' style='height:14px;margin:3px 0px 0px 0px;'>&nbsp;* <?php echo _("required fields");?></div>
 
 		<table class='noBorder'>
 		<tr style='vertical-align:top;'>
 		<td style='vertical-align:top; padding-right:35px;'>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b>Product</b>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b><?php echo _("Product");?></b>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -97,27 +97,27 @@
 				<table class='noBorder' style='width:310px; margin:5px 15px;'>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='titleText'>Name:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='titleText'><?php echo _("Name:");?>&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 					<td><input type='text' id='titleText' style='width:220px;' class='changeInput' value="<?php echo $resource->titleText; ?>" /><span id='span_error_titleText' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='descriptionText'>Description:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='descriptionText'><?php echo _("Description:");?></label></td>
 					<td><textarea rows='3' id='descriptionText' style='width:223px'><?php echo $resource->descriptionText; ?></textarea></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='providerText'>Provider:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='providerText'><?php echo _("Provider:");?></label></td>
 					<td><input type='text' id='providerText' style='width:220px;' class='changeInput' value='<?php echo $providerText; ?>' /><span id='span_error_providerText' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='resourceURL'>URL:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='resourceURL'><?php echo _("URL:");?></label></td>
 					<td><input type='text' id='resourceURL' style='width:220px;' class='changeInput' value='<?php echo $resource->resourceURL; ?>' /><span id='span_error_resourceURL' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><label for='resourceAltURL'>Alt URL:</label></td>
+					<td style='vertical-align:top;text-align:left;'><label for='resourceAltURL'><?php echo _("Alt URL:");?></label></td>
 					<td><input type='text' id='resourceAltURL' style='width:220px;' class='changeInput' value='<?php echo $resource->resourceAltURL; ?>' /><span id='span_error_resourceAltURL' class='smallDarkRedText'></span></td>
 					</tr>
 
@@ -128,7 +128,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Format</b></label>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?php _("Format");?></b></label>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -173,7 +173,7 @@
 			</table>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b>Acquisition Type</b>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<b><?php echo _("Acquisition Type");?></b>&nbsp;<span class='bigDarkRedText'>*</span>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -220,7 +220,7 @@
 		</td>
 		<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceTypeID'><b>Resource Type</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceTypeID'><b><?php echo _("Resource Type");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -266,7 +266,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Notes</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?php echo _("Notes");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -275,7 +275,7 @@
 				<table class='noBorder smallPadding' style='width:320px; margin:7px 15px;'>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;'><span class='smallGreyText'>Include any additional information</span><br />
+					<td style='vertical-align:top;text-align:left;'><span class='smallGreyText'><?php echo _("Include any additional information");?></span><br />
 					<textarea rows='5' id='noteText' name='noteText' style='width:310px'><?php echo $resourceNote->noteText; ?></textarea></td>
 					</tr>
 				</table>
@@ -291,9 +291,9 @@
 
 		<table class='noBorderTable' style='width:175px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='save' class='submitResource' id ='save'></td>
-				<td style='text-align:left'><input type='button' value='submit' class='submitResource' id ='progress'></td>
-				<td style='text-align:left'><input type='button' value='cancel' onclick="kill(); tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("save");?>' class='submitResource' id ='save'></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' class='submitResource' id ='progress'></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove()"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getNoteForm.php b/ajax_forms/getNoteForm.php
index f7a8109..8bb4741 100644
--- a/ajax_forms/getNoteForm.php
+++ b/ajax_forms/getNoteForm.php
@@ -15,7 +15,7 @@
 		<input type='hidden' name='editResourceNoteID' id='editResourceNoteID' value='<?php echo $resourceNoteID; ?>'>
 		<input type='hidden' name='tab' id='tab' value='<?php echo $tabName; ?>'>
 
-		<div class='formTitle' style='width:395px;'><span class='headerText' style='margin-left:7px;'><?php if ($resourceNoteID){ echo "Edit Note"; } else { echo "Add Note"; } ?></span></div>
+		<div class='formTitle' style='width:395px;'><span class='headerText' style='margin-left:7px;'><?php if ($resourceNoteID){ echo _("Edit Note"); } else { echo _("Add Note"); } ?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -25,7 +25,7 @@
 
 			<table class='noBorder' style='width:360px; margin:10px 15px;'>
 			<tr>
-			<td style='vertical-align:top;text-align:left;border:0px;'><label for='noteTypeID'><b>Note Type:</b></label></td>
+			<td style='vertical-align:top;text-align:left;border:0px;'><label for='noteTypeID'><b><?php echo _("Note Type:");?></b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 
 			<select name='noteTypeID' id='noteTypeID'>
@@ -45,7 +45,7 @@
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;text-align:left;'><label for='noteText'><b>Notes:</b></label></td>
+			<td style='vertical-align:top;text-align:left;'><label for='noteText'><b><?php echo _("Notes:");?></b></label></td>
 			<td><textarea rows='5' id='noteText' name='noteText' style='width:270px'><?php echo $resourceNote->noteText; ?></textarea><span class='smallDarkRedText' id='span_error_noteText'></span></td>
 			</td>
 			</tr>
@@ -58,8 +58,8 @@
 		<br />
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitResourceNoteForm' id ='submitResourceNoteForm'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove()"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitResourceNoteForm' id ='submitResourceNoteForm'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="tb_remove()"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getOrderForm.php b/ajax_forms/getOrderForm.php
index c886d1b..0798825 100644
--- a/ajax_forms/getOrderForm.php
+++ b/ajax_forms/getOrderForm.php
@@ -30,20 +30,20 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:420px; margin-bottom:5px;'><span class='headerText'>Edit Acquisitions Information</span></div>
+		<div class='formTitle' style='width:420px; margin-bottom:5px;'><span class='headerText'><?php echo _("Edit Acquisitions Information");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
 		<table class='noBorder' style='width:435px;'>
 		<tr style='vertical-align:top;'>
 		<td style='vertical-align:top; padding-right:35px;'>
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='orderInformation'><b>Order</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='orderInformation'><b><?php echo _("Order");?></b></label>&nbsp;&nbsp;</span>
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
 			<td>
 				<table class='noBorder' style='width:310px; margin:15px 20px;'>
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='acquisitionTypeID'>Acquisition Type:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='acquisitionTypeID'><?php echo _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect'>
 				<option value=''></option>
@@ -61,22 +61,22 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='orderNumber'>Order Number:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='orderNumber'><?php echo _("Order Number:");?></label></td>
 				<td><input type='text' id='orderNumber' name='orderNumber' value = '<?php echo $resource->orderNumber; ?>' style='width:95px;' class='changeInput' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='systemNumber'>System Number:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='systemNumber'><?php echo _("System Number:");?></label></td>
 				<td><input type='text' id='systemNumber' name='systemNumber' value = '<?php echo $resource->systemNumber; ?>' style='width:95px;' class='changeInput' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentStartDate'>Sub Start:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentStartDate'><?php echo _("Sub Start:");?></label></td>
 				<td><input class='date-pick' id='currentStartDate' name='currentStartDate' value = '<?php echo $startDate; ?>' style='width:75px;' /></td>
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentEndDate'>Current Sub End:</label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentEndDate'><?php _("Current Sub End:");?></label></td>
 				<td><input class='date-pick' id='currentEndDate' name='currentEndDate' value = '<?php echo $endDate; ?>' style='width:75px;' />
 				</td>
 				</tr>
@@ -86,7 +86,7 @@
 				<td style='vertical-align:top;text-align:left;font-weight:bold'>&nbsp;</td>
 				<td>
 				<div class="checkboxes" style='text-align:left;'>
-					<label><input id='subscriptionAlertEnabledInd' type='checkbox' style='text-align:bottom' value='1' <?php if($resource->subscriptionAlertEnabledInd == 1) { echo "checked"; } ?> />&nbsp;<span>Enable Alert</span></label>
+					<label><input id='subscriptionAlertEnabledInd' type='checkbox' style='text-align:bottom' value='1' <?php if($resource->subscriptionAlertEnabledInd == 1) { echo "checked"; } ?> />&nbsp;<span><?php echo _("Enable Alert");?></span></label>
 				</div>
 				</td>
 				</tr>
@@ -108,7 +108,7 @@
 
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='sitePurchaserID'><b>Purchasing Site(s)</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='sitePurchaserID'><b><?php echo _("Purchasing Site(s)");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:350px;'>
 			<tr>
@@ -157,8 +157,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitOrder' id ='submitOrder'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitOrder' id ='submitOrder'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 
diff --git a/ajax_forms/getResourceSubjectForm.php b/ajax_forms/getResourceSubjectForm.php
index 3292d6a..828a635 100644
--- a/ajax_forms/getResourceSubjectForm.php
+++ b/ajax_forms/getResourceSubjectForm.php
@@ -4,15 +4,15 @@
 	$generalSubjectArray = $generalSubject->allAsArray();
 ?>
 		<div id='div_updateForm'>
-		<div class='formTitle' style='width:403px;'><span class='headerText' style='margin-left:7px;'></span>Add General / Detail Subject Link</div>
+		<div class='formTitle' style='width:403px;'><span class='headerText' style='margin-left:7px;'></span><?php echo _("Add General / Detail Subject Link");?></div>
 
 	<?php
 		if (count($generalSubjectArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>General Subject Name</th>
-				<th>Detail Subject Name</th>
+				<th><?php echo _("General Subject Name");?></th>
+				<th><?php echo _("Detail Subject Name");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -24,14 +24,14 @@
 					echo "<tr>";
 					echo "<td>" . $generalSubject->shortName . "</td>";
 					echo "<td></td>";
-					echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . -1 . "'><img src='images/add.gif' alt='add' title='add'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . -1 . "'><img src='images/add.gif' alt='"._("add")."' title='"._("add")."'></a></td>";
 
 					foreach ($generalSubject->getDetailedSubjects() as $detailedSubjects){
 						echo "<tr>";
 						echo "<td></td>";
 						echo "<td>";
 						echo $detailedSubjects->shortName . "</td>";
-						echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . $detailedSubjects->detailedSubjectID . "'><img src='images/add.gif' alt='add' title='add'></a></td>";
+						echo "<td><a href='javascript:void(0);' class='resourcesSubjectLink' resourceID='" . $resourceID . " 'generalSubjectID='" . $ug['generalSubjectID'] . " 'detailSubjectID='" . $detailedSubjects->detailedSubjectID . "'><img src='images/add.gif' alt='"._("add")."' title='"._("add")."'></a></td>";
 						echo "</tr>";
 					}
 					echo "</tr>";
@@ -42,11 +42,11 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 		?>
 
-		<td style='text-align:right'><input type='button' value='cancel' onclick="window.parent.tb_remove(); return false;"></td>
+		<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="window.parent.tb_remove(); return false;"></td>
 		</div>
 
 		<script type="text/javascript" src="js/forms/resourceSubject.js?random=<?php echo rand(); ?>"></script>
diff --git a/ajax_forms/getUpdateProductForm.php b/ajax_forms/getUpdateProductForm.php
index 3f7d112..1a5776e 100644
--- a/ajax_forms/getUpdateProductForm.php
+++ b/ajax_forms/getUpdateProductForm.php
@@ -69,7 +69,7 @@
 		<form id='resourceForm'>
 		<input type='hidden' name='editResourceID' id='editResourceID' value='<?php echo $resourceID; ?>'>
 
-		<div class='formTitle' style='width:715px; margin-bottom:5px;position:relative;'><span class='headerText'>Edit Resource</span></div>
+		<div class='formTitle' style='width:715px; margin-bottom:5px;position:relative;'><span class='headerText'><?php echo _("Edit Resource");?></span></div>
 
 		<span class='smallDarkRedText' id='span_errors'></span>
 
@@ -78,7 +78,7 @@
 		<td style='vertical-align:top;position:relative;' colspan='2'>
 
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Product</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?php echo _("Product");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:710px;'>
 			<tr>
@@ -88,22 +88,22 @@
 				<td style='width:360px;'>
 					<table>
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'>Name:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'><?php echo _("Name:");?></label></td>
 					<td><input type='text' id='titleText' name='titleText' value = "<?php echo $resource->titleText; ?>" style='width:260px;' class='changeInput' /><span id='span_error_titleText' class='smallDarkRedText'></span></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='descriptionText'>Description:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='descriptionText'><?php echo _("Description:");?></label></td>
 					<td><textarea rows='4' id='descriptionText' name='descriptionText' style='width:260px' class='changeInput' ><?php echo $resource->descriptionText; ?></textarea></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceURL'>URL:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceURL'><?php echo _("URL:");?></label></td>
 					<td><input type='text' id='resourceURL' name='resourceURL' value = '<?php echo $resource->resourceURL; ?>' style='width:260px;' class='changeInput'  /></td>
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceAltURL'>Alt URL:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceAltURL'><?php echo _("Alt URL:");?></label></td>
 					<td><input type='text' id='resourceAltURL' name='resourceAltURL' value = '<?php echo $resource->resourceAltURL; ?>' style='width:260px;' class='changeInput'  /></td>
 					</tr>
 
@@ -115,13 +115,13 @@
 
 
 					<tr>
-          <td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'>Parents:</label></td>
+          <td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='titleText'><?php echo _("Parents:");?></label></td>
 					<td>
 
            <span id="newParent">
            <div class="oneParent">
            <input type='text' class='parentResource parentResource_new' name='parentResourceName' value='' style='width:140px;' class='changeInput'  /><input type='hidden' class='parentResource parentResource_new' name='parentResourceID' value='' /><span id='span_error_parentResourceName' class='smallDarkRedText'></span>
-           <a href='#'><img src='images/add.gif' class='addParent' alt='add Parent resource' title='add Parent Resource'></a><br />
+           <a href='#'><img src='images/add.gif' class='addParent' alt='<?php echo _("add Parent resource");?>' title='<?php echo _("add Parent Resource");?>'></a><br />
           </div>
            </span>
            <hr />
@@ -134,7 +134,7 @@
               <div class="oneParent">
               <input type='text' name='parentResourceName' disabled='disabled' value = '<?php echo $parentResourceObj->titleText; ?>' style='width:180px;' class='changeInput'  />
               <input type='hidden' name='parentResourceID' value = '<?php echo $parentResourceObj->resourceID; ?>' />
-              <a href='javascript:void();'><img src='images/cross.gif' alt='remove parent' title='remove parent' class='removeParent' /></a>
+              <a href='javascript:void();'><img src='images/cross.gif' alt='<?php echo _("remove parent");?>' title='<?php echo _("remove parent");?>' class='removeParent' /></a>
             </div>
 <?php
              $i++;
@@ -145,11 +145,11 @@
 					</tr>
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='isbnOrISSN'>ISSN / ISBN:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='isbnOrISSN'><?php echo _("ISSN / ISBN:");?></label></td>
 <td>
           <span id="newIsbn">
            <input type='text' class='isbnOrISSN isbnOrISSN_new' name='isbnOrISSN' value = "" style='width:97px;' class='changeInput'  /><span id='span_errors_isbnOrISSN' class='smallDarkRedText'></span>
-           <a href='javascript:void();'><img src='images/add.gif' class='addIsbn' alt='add Isbn' title='add Isbn'></a><br />
+           <a href='javascript:void();'><img src='images/add.gif' class='addIsbn' alt='<?php echo _("add Isbn");?>' title='<?php echo _("add Isbn");?>'></a><br />
            <hr /><br />
            </span>
            <span id="existingIsbn">
@@ -167,7 +167,7 @@
 
 
 					<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'>Format:</label></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?php echo _("Format:");?></label></td>
 					<td>
 					<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
 					<option value=''></option>
@@ -205,7 +205,7 @@
 					</tr>
 
 					<tr>
-					<td style='text-align:left'><label for='archiveInd'><b>Archived:</b></label></td>
+					<td style='text-align:left'><label for='archiveInd'><b><?php echo _("Archived:");?></b></label></td>
 					<td>
 					<input type='checkbox' id='archiveInd' name='archiveInd' <?php echo $archiveChecked; ?> />
 					</td>
@@ -234,8 +234,8 @@
 
 				<table class='noBorder smallPadding newOrganizationTable' style='width:330px;  margin:15px 20px 0px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:103px;'>Role:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:160px;'>Organization:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:103px;'><?php echo _("Role:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:160px;'><?php echo _("Organization:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -257,7 +257,7 @@
 				</td>
 
 				<td style='vertical-align:top;text-align:left;width:40px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addOrganization' alt='add organization' title='add organization'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addOrganization' alt='<?php echo _("add organization");?>' title='<?php echo _("add organization");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -297,7 +297,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:40px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove organization' title='remove <?php echo $resourceOrganization['shortName']; ?> organization' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt="<?php echo _("remove organization");?>" title='<?php echo _("remove ").$resourceOrganization['shortName']._("organization"); ?>' class='remove' /></a>
 						</td>
 
 						</tr>
@@ -319,7 +319,7 @@
 		</td>
 		<td>
 
-			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b>Aliases</b></label>&nbsp;&nbsp;</span>
+			<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='resourceFormatID'><b><?php echo _("Aliases");?></b></label>&nbsp;&nbsp;</span>
 
 			<table class='surroundBox' style='width:300px;'>
 			<tr>
@@ -327,8 +327,8 @@
 
 				<table class='noBorder smallPadding newAliasTable' style='width:260px; margin:15px 20px 0px 20px;'>
 				<tr>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:98px;'>Type:</td>
-					<td style='vertical-align:top;text-align:left;font-weight:bold;width:125px;'>Alias:</td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:98px;'><?php echo _("Type:");?></td>
+					<td style='vertical-align:top;text-align:left;font-weight:bold;width:125px;'><?php echo _("Alias:");?></td>
 					<td>&nbsp;</td>
 				</tr>
 
@@ -350,7 +350,7 @@
 				</td>
 
 				<td style='vertical-align:center;text-align:left;width:37px;'>
-				<a href='javascript:void();'><img src='images/add.gif' class='addAlias' alt='add this alias' title='add alias'></a>
+				<a href='javascript:void();'><img src='images/add.gif' class='addAlias' alt='<?php echo _("add this alias");?>' title='<?php echo _("add alias");?>'></a>
 				</td>
 				</tr>
 				</table>
@@ -391,7 +391,7 @@
 						</td>
 
 						<td style='vertical-align:top;text-align:left;width:37px;'>
-							<a href='javascript:void();'><img src='images/cross.gif' alt='remove this alias' title='remove this alias' class='remove' /></a>
+							<a href='javascript:void();'><img src='images/cross.gif' alt='<?php echo _("remove this alias");?>' title='<?php echo _("remove this alias");?>' class='remove' /></a>
 						</td>
 						</tr>
 
@@ -420,8 +420,8 @@
 
 		<table class='noBorderTable' style='width:125px;'>
 			<tr>
-				<td style='text-align:left'><input type='button' value='submit' name='submitProductChanges' id ='submitProductChanges'></td>
-				<td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+				<td style='text-align:left'><input type='button' value='<?php echo _("submit");?>' name='submitProductChanges' id ='submitProductChanges'></td>
+				<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 			</tr>
 		</table>
 		<script type="text/javascript" src="js/forms/resourceUpdateForm.js?random=<?php echo rand(); ?>"></script>
diff --git a/ajax_htmldata/getAccessDetails.php b/ajax_htmldata/getAccessDetails.php
index 06654f2..f0363fb 100644
--- a/ajax_htmldata/getAccessDetails.php
+++ b/ajax_htmldata/getAccessDetails.php
@@ -28,11 +28,11 @@
 			<table class='linedFormTable'>
 			<tr>
 			<th colspan='2'>
-			<span style='float:left;vertical-align:bottom;'>Access Information</span>
+			<span style='float:left;vertical-align:bottom;'><?php echo _("Access Information");?></span>
 
 
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><img src='images/edit.gif' alt='edit' title='edit resource'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit resource");?>'></a></span>
 			<?php } ?>
 
 			</th>
@@ -40,21 +40,21 @@
 
 			<?php if (count($administeringSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Administering Sites:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Administering Sites:");?></td>
 				<td style='width:310px;'><?php echo implode(", ", $administeringSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if (count($authorizedSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Authorized Sites:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Authorized Sites:");?></td>
 				<td style='width:310px;'><?php echo implode(", ", $authorizedSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($authenticationType->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Authentication Type:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Authentication Type:");?></td>
 				<td style='width:310px;'><?php echo $authenticationType->shortName; ?></td>
 				</tr>
 			<?php } ?>
@@ -62,14 +62,14 @@
 
 			<?php if (($resource->authenticationUserName) || ($resource->authenticationPassword)) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Username / Password:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Username / Password:");?></td>
 				<td style='width:310px;'><?php echo $resource->authenticationUserName . " / " . $resource->authenticationPassword; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($userLimit->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Simultaneous User Limit:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Simultaneous User Limit:");?></td>
 				<td style='width:310px;'><?php echo $userLimit->shortName; ?></td>
 				</tr>
 			<?php } ?>
@@ -77,7 +77,7 @@
 
 			<?php if ($resource->registeredIPAddressException){ ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Registered IP Address:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Registered IP Address:");?></td>
 				<td style='width:310px;'><?php echo $resource->registeredIPAddressException; ?></td>
 				</tr>
 			<?php } ?>
@@ -85,35 +85,35 @@
 
 			<?php if ($storageLocation->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Storage Location:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Storage Location:");?></td>
 				<td style='width:310px;'><?php echo $storageLocation->shortName; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->coverageText) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Coverage:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Coverage:");?></td>
 				<td style='width:310px;'><?php echo $resource->coverageText; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($accessMethod->shortName) { ?>
 				<tr>
-				<td style='vertical-align:top;width:150px;'>Access Method:</td>
+				<td style='vertical-align:top;width:150px;'><?php echo _("Access Method:");?></td>
 				<td style='width:310px;'><?php echo $accessMethod->shortName; ?></td>
 				</tr>
 			<?php
 			}
 
 			if ((count($administeringSiteArray) == 0) && (!$authenticationType->shortName) && (!$resource->coverageText) && (!$resource->authenticationUserName) && (!$resource->authenticationPassword) && (!$userLimit->shortName) && (!$resource->registeredIPAddressException) && (!$storageLocation->shortName) && (!$accessMethod->shortName)){
-				echo "<tr><td colspan='2'><i>No access information available.</i></td></tr>";
+				echo "<tr><td colspan='2'><i>"._("No access information available").".</i></td></tr>";
 			}
 
 			?>
 			</table>
 
 			<?php if ($user->canEdit()){ ?>
-				<a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'>edit access information</a>
+				<a href='ajax_forms.php?action=getAccessForm&height=394&width=640&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editAccess'><?php echo _("edit access information");?></a>
 			<?php } ?>
 
 			<br /><br /><br />
@@ -156,10 +156,10 @@
 		?>
 			<table class='linedFormTable'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?php echo _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -167,10 +167,10 @@
 					<tr>
 					<td style='width:150px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Access'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Access'><img src='images/cross.gif' alt='<?php echo _("remove note");?>' title='<?php echo _("remove note");?>'></a>
 					<?php } ?>
 					</td>
-					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 					</tr>
 				<?php } ?>
 			</table>
@@ -178,7 +178,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 			<?php
 			}
 		}
diff --git a/ajax_htmldata/getAccountDetails.php b/ajax_htmldata/getAccountDetails.php
index 1c5a33c..879f803 100644
--- a/ajax_htmldata/getAccountDetails.php
+++ b/ajax_htmldata/getAccountDetails.php
@@ -11,20 +11,20 @@
 			foreach ($externalLoginArray as $externalLogin){
 
 				if (($resELFlag == 0) && ($externalLogin['organizationName'] == '')){
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Resource Specific:")."</div>";
 					$resELFlag = 1;
 				}else if (($orgELFlag == 0) && ($externalLogin['organizationName'] != '')){
 					if ($resELFlag == 0){
-						echo "<i>No Resource Specific Accounts</i><br /><br />";
+						echo "<i>"._("No Resource Specific Accounts")."</i><br /><br />";
 					}
 
 					if ($user->canEdit()){ ?>
-						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'>add new account</a>
+						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'><?php echo _("add new account");?></a>
 						<br /><br /><br />
 					<?php
 					}
 
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Inherited:")."</div>";
 					$orgELFlag = 1;
 				}else{
 					echo "<br />";
@@ -41,7 +41,7 @@
 				<span style='float:right;'>
 				<?php
 					if (($user->canEdit()) && ($externalLogin['organizationName'] == '')){ ?>
-						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>&externalLoginID=<?php echo $externalLogin['externalLoginID']; ?>' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit account'></a>  <a href='javascript:void(0);' class='removeAccount' id='<?php echo $externalLogin['externalLoginID']; ?>'><img src='images/cross.gif' alt='remove account' title='remove account'></a>
+						<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>&externalLoginID=<?php echo $externalLogin['externalLoginID']; ?>' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit account");?>'></a>  <a href='javascript:void(0);' class='removeAccount' id='<?php echo $externalLogin['externalLoginID']; ?>'><img src='images/cross.gif' alt='<?php echo _("remove account");?>' title='<?php echo _("remove account");?>'></a>
 						<?php
 					}else{
 						echo "&nbsp;";
@@ -54,7 +54,7 @@
 				<?php if (isset($externalLogin['organizationName'])) { ?>
 				<tr>
 				<td style='vertical-align:top; width:130px;'>Organization:</td>
-				<td><?php echo $externalLogin['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=accounts&organizationID=" . $externalLogin['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Account in Organizations Module' title='Visit Account in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
+				<td><?php echo $externalLogin['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=accounts&organizationID=" . $externalLogin['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("Visit Account in Organizations Module")."' title='"._("Visit Account in Organizations Module")."' style='vertical-align:top;'></a>"; ?></td>
 				</tr>
 				<?php
 				}
@@ -62,14 +62,14 @@
 				if ($externalLogin['loginURL']) { ?>
 				<tr>
 				<td style='vertical-align:top; width:130px;'>Login URL:</td>
-				<td><?php echo $externalLogin['loginURL']; ?>&nbsp;&nbsp;<a href='<?php echo $externalLogin['loginURL']; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Login URL' title='Visit Login URL' style='vertical-align:top;'></a></td>
+				<td><?php echo $externalLogin['loginURL']; ?>&nbsp;&nbsp;<a href='<?php echo $externalLogin['loginURL']; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='<?php echo _("Visit Login URL");?>' title='<?php echo _("Visit Login URL");?>' style='vertical-align:top;'></a></td>
 				</tr>
 				<?php
 				}
 
 				if ($externalLogin['username']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>User Name:</td>
+				<td style='vertical-align:top; width:130px;'><?php echo _("User Name:");?></td>
 				<td><?php echo $externalLogin['username']; ?></td>
 				</tr>
 				<?php
@@ -77,7 +77,7 @@
 
 				if ($externalLogin['password']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Password:</td>
+				<td style='vertical-align:top; width:130px;'><?php echo _("Password:");?></td>
 				<td><?php echo $externalLogin['password']; ?></td>
 				</tr>
 				<?php
@@ -85,7 +85,7 @@
 
 				if ($externalLogin['updateDate']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Last Updated:</td>
+				<td style='vertical-align:top; width:130px;'><?php echo _("Last Updated:");?></td>
 				<td><i><?php echo format_date($externalLogin['updateDate']); ?></i></td>
 				</tr>
 				<?php
@@ -93,7 +93,7 @@
 
 				if ($externalLogin['emailAddress']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Registered Email:</td>
+				<td style='vertical-align:top; width:130px;'><?php echo _("Registered Email:");?></td>
 				<td><?php echo $externalLogin['emailAddress']; ?></td>
 				</tr>
 				<?php
@@ -101,7 +101,7 @@
 
 				if ($externalLogin['noteText']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:130px;'>Notes:</td>
+				<td style='vertical-align:top; width:130px;'><?php echo _("Notes:");?></td>
 				<td><?php echo nl2br($externalLogin['noteText']); ?></td>
 				</tr>
 				<?php
@@ -111,12 +111,12 @@
 			<?php
 			}
 		} else {
-			echo "<i>No accounts available</i><br /><br />";
+			echo "<i>"._("No accounts available")."</i><br /><br />";
 
 		}
 
 		if ($user->canEdit() && ($orgELFlag == 0)){ ?>
-			<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'>add new account</a>
+			<a href='ajax_forms.php?action=getAccountForm&height=314&width=403&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAccount'><?php echo _("add new account");?></a>
 			<br /><br /><br />
 		<?php
 		}
diff --git a/ajax_htmldata/getAcquisitionsDetails.php b/ajax_htmldata/getAcquisitionsDetails.php
index 798a488..6618437 100644
--- a/ajax_htmldata/getAcquisitionsDetails.php
+++ b/ajax_htmldata/getAcquisitionsDetails.php
@@ -95,9 +95,9 @@
 			<table class='linedFormTable' style='width:<?php echo $tableWidth; ?>px;padding:0x;margin:0px;height:100%;'>
 			<tr>
 			<th colspan='2' style='vertical-align:bottom;'>
-			<span style='float:left;vertical-align:bottom;'>Order</span>
+			<span style='float:left;vertical-align:bottom;'><?php echo _("Order");?></span>
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getOrderForm&height=400&width=440&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='edit order information'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getOrderForm&height=400&width=440&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit order information");?>'></a></span>
 			<?php } ?>
 
 			</th>
@@ -105,26 +105,26 @@
 
 			<?php if ($resource->acquisitionTypeID) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Acquisition Type:</td>
+				<td style='vertical-align:top;width:110px;'><?php echo _("Acquisition Type:");?></td>
 				<td style='width:350px;'><?php echo $acquisitionType->shortName; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->orderNumber) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Order Number:</td>
+				<td style='vertical-align:top;width:110px;'><?php echo _("Order Number:");?></td>
 				<td style='width:350px;'><?php echo $resource->orderNumber; ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if ($resource->systemNumber) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>System Number:</td>
+				<td style='vertical-align:top;width:110px;'><?php echo _("System Number:");?></td>
 				<td style='width:350px;'>
 				<?php
 					echo $resource->systemNumber;
 					if ($config->settings->catalogURL != ''){
-						echo "&nbsp;&nbsp;<a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>catalog view</a>";
+						echo "&nbsp;&nbsp;<a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>"._("catalog view")."</a>";
 					}
 				?>
 				</td>
@@ -133,14 +133,14 @@
 
 			<?php if (count($purchaseSiteArray) > 0) { ?>
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Purchasing Sites:</td>
+				<td style='vertical-align:top;width:110px;'><?php echo _("Purchasing Sites:");?></td>
 				<td style='width:350px;'><?php echo implode(", ", $purchaseSiteArray); ?></td>
 				</tr>
 			<?php } ?>
 
 			<?php if (($resource->currentStartDate) && ($resource->currentStartDate != '0000-00-00')) { ?>
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Sub Start:</td>
+			<td style='vertical-align:top;width:110px;'><?php echo _("Sub Start:");?></td>
 			<td style='width:350px;'><?php echo format_date($resource->currentStartDate); ?></td>
 			</tr>
 			<?php } ?>
@@ -149,14 +149,14 @@
 			<tr>
 			<td style='vertical-align:top;width:110px;'>Current Sub End:</td>
 			<td style='width:350px;'><?php echo format_date($resource->currentEndDate); ?>&nbsp;&nbsp;
-			<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>Expiration Alert Enabled</i>"; } ?>
+			<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>"._("Expiration Alert Enabled")."</i>"; } ?>
 			</td>
 			</tr>
 			<?php } ?>
 
 			</table>
 			<?php if ($user->canEdit()){ ?>
-				<a href='ajax_forms.php?action=getOrderForm&height=400&width=440&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit order information</a>
+				<a href='ajax_forms.php?action=getOrderForm&height=400&width=440&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?php echo _("edit order information");?></a>
 			<?php } ?>
 			<br />
 			<br />
@@ -166,31 +166,31 @@
 <thead>
 			<tr>
 			<th colspan='<?php echo $numCols; ?>' style='vertical-align:bottom;'>
-			<span style='float:left;vertical-align:bottom;'>Cost History</span>
+			<span style='float:left;vertical-align:bottom;'><?php echo _("Cost History");?></span>
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getCostForm&height=400&width=<?php echo $formWidth; ?>&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editCost'><img src='images/edit.gif' alt='edit' title='edit cost history'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getCostForm&height=400&width=<?php echo $formWidth; ?>&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editCost'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit cost history");?>'></a></span>
 			<?php } ?>
 
 			</th>
 			</tr>
 			<tr>
 		<?php if ($enhancedCostFlag){ ?>
-			<th>Year</th>
-			<th>Sub Start</th>
-			<th>Sub End</th>
+			<th><?php echo _("Year");?></th>
+			<th><?php echo _("Sub Start");?></th>
+			<th><?php echo _("Sub End");?></th>
 		<?php } ?>
-			<th>Fund</th>
-			<th>Payment</th>
+			<th><?php echo _("Fund");?></th>
+			<th><?php echo _("Payment");?></th>
 		<?php if ($enhancedCostFlag && 0){ ?>
 			<th style='text-align: right'>%</th>
 		<?php } ?>
-			<th>Type</th>
+			<th><?php echo _("Type");?></th>
 		<?php if ($enhancedCostFlag){ ?>
-			<th>Details</th>
+			<th><?php echo _("Details");?></th>
 		<?php } ?>
-			<th>Notes</th>
+			<th><?php echo _("Notes");?></th>
 		<?php if ($enhancedCostFlag){ ?>
-			<th>Invoice</th>
+			<th><?php echo _("Invoice");?></th>
 		<?php } ?>
 			</tr>
 </thead>
@@ -222,35 +222,35 @@
 				?>
 				<tr>
 			<?php if ($enhancedCostFlag){ ?>
-				<td <?php echo $classAdd;?>><?php echo $year; ?></td>
-				<td <?php echo $classAdd;?>><?php echo $subStart; ?></td>
-				<td <?php echo $classAdd;?>><?php echo $subEnd; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $year; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $subStart; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $subEnd; ?></td>
 			<?php } ?>
-				<td <?php echo $classAdd;?>><?php echo $fundName; ?></td>
-				<td <?php echo $classAdd;?>><?php echo $cost; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $fundName; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $cost; ?></td>
 			<?php if ($enhancedCostFlag && 0){ ?>
 				<td <?php echo $classAdd;?> style='text-align: right'><?php echo $payment['amountChange']; ?></td>
 			<?php } ?>
-				<td <?php echo $classAdd;?>><?php echo $payment['orderType']; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $payment['orderType']; ?></td>
 			<?php if ($enhancedCostFlag){ ?>
-				<td <?php echo $classAdd;?>><?php echo $costDetails; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $costDetails; ?></td>
 			<?php } ?>
-				<td <?php echo $classAdd;?>><?php echo $costNote; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $costNote; ?></td>
 			<?php if ($enhancedCostFlag){ ?>
-				<td <?php echo $classAdd;?>><?php echo $invoiceNum; ?></td>
+				<td <?php echo $classAdd;?> ><?php echo $invoiceNum; ?></td>
 			<?php } ?>
 				</tr>
 
 				<?php
 				}
 			}else{
-				echo "<tr><td colspan='" . $numCols . "'><i>No payment information available.</i></td></tr>";
+				echo "<tr><td colspan='" . $numCols . "'><i>"._("No payment information available").".</i></td></tr>";
 			}
 			?>
 </tbody>
 			</table>
 			<?php if ($user->canEdit()){ ?>
-				<a href='ajax_forms.php?action=getCostForm&height=400&width=<?php echo $formWidth; ?>&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit cost history</a>
+				<a href='ajax_forms.php?action=getCostForm&height=400&width=<?php echo $formWidth; ?>&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?php echo _("edit cost history");?></a>
 			<?php } ?>
 			<br />
 			<br />
@@ -259,24 +259,24 @@
 			<table class='linedFormTable' style='width:<?php echo $tableWidth; ?>px;padding:0x;margin:0px;height:100%;'>
 			<tr>
 			<th colspan='2'>
-			<span style='float:left;vertical-align:bottom;'>License</span>
+			<span style='float:left;vertical-align:bottom;'><?php echo _("License");?></span>
 			<?php if ($user->canEdit()){ ?>
-				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getLicenseForm&height=420&width=385&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editLicense'><img src='images/edit.gif' alt='edit' title='edit resource'></a></span>
+				<span style='float:right;vertical-align:bottom;'><a href='ajax_forms.php?action=getLicenseForm&height=420&width=385&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editLicense'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit resource");?>'></a></span>
 			<?php } ?>
 			</th>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Status:</td>
+			<td style='vertical-align:top;width:110px;'><?php echo _("Status:");?></td>
 			<td style='width:350px;'>
 
 			<?php
 			if (count($licenseStatusArray) > 0){
 				foreach ($licenseStatusArray as $licenseStatus){
-					echo $licenseStatus['licenseStatus'] . " on <i>" . format_date($licenseStatus['licenseStatusChangeDate']) . " by " . $licenseStatus['changeName'] . "</i><br />";
+					echo $licenseStatus['licenseStatus'] . _(" on ")."<i>" . format_date($licenseStatus['licenseStatusChangeDate']) . _(" by ") . $licenseStatus['changeName'] . "</i><br />";
 				}
 			}else{
-				echo "<i>No license status information available.</i>";
+				echo "<i>"._("No license status information available.")."</i>";
 			}
 
 			?>
@@ -286,16 +286,16 @@
 			<?php if ($config->settings->licensingModule == "Y"){ ?>
 
 			<tr>
-			<td style='vertical-align:top;width:110px;'>Licenses:</td>
+			<td style='vertical-align:top;width:110px;'><?php echo _("Licenses:");?></td>
 			<td style='width:350px;'>
 			<?php
 
 			if (count($licenseArray) > 0){
 				foreach ($licenseArray as $license){
-					echo $license['license'] . "&nbsp;&nbsp;<a href='" . $util->getLicensingURL() . $license['licenseID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='View License' title='View License' style='vertical-align:top;'></a><br />";
+					echo $license['license'] . "&nbsp;&nbsp;<a href='" . $util->getLicensingURL() . $license['licenseID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("View License")."' title='"._("View License")."' style='vertical-align:top;'></a><br />";
 				}
 			}else{
-				echo "<i>No associated licenses available.</i>";
+				echo "<i>"._("No associated licenses available.")."</i>";
 			}
 
 			?>
@@ -309,9 +309,9 @@
 			</table>
 			<?php if ($user->canEdit()){ ?>
 				<?php if ($config->settings->licensingModule == "Y"){ ?>
-					<a href='ajax_forms.php?action=getLicenseForm&height=420&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit license and status</a>
+					<a href='ajax_forms.php?action=getLicenseForm&height=420&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?php echo _("edit license and status");?></a>
 				<?php }else{ ?>
-					<a href='ajax_forms.php?action=getLicenseForm&height=300&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'>edit license status</a>
+					<a href='ajax_forms.php?action=getLicenseForm&height=300&width=378&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?php echo _("edit license status");?></a>
 				<?php } ?>
 			<?php } ?>
 			<br /><br /><br /><br />
@@ -353,10 +353,10 @@
 		?>
 			<table class='linedFormTable' style='width:<?php echo $tableWidth; ?>px;padding:0x;margin:0px;height:100%;'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?php echo _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -364,10 +364,10 @@
 					<tr>
 					<td style='width:110px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Acquisitions'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Acquisitions'><img src='images/cross.gif' alt='<?php echo _("remove note");?>' title='<?php echo _("remove note");?>'></a>
 					<?php } ?>
 					</td>
-					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 					</tr>
 				<?php } ?>
 			</table>
@@ -375,7 +375,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Acquisitions&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 			<?php
 			}
 		}
diff --git a/ajax_htmldata/getAdminAlertDisplay.php b/ajax_htmldata/getAdminAlertDisplay.php
index 630bdf6..979227f 100644
--- a/ajax_htmldata/getAdminAlertDisplay.php
+++ b/ajax_htmldata/getAdminAlertDisplay.php
@@ -7,13 +7,13 @@
 		$emailAddressArray = $alertEmailAddress->allAsArray();
 		$daysInAdvanceArray = $alertDaysInAdvance->allAsArray();
 
-		echo "<div class='adminRightHeader'>Alert Settings</div>";
+		echo "<div class='adminRightHeader'>"._("Alert Settings")."</div>";
 
 		if (count($emailAddressArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Email Address</th>
+				<th style='width:100%;'><?php echo _("Email Address");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -22,8 +22,8 @@
 				foreach($emailAddressArray as $emailAddress) {
 					echo "<tr>";
 					echo "<td>" . $emailAddress['emailAddress'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=" . $emailAddress['alertEmailAddressID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteAlert(\"AlertEmailAddress\", " . $emailAddress['alertEmailAddressID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=" . $emailAddress['alertEmailAddressID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteAlert(\"AlertEmailAddress\", " . $emailAddress['alertEmailAddressID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -32,10 +32,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'>add email address</a>";
+		echo "<a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'>"._("add email address")."</a>";
 		echo "<br /><br /><br />";
 
 
@@ -43,7 +43,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Days in advance of expiration</th>
+				<th style='width:100%;'><?php echo _("Days in advance of expiration");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -52,8 +52,8 @@
 				foreach($daysInAdvanceArray as $daysInAdvance) {
 					echo "<tr>";
 					echo "<td>" . $daysInAdvance['daysInAdvanceNumber'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=" . $daysInAdvance['alertDaysInAdvanceID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteAlert(\"AlertDaysInAdvance\", " . $daysInAdvance['alertDaysInAdvanceID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=" . $daysInAdvance['alertDaysInAdvanceID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteAlert(\"AlertDaysInAdvance\", " . $daysInAdvance['alertDaysInAdvanceID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -62,13 +62,13 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 
 
 
-		echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'>add days</a>";
+		echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'>"._("add days")."</a>";
 
 ?>
 
diff --git a/ajax_htmldata/getAdminCurrencyDisplay.php b/ajax_htmldata/getAdminCurrencyDisplay.php
index ce70223..0b7a3c2 100644
--- a/ajax_htmldata/getAdminCurrencyDisplay.php
+++ b/ajax_htmldata/getAdminCurrencyDisplay.php
@@ -5,14 +5,14 @@
 
 		$instanceArray = $obj->allAsArray();
 
-		echo "<div class='adminRightHeader'>Currency</div>";
+		echo "<div class='adminRightHeader'>"._("Currency")."</div>";
 
 		if (count($instanceArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:25px;'>Code</th>
-				<th style='width:100%;'>Name</th>
+				<th style='width:25px;'><?php echo _("Code");?></th>
+				<th style='width:100%;'><?php echo _("Name");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -22,8 +22,8 @@
 					echo "<tr>";
 					echo "<td>" . $instance['currencyCode'] . "</td>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=" . $instance['currencyCode'] . "&height=178&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteCurrency(\"Currency\", \"" . $instance['currencyCode'] . "\");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=" . $instance['currencyCode'] . "&height=178&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteCurrency(\"Currency\", \"" . $instance['currencyCode'] . "\");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -35,7 +35,7 @@
 			echo "(none found)<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=&height=178&width=260&modal=true' class='thickbox'>add new currency</a>";
+		echo "<a href='ajax_forms.php?action=getAdminCurrencyUpdateForm&updateID=&height=178&width=260&modal=true' class='thickbox'>"._("add new currency")."</a>";
 
 ?>
 
diff --git a/ajax_htmldata/getAdminDisplay.php b/ajax_htmldata/getAdminDisplay.php
index 78e4743..a7d5b85 100644
--- a/ajax_htmldata/getAdminDisplay.php
+++ b/ajax_htmldata/getAdminDisplay.php
@@ -13,7 +13,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?php echo _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -22,8 +22,8 @@
 				foreach($instanceArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -32,10 +32,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
 
 ?>
 
diff --git a/ajax_htmldata/getAdminSubjectDisplay.php b/ajax_htmldata/getAdminSubjectDisplay.php
index fb66fc0..e2391ae 100644
--- a/ajax_htmldata/getAdminSubjectDisplay.php
+++ b/ajax_htmldata/getAdminSubjectDisplay.php
@@ -25,9 +25,9 @@
 
 						$generalSubject = new GeneralSubject();
 						if ($generalSubject->inUse($instance[lcfirst("GeneralSubject") . 'ID']) == 0) {
-							echo "<td><a href='javascript:deleteGeneralSubject(\"GeneralSubject\", " . $instance[lcfirst("GeneralSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+							echo "<td><a href='javascript:deleteGeneralSubject(\"GeneralSubject\", " . $instance[lcfirst("GeneralSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 						} else {
-							echo "<td><img src='images/do_not_enter.png' alt='subject in use' title='subject in use' /></td>";
+							echo "<td><img src='images/do_not_enter.png' alt='"._("subject in use")."' title='"._("subject in use")."' /></td>";
 						}
 
 					echo "</tr>";
@@ -38,23 +38,23 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . "GeneralSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("GeneralSubject"))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . "GeneralSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("GeneralSubject"))) . "</a>";
 
 		?>
 
 		<br /><br />
 
 		<?php
-		echo "<div class='adminRightHeader'>Detailed Subject</div>";
+		echo "<div class='adminRightHeader'>"._("Detailed Subject")."</div>";
 
 		if (count($detailedSubjectArray) > 0){
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?php echo _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -63,12 +63,12 @@
 				foreach($detailedSubjectArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=" . $instance[lcfirst("DetailedSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=" . $instance[lcfirst("DetailedSubject") . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
 						$detailedSubject = new DetailedSubject();
 						if ($detailedSubject->inUse($instance[lcfirst("DetailedSubject") . 'ID'], -1) == 0) {
-									echo "<td><a href='javascript:deleteDetailedSubject(\"DetailedSubject\", " . $instance[lcfirst("DetailedSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+									echo "<td><a href='javascript:deleteDetailedSubject(\"DetailedSubject\", " . $instance[lcfirst("DetailedSubject") . 'ID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 						} else {
-							echo "<td><img src='images/do_not_enter.png' alt='subject in use' title='subject in use' /></td>";
+							echo "<td><img src='images/do_not_enter.png' alt='"._("subject in use")."' title='"._("subject in use")."' /></td>";
 						}
 					echo "</tr>";
 				}
@@ -78,10 +78,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("DetailedSubject"))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getDetailSubjectUpdateForm&className=" . "DetailedSubject" . "&updateID=&height=145&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst("DetailedSubject"))) . "</a>";
 
 		?>
 
@@ -89,14 +89,14 @@
 
 		<?php
 
-		echo "<div class='adminRightHeader'>Subject Relationships</div>";
+		echo "<div class='adminRightHeader'>"._("Subject Relationships")."</div>";
 
 		if (count($generalSubjectArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>General Subject</th>
-				<th>Detailed Subject</th>
+				<th><?php echo _("General Subject");?></th>
+				<th><?php echo _("Detailed Subject");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -112,7 +112,7 @@
 						echo $detailedSubjects->shortName . "<br />";
 					}
 					echo "</td>";
-					echo "<td><a href='ajax_forms.php?action=getGeneralDetailSubjectForm&generalSubjectID=" . $generalSubject->generalSubjectID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getGeneralDetailSubjectForm&generalSubjectID=" . $generalSubject->generalSubjectID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -121,7 +121,7 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 ?>
diff --git a/ajax_htmldata/getAdminUserDisplay.php b/ajax_htmldata/getAdminUserDisplay.php
index 4d870a0..fd417be 100644
--- a/ajax_htmldata/getAdminUserDisplay.php
+++ b/ajax_htmldata/getAdminUserDisplay.php
@@ -19,12 +19,12 @@
 			<div class="adminRightHeader">Users</div>
 			<table class='linedDataTable' style='width:570px;margin-bottom:5px;'>
 				<tr>
-				<th>Login ID</td>
-				<th>First Name</td>
-				<th>Last Name</td>
-				<th>Privilege</td>
-				<th>View Accounts</td>
-				<th>Email Address</td>
+				<th><?php echo _("Login ID");?></td>
+				<th><?php echo _("First Name");?></td>
+				<th><?php echo _("Last Name");?></td>
+				<th><?php echo _("Privilege");?></td>
+				<th><?php echo _("View Accounts");?></td>
+				<th><?php echo _("Email Address");?></td>
 				<th>&nbsp;</td>
 				<th>&nbsp;</td>
 				</tr>
@@ -44,18 +44,18 @@
 					echo "<td>" . $instance['priv'] . "</td>";
 					echo "<td>" . $accountTab . "</td>";
 					echo "<td>" . $instance['emailAddress'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit user'></a></td>";
-					echo "<td><a href='javascript:deleteUser(\"" . $instance['loginID'] . "\")'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=" . $instance['loginID'] . "&height=275&width=315&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit user")."'></a></td>";
+					echo "<td><a href='javascript:deleteUser(\"" . $instance['loginID'] . "\")'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
 				?>
 			</table>
-			<a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>add new user</a>
+			<a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'><?php echo _("add new user");?></a>
 			<?php
 
 		}else{
-			echo "(none found)<br /><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>add new user</a>";
+			echo _("(none found)")."<br /><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'>"._("add new user")."</a>";
 		}
 
 ?>
diff --git a/ajax_htmldata/getAdminWorkflowDisplay.php b/ajax_htmldata/getAdminWorkflowDisplay.php
index cd28c44..a8a197e 100644
--- a/ajax_htmldata/getAdminWorkflowDisplay.php
+++ b/ajax_htmldata/getAdminWorkflowDisplay.php
@@ -7,15 +7,15 @@
 		$userGroupArray = $userGroup->allAsArray();
 
 
-		echo "<div class='adminRightHeader'>Workflow Setup</div>";
+		echo "<div class='adminRightHeader'>"._("Workflow Setup")."</div>";
 
 		if (count($workflowArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>Acquisition Type</th>
-				<th>Resource Format</th>
-				<th>Resource Type</th>
+				<th><?php echo _("Acquisition Type");?></th>
+				<th><?php echo _("Resource Format");?></th>
+				<th><?php echo _("Resource Type");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -36,8 +36,8 @@
 					echo "<td>" . $acquisitionType->shortName . "</td>";
 					echo "<td>" . $resourceFormat->shortName . "</td>";
 					echo "<td>" . $rtName . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=" . $wf['workflowID'] . "&height=528&width=750&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteWorkflow(\"Workflow\", " . $wf['workflowID'] . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=" . $wf['workflowID'] . "&height=528&width=750&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteWorkflow(\"Workflow\", " . $wf['workflowID'] . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -46,14 +46,14 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 		//user groups are required to set workflows up so display this message if there arent any
 		if (count($userGroupArray) >0){
-			echo "<a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=&height=528&width=750&modal=true' class='thickbox'>add workflow</a>";
+			echo "<a href='ajax_forms.php?action=getAdminWorkflowForm&workflowID=&height=528&width=750&modal=true' class='thickbox'>"._("add workflow")."</a>";
 		}else{
-			echo "<i>You must set up at least one user group before you can add workflows</i>";
+			echo "<i>"._("You must set up at least one user group before you can add workflows")."</i>";
 		}
 
 		?>
@@ -63,15 +63,15 @@
 
 		<?php
 
-		echo "<div class='adminRightHeader'>User Group Setup</div>";
+		echo "<div class='adminRightHeader'>"._("User Group Setup")."</div>";
 
 		if (count($userGroupArray) > 0){
 			?>
 			<table class='linedDataTable' style='width:100%'>
 				<tr>
-				<th>Group Name</th>
-				<th>Email Address</th>
-				<th>Users</th>
+				<th><?php echo _("Group Name");?></th>
+				<th><?php echo _("Email Address");?></th>
+				<th><?php echo _("Users");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -87,8 +87,8 @@
 						echo $groupUser->getDisplayName . "<br />";
 					}
 					echo "</td>";
-					echo "<td><a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=" . $userGroup->userGroupID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:deleteWorkflow(\"UserGroup\", " . $userGroup->userGroupID . ");'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=" . $userGroup->userGroupID . "&height=400&width=305&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:deleteWorkflow(\"UserGroup\", " . $userGroup->userGroupID . ");'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -97,11 +97,11 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
 
-		echo "<a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=&height=400&width=305&modal=true' class='thickbox'>add user group</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUserGroupForm&userGroupID=&height=400&width=305&modal=true' class='thickbox'>"._("add user group")."</a>";
 
 ?>
 
diff --git a/ajax_htmldata/getAttachmentDetails.php b/ajax_htmldata/getAttachmentDetails.php
index 1328c07..1109d81 100644
--- a/ajax_htmldata/getAttachmentDetails.php
+++ b/ajax_htmldata/getAttachmentDetails.php
@@ -27,12 +27,12 @@
 				<th colspan='2'>
 					<span style='float:left; vertical-align:bottom;'>
 						<?php echo $attachment['shortName']; ?>&nbsp;&nbsp;
-						<a href='attachments/<?php echo $attachment['attachmentURL']; ?>' style='font-weight:normal;' target='_blank'><img src='images/arrow-up-right-blue.gif' alt='view attachment' title='view attachment' style='vertical-align:top;'></a></a>
+						<a href='attachments/<?php echo $attachment['attachmentURL']; ?>' style='font-weight:normal;' target='_blank'><img src='images/arrow-up-right-blue.gif' alt='<?php echo _("view attachment");?>' title='<?php echo _("view attachment");?>' style='vertical-align:top;'></a></a>
 					</span>
 					<span style='float:right;'>
 					<?php
 						if ($user->canEdit()){ ?>
-							<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&attachmentID=<?php echo $attachment['attachmentID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit attachment'></a>  <a href='javascript:void(0);' class='removeAttachment' id='<?php echo $attachment['attachmentID']; ?>'><img src='images/cross.gif' alt='remove this attachment' title='remove this attachment'></a>
+							<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&attachmentID=<?php echo $attachment['attachmentID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit attachment");?>'></a>  <a href='javascript:void(0);' class='removeAttachment' id='<?php echo $attachment['attachmentID']; ?>'><img src='images/cross.gif' alt='<?php echo _("remove this attachment");?>' title='<?php echo _("remove this attachment");?>'></a>
 							<?php
 						}else{
 							echo "&nbsp;";
@@ -44,7 +44,7 @@
 
 				<?php if ($attachment['attachmentTypeShortName']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Type:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Type:");?></td>
 				<td style='vertical-align:top; width:350px;'><?php echo $attachment['attachmentTypeShortName']; ?></td>
 				</tr>
 				<?php
@@ -52,7 +52,7 @@
 
 				if ($attachment['descriptionText']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Details:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Details:");?></td>
 				<td style='vertical-align:top; width:350px;'><?php echo $attachment['descriptionText']; ?></td>
 				</tr>
 				<?php
@@ -64,12 +64,12 @@
 			<?php
 			}
 		} else {
-			echo "<i>No attachments available</i><br /><br />";
+			echo "<i>"._("No attachments available")."</i><br /><br />";
 		}
 
 		if ($user->canEdit()){
 		?>
-		<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAttachment'>add new attachment</a><br /><br />
+		<a href='ajax_forms.php?action=getAttachmentForm&height=305&width=360&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newAttachment'><?php echo _("add new attachment");?></a><br /><br />
 		<?php
 		}
 ?>
diff --git a/ajax_htmldata/getContactDetails.php b/ajax_htmldata/getContactDetails.php
index 6c8ba7b..59dda44 100644
--- a/ajax_htmldata/getContactDetails.php
+++ b/ajax_htmldata/getContactDetails.php
@@ -20,7 +20,7 @@
 			//if we want archives to be displayed
 			if ($showArchivesInd == "1"){
 				if (count($resource->getArchivedContacts()) > 0){
-					echo "<i><b>The following are archived contacts:</b></i>";
+					echo "<i><b>"._("The following are archived contacts:")."</b></i>";
 				}
 				$contactArray = $resource->getArchivedContacts();
 			}
@@ -32,20 +32,20 @@
 		if (count($contactArray) > 0){
 			foreach ($contactArray as $contact){
 				if (($resContactFlag == 0) && (!isset($contact['organizationName']))){
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Resource Specific:")."</div>";
 					$resContactFlag = 1;
 				}else if (($orgContactFlag == 0) && (isset($contact['organizationName']))){
 					if ($resContactFlag == 0){
-						echo "<i>No Resource Specific Contacts</i><br /><br />";
+						echo "<i>"._("No Resource Specific Contacts")."</i><br /><br />";
 					}
 
 					if ($user->canEdit() && ($archiveInd != 1) && ($showArchivesInd != 1)){ ?>
-						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?php echo _("add contact");?></a>
 						<br /><br /><br />
 					<?php
 					}
 
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>"._("Inherited:")."</div>";
 					$orgContactFlag = 1;
 				}else{
 					echo "<br />";
@@ -65,8 +65,8 @@
 				<span style='float:right;vertical-align:top;'>
 				<?php
 					if (($user->canEdit()) && (!isset($contact['organizationName']))){
-						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit contact'></a>";
-						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='remove note' title='remove contact'></a>";
+						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit contact")."'></a>";
+						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='"._("remove note")."' title='"._("remove contact")."'></a>";
 					}else{
 						echo "&nbsp;";
 					}
@@ -80,8 +80,8 @@
 				if (isset($contact['organizationName'])){ ?>
 
 				<tr>
-				<td style='vertical-align:top;width:110px;'>Organization:</td>
-				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Contact in Organizations Module' title='Visit Contact in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
+				<td style='vertical-align:top;width:110px;'><?php echo _("Organization:");?></td>
+				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("Visit Contact in Organizations Module")."' title='"._("Visit Contact in Organizations Module")."' style='vertical-align:top;'></a>"; ?></td>
 				</tr>
 
 				<?php
@@ -89,7 +89,7 @@
 
 				if (($contact['archiveDate'] != '0000-00-00') && ($contact['archiveDate'])) { ?>
 				<tr>
-				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'>No longer valid:</td>
+				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'><?php echo _("No longer valid:");?></td>
 				<td style='background-color:#ebebeb'><i><?php echo format_date($contact['archiveDate']); ?></i></td>
 				</tr>
 				<?php
@@ -97,7 +97,7 @@
 
 				if ($contact['title']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Title:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Title:");?></td>
 				<td><?php echo $contact['title']; ?></td>
 				</tr>
 				<?php
@@ -105,7 +105,7 @@
 
 				if ((isset($contact['addressText'])) && ($contact['addressText'] != '')){ ?>
 					<tr>
-					<td style='vertical-align:top; width:110px;'>Address:</td>
+					<td style='vertical-align:top; width:110px;'><?php echo _("Address:");?></td>
 					<td><?php echo nl2br($contact['addressText']); ?></td>
 					</tr>
 				<?php
@@ -113,7 +113,7 @@
 
 				if ((isset($contact['state']) || (isset($contact['country']))) && (($contact['state'] != '') || ($contact['country'] != ''))){ ?>
 					<tr>
-					<td style='vertical-align:top; width:110px;'>Location:</td>
+					<td style='vertical-align:top; width:110px;'><?php echo _("Location:");?></td>
 					<td><?php
 						if (!($contact['state'])) {
 							echo $contact['country'];
@@ -130,7 +130,7 @@
 
 				if ($contact['phoneNumber']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Phone:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Phone:");?></td>
 				<td><?php echo $contact['phoneNumber']; ?></td>
 				</tr>
 				<?php
@@ -138,7 +138,7 @@
 
 				if ($contact['altPhoneNumber']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Alt Phone:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Alt Phone:");?></td>
 				<td><?php echo $contact['altPhoneNumber']; ?></td>
 				</tr>
 				<?php
@@ -146,7 +146,7 @@
 
 				if ($contact['faxNumber']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Fax:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Fax:");?></td>
 				<td><?php echo $contact['faxNumber']; ?></td>
 				</tr>
 				<?php
@@ -154,7 +154,7 @@
 
 				if ($contact['emailAddress']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Email:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Email:");?></td>
 				<td><a href='mailto:<?php echo $contact['emailAddress']; ?>'><?php echo $contact['emailAddress']; ?></a></td>
 				</tr>
 				<?php
@@ -162,7 +162,7 @@
 
 				if ($contact['noteText']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Notes:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Notes:");?></td>
 				<td><?php echo nl2br($contact['noteText']); ?></td>
 				</tr>
 				<?php
@@ -170,7 +170,7 @@
 
 				if ($contact['lastUpdateDate']) { ?>
 				<tr>
-				<td style='vertical-align:top; width:110px;'>Last Updated:</td>
+				<td style='vertical-align:top; width:110px;'><?php echo _("Last Updated:");?></td>
 				<td><i><?php echo format_date($contact['lastUpdateDate']); ?></i></td>
 				</tr>
 				<?php
@@ -184,7 +184,7 @@
 
 
 			if ($user->canEdit() && ($orgContactFlag == 0) && ($showArchivesInd != 1)){ ?>
-				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?php echo _("add contact");?></a>
 				<br /><br /><br />
 			<?php
 			}
@@ -192,9 +192,9 @@
 
 		} else {
 			if (($archiveInd != 1) && ($showArchivesInd != 1)){
-				echo "<i>No contacts available</i><br /><br />";
+				echo "<i>"._("No contacts available")."</i><br /><br />";
 				if (($user->canEdit())){ ?>
-					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'><?php echo _("add contact");?></a>
 					<br /><br /><br />
 				<?php
 				}
@@ -202,11 +202,11 @@
 		}
 
 		if (($showArchivesInd == "0") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i>" . count($resource->getArchivedContacts()) . " archived contact(s) available.  <a href='javascript:updateArchivedContacts(1);'>show archived contacts</a></i><br />";
+			echo "<i>" . count($resource->getArchivedContacts()) . _(" archived contact(s) available.")."  <a href='javascript:updateArchivedContacts(1);'>"._("show archived contacts")."</a></i><br />";
 		}
 
 		if (($showArchivesInd == "1") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i><a href='javascript:updateArchivedContacts(0);'>hide archived contacts</a></i><br />";
+			echo "<i><a href='javascript:updateArchivedContacts(0);'>"._("hide archived contacts")."</a></i><br />";
 		}
 
 		echo "<br /><br />";
diff --git a/ajax_htmldata/getGeneralSubjectDisplay.php b/ajax_htmldata/getGeneralSubjectDisplay.php
index 2a71a9f..58e41f5 100644
--- a/ajax_htmldata/getGeneralSubjectDisplay.php
+++ b/ajax_htmldata/getGeneralSubjectDisplay.php
@@ -13,7 +13,7 @@
 			?>
 			<table class='linedDataTable'>
 				<tr>
-				<th style='width:100%;'>Value</th>
+				<th style='width:100%;'><?php echo _("Value");?></th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				</tr>
@@ -22,8 +22,8 @@
 				foreach($instanceArray as $instance) {
 					echo "<tr>";
 					echo "<td>" . $instance['shortName'] . "</td>";
-					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit'></a></td>";
-					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='remove' title='remove'></a></td>";
+					echo "<td><a href='ajax_forms.php?action=getGeneralSubjectUpdateForm&className=" . $className . "&updateID=" . $instance[lcfirst($className) . 'ID'] . "&height=128&width=260&modal=true' class='thickbox'><img src='images/edit.gif' alt='"._("edit")."' title='"._("edit")."'></a></td>";
+					echo "<td><a href='javascript:void(0);' class='removeData' cn='" . $className . "' id='" . $instance[lcfirst($className) . 'ID'] . "'><img src='images/cross.gif' alt='"._("remove")."' title='"._("remove")."'></a></td>";
 					echo "</tr>";
 				}
 
@@ -32,10 +32,10 @@
 			<?php
 
 		}else{
-			echo "(none found)<br />";
+			echo _("(none found)")."<br />";
 		}
 
-		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>add new " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
+		echo "<a href='ajax_forms.php?action=getAdminUpdateForm&className=" . $className . "&updateID=&height=128&width=260&modal=true' class='thickbox'>"._("add new ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . "</a>";
 
 ?>
 
diff --git a/ajax_htmldata/getOutstandingQueue.php b/ajax_htmldata/getOutstandingQueue.php
index a80035b..34d6e12 100644
--- a/ajax_htmldata/getOutstandingQueue.php
+++ b/ajax_htmldata/getOutstandingQueue.php
@@ -4,23 +4,23 @@
 		$resourceArray = array();
 		$resourceArray = $user->getOutstandingTasks();
 
-		echo "<div class='adminRightHeader'>Outstanding Tasks</div>";
+		echo "<div class='adminRightHeader'>"._("Outstanding Tasks")."</div>";
 
 
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No outstanding requests</i>";
+			echo "<i>"._("No outstanding requests")."</i>";
 		}else{
 		?>
 
 
 			<table class='dataTable' style='width:646px;padding:0x;margin:0px;height:100%;'>
 			<tr>
-				<th style='width:45px;'>ID</th>
-				<th style='width:300px;'>Name</th>
-				<th style='width:95px;'>Acquisition Type</th>
-				<th style='width:125px;'>Routing Step</th>
-				<th style='width:75px;'>Start Date</th>
+				<th style='width:45px;'><?php echo _("ID");?></th>
+				<th style='width:300px;'><?php echo _("Name");?></th>
+				<th style='width:95px;'><?php echo _("Acquisition Type");?></th>
+				<th style='width:125px;'><?php echo _("Routing Step");?></th>
+				<th style='width:75px;'><?php echo _("Start Date");?></th>
 			</tr>
 
 		<?php
diff --git a/ajax_htmldata/getProductDetails.php b/ajax_htmldata/getProductDetails.php
index b746da9..e1ca934 100644
--- a/ajax_htmldata/getProductDetails.php
+++ b/ajax_htmldata/getProductDetails.php
@@ -66,18 +66,18 @@
 			<th colspan='2' style='margin-top: 7px; margin-bottom: 5px;'>
 			<span style='float:left; vertical-align:top; max-width:400px; margin-left:3px;'><span style='font-weight:bold;font-size:120%;margin-right:8px;'><?php echo $resource->titleText; ?></span><span style='font-weight:normal;font-size:100%;'><?php echo $acquisitionType->shortName . " " . $resourceFormat->shortName . " " . $resourceType->shortName; ?></span></span>
 
-      <span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit resource'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='remove resource' title='remove resource'></a> <a href='javascript:void(0);' class='removeResourceAndChildren' id='<?php echo $resourceID; ?>'><img src='images/deleteall.png' alt='remove resource and its children' title='remove resource and its children'></a><?php } ?></span>
+      <span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit resource");?>'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?php echo _("remove resource");?>' title='<?php echo _("remove resource");?>'></a> <a href='javascript:void(0);' class='removeResourceAndChildren' id='<?php echo $resourceID; ?>'><img src='images/deleteall.png' alt='<?php echo _("remove resource and its children");?>' title='<?php echo ("remove resource and its children");?>'></a><?php } ?></span>
 
 			</th>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Record ID:</td>
+			<td style='vertical-align:top;width:115px;'><?php echo _("Record ID:");?></td>
 			<td style='width:345px;'><?php echo $resource->resourceID; ?></td>
 			</tr>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Status:</td>
+			<td style='vertical-align:top;width:115px;'><?php echo _("Status:");?></td>
 			<td style='width:345px;'><?php echo $status->shortName; ?></td>
 			</tr>
 
@@ -87,7 +87,7 @@
 
 				<tr class='lightGrayBackground'>
 				<td>
-				Archived:
+				<?php echo _("Archived:");?>
 				</td>
 				<td>
 				<i>
@@ -96,9 +96,9 @@
 					echo format_date($resource->archiveDate);
 
 					if ($archiveUser->getDisplayName){
-						echo " by " . $archiveUser->getDisplayName;
+						echo _(" by ") . $archiveUser->getDisplayName;
 					}else if ($resource->archiveLoginID){
-						echo " by " . $resource->archiveLoginID;
+						echo _(" by ") . $resource->archiveLoginID;
 					}
 				?>
 
@@ -112,7 +112,7 @@
 
 			<tr>
 			<td>
-			Created:
+			<?php echo _("Created:");?>
 			</td>
 			<td>
 			<i>
@@ -121,9 +121,9 @@
 					echo format_date($resource->createDate);
 
 					if ($createUser->getDisplayName){
-						echo " by " . $createUser->getDisplayName;
+						echo _(" by ") . $createUser->getDisplayName;
 					}else if ($resource->createLoginID){
-						echo " by " . $resource->createLoginID;
+						echo _(" by ") . $resource->createLoginID;
 					}
 				?>
 
@@ -137,7 +137,7 @@
 
 				<tr>
 				<td>
-				Last Update:
+				<?php echo _("Last Update:");?>
 				</td>
 				<td>
 				<i>
@@ -145,9 +145,9 @@
 					echo format_date($resource->updateDate);
 
 					if ($updateUser->getDisplayName){
-						echo " by " . $updateUser->getDisplayName;
+						echo _(" by ") . $updateUser->getDisplayName;
 					}else if ($resource->updateLoginID){
-						echo " by " . $resource->updateLoginID;
+						echo _(" by ") . $resource->updateLoginID;
 					}
 				?>
 				</i>
@@ -162,7 +162,7 @@
 
       if ((count($parentResourceArray) > 0) || (count($childResourceArray) > 0)){ ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Related Products:
+				<td style='vertical-align:top;width:115px;'><?php echo _("Related Products:");?>
 				</td>
 				<td style='width:345px;'>
 				<?php
@@ -170,7 +170,7 @@
         if (count($parentResourceArray) > 0) {
            foreach ($parentResourceArray as $parentResource){
               $parentResourceObj = new Resource(new NamedArguments(array('primaryKey' => $parentResource['relatedResourceID'])));
-            echo $parentResourceObj->titleText . "&nbsp;&nbsp;(Parent)&nbsp;&nbsp;<a href='resource.php?resourceID=" . $parentResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='view resource' title='View " . $parentResourceObj->titleText . "' style='vertical-align:top;'></a><br />";
+            echo $parentResourceObj->titleText . "&nbsp;&nbsp;(Parent)&nbsp;&nbsp;<a href='resource.php?resourceID=" . $parentResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='"._("view resource")."' title='"._("View ") . $parentResourceObj->titleText . "' style='vertical-align:top;'></a><br />";
             }
          }
 
@@ -178,7 +178,7 @@
 					<?php
 					foreach ($childResourceArray as $childResource){
 						$childResourceObj = new Resource(new NamedArguments(array('primaryKey' => $childResource['resourceID'])));
-            echo $childResourceObj->titleText . "<a href='resource.php?resourceID=" . $childResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='view resource' title='View " . $childResourceObj->titleText . "' style='vertical-align:top;'></a><br />";
+            echo $childResourceObj->titleText . "<a href='resource.php?resourceID=" . $childResourceObj->resourceID . "' target='_BLANK'><img src='images/arrow-up-right.gif' alt='"._("view resource")."' title='"._("View ") . $childResourceObj->titleText . "' style='vertical-align:top;'></a><br />";
 
 					}
 
@@ -194,7 +194,7 @@
       if ($isbnOrIssns = $resource->getIsbnOrIssn()) {
 			?>
 			<tr>
-			<td style='vertical-align:top;width:115px;'>ISSN / ISBN:</td>
+			<td style='vertical-align:top;width:115px;'><?php echo _("ISSN / ISBN:");?></td>
       <td style='width:345px;'>
       <?php 
         foreach ($isbnOrIssns as $isbnOrIssn) {
@@ -208,7 +208,7 @@
 			if (count($aliasArray) > 0){
 			?>
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Aliases:</td>
+			<td style='vertical-align:top;width:115px;'><?php echo _("Aliases:");?></td>
 			<td style='width:345px;'>
 			<?php
 				foreach ($aliasArray as $resourceAlias){
@@ -225,14 +225,14 @@
 			?>
 
 			<tr>
-			<td style='vertical-align:top;width:115px;'>Organizations:</td>
+			<td style='vertical-align:top;width:115px;'><?php echo _("Organizations:");?></td>
 			<td style='width:345px;'>
 
 				<?php
 				foreach ($orgArray as $organization){
 					//if organizations is installed provide a link
 					if ($config->settings->organizationsModule == 'Y'){
-						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "&nbsp;&nbsp;<a href='" . $util->getOrganizationURL() . $organization['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='View " . $organization['organization'] . "' title='View " . $organization['organization'] . "' style='vertical-align:top;'></a></span><br />";
+						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "&nbsp;&nbsp;<a href='" . $util->getOrganizationURL() . $organization['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='"._("View ") . $organization['organization'] . "' title='"._("View ") . $organization['organization'] . "' style='vertical-align:top;'></a></span><br />";
 					}else{
 						echo "<span style='float:left; width:75px;'>" . $organization['organizationRole'] . ":</span><span style='width:270px;'>" . $organization['organization'] . "</span><br />";
 					}
@@ -246,23 +246,23 @@
 
 			if ($resource->resourceURL) { ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Resource URL:</td>
-				<td style='width:345px;'><?php echo $resource->resourceURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Resource URL' title='Visit Resource URL' style='vertical-align:top;'></a></td>
+				<td style='vertical-align:top;width:115px;'><?php echo _("Resource URL:");?></td>
+				<td style='width:345px;'><?php echo $resource->resourceURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt="<?php echo _("Visit Resource URL");?>" title="<?php echo _("Visit Resource URL");?>" style='vertical-align:top;'></a></td>
 				</tr>
 			<?php
 			}
 
 			if ($resource->resourceAltURL) { ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Alt URL:</td>
-				<td style='width:345px;'><?php echo $resource->resourceAltURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceAltURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Secondary Resource URL' title='Visit Secondary Resource URL' style='vertical-align:top;'></a></td>
+				<td style='vertical-align:top;width:115px;'><?php echo _("Alt URL:");?></td>
+				<td style='width:345px;'><?php echo $resource->resourceAltURL; ?>&nbsp;&nbsp;<a href='<?php echo $resource->resourceAltURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt="<?php echo _("Visit Secondary Resource URL");?>" title="<?php echo _("Visit Secondary Resource URL");?>" style='vertical-align:top;'></a></td>
 				</tr>
 			<?php
 			}
 
 			if ($resource->descriptionText){ ?>
 				<tr>
-				<td style='vertical-align:top;width:115px;'>Description:</td>
+				<td style='vertical-align:top;width:115px;'><?php echo _("Description:");?></td>
 				<td style='width:345px;'><?php echo nl2br($resource->descriptionText); ?></td>
 				</tr>
 			<?php } ?>
@@ -270,7 +270,7 @@
 
 		</table>
 		<?php if ($user->canEdit()){ ?>
-		<a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editResource'>edit product details</a><br />
+		<a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editResource'><?php echo _("edit product details");?></a><br />
 		<?php } ?>
 
 		<br />
@@ -298,7 +298,7 @@
 		?>
 			<table class='linedFormTable'>
 				<tr>
-				<th>Subjects</th>
+				<th><?php echo _("Subjects");?></th>
 				<th>
 				</th>
 				<th>
@@ -337,7 +337,7 @@
 								<?php if ($user->canEdit() && $canDelete){ ?>
 
 
-									<a href='javascript:void(0);' tab='Product' class='removeResourceSubjectRelationship' generalDetailSubjectID='<?php echo $generalDetailSubjectID[generalDetailSubjectLinkID]; ?>' resourceID='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='remove subject' title='remove subject'></a>
+									<a href='javascript:void(0);' tab='Product' class='removeResourceSubjectRelationship' generalDetailSubjectID='<?php echo $generalDetailSubjectID[generalDetailSubjectLinkID]; ?>' resourceID='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?php echo _("remove subject");?>' title='<?php echo _("remove subject");?>'></a>
 								<?php } ?>
 							</td>
 
@@ -358,7 +358,7 @@
 
 		if ($user->canEdit()){
 		?>
-			<a href='ajax_forms.php?action=getResourceSubjectForm&height=233&width=425&tab=Product&resourceID=<?php echo $resourceID; ?>&modal=true' class='thickbox'>add new subject</a>
+			<a href='ajax_forms.php?action=getResourceSubjectForm&height=233&width=425&tab=Product&resourceID=<?php echo $resourceID; ?>&modal=true' class='thickbox'><?php echo _("add new subject");?></a>
 		<?php
 		}
 
@@ -405,10 +405,10 @@
 		?>
 			<table class='linedFormTable'>
 				<tr>
-				<th>Additional Notes</th>
+				<th><?php echo _("Additional Notes");?></th>
 				<th>
 				<?php if ($user->canEdit()){ ?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 				<?php } ?>
 				</th>
 				</tr>
@@ -416,10 +416,10 @@
 					<tr>
 					<td style='width:115px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 					<?php if ($user->canEdit()){ ?>
-					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit note'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Product'><img src='images/cross.gif' alt='remove note' title='remove note'></a>
+					<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Product'><img src='images/cross.gif' alt='<?php echo _("remove note");?>' title='<?php echo _("remove note");?>'></a>
 					<?php } ?>
 					</td>
-					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . " by " . $resourceNote['updateUser']; ?></i></td>
+					<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
 					</tr>
 				<?php } ?>
 			</table>
@@ -427,7 +427,7 @@
 		}else{
 			if ($user->canEdit()){
 			?>
-				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'>add new note</a>
+				<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 			<?php
 			}
 		}
diff --git a/ajax_htmldata/getRightPanel.php b/ajax_htmldata/getRightPanel.php
index 91d52ba..afa43c7 100644
--- a/ajax_htmldata/getRightPanel.php
+++ b/ajax_htmldata/getRightPanel.php
@@ -37,9 +37,9 @@
 		$licenseArray = $resource->getLicenseArray();
 
 		echo "<div style='background-color:white; width:219px; padding:7px;'>";
-		echo "<div class='rightPanelLink'><a href='summary.php?resourceID=" . $resource->resourceID . "' target='_blank' class='helpfulLink'>Print View</a></div>";
+		echo "<div class='rightPanelLink'><a href='summary.php?resourceID=" . $resource->resourceID . "' target='_blank' class='helpfulLink'>"._("Print View")."</a></div>";
 		if (($resource->systemNumber) && ($config->settings->catalogURL != '')) {
-			echo "<div class='rightPanelLink'><a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>Catalog View</a></div>";
+			echo "<div class='rightPanelLink'><a href='" . $config->settings->catalogURL . $resource->systemNumber . "' target='_blank'>"._("Catalog View")."</a></div>";
 		}
 		echo "</div>";
 
@@ -47,7 +47,7 @@
 			<div style='background-color:white; width:219px; padding:7px;'>
 				<?php
         if ((count($parentResourceArray) > 0)){
-          echo "<div class='rightPanelHeader'>Parent Record(s)</div>";
+          echo "<div class='rightPanelHeader'>"._("Parent Record(s)")."</div>";
           foreach ($parentResourceArray as $parentResource){
             $parentResourceObj = new Resource(new NamedArguments(array('primaryKey' => $parentResource['relatedResourceID'])));
               echo "<div class='rightPanelLink'><a href='resource.php?resourceID=" . $parentResourceObj->resourceID . "' target='_BLANK' class='helpfulLink'>" . $parentResourceObj->titleText . "</a></div>";
@@ -55,7 +55,7 @@
         }
 
 				if ((count($childResourceArray) > 0)){
-					echo "<div class='rightPanelHeader'>Child Record(s)</div>";
+					echo "<div class='rightPanelHeader'>"._("Child Record(s)")."</div>";
 
 					foreach ($childResourceArray as $childResource){
 						$childResourceObj = new Resource(new NamedArguments(array('primaryKey' => $childResource['resourceID'])));
@@ -74,7 +74,7 @@
 		?>
 
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Organizations Module</div>
+				<div class='rightPanelHeader'><?php echo _("Organizations Module");?></div>
 
 				<?php
 				foreach ($orgArray as $organization){
@@ -90,7 +90,7 @@
 
 		?>
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Licensing Module</div>
+				<div class='rightPanelHeader'><?php echo _("Licensing Module");?></div>
 
 				<?php
 				foreach ($licenseArray as $license){
@@ -108,13 +108,13 @@
 		if (($resourceType->includeStats ==  1) && ($config->settings->usageModule == 'Y')){
 		?>
 			<div style='background-color:white; width:219px; padding:7px;'>
-				<div class='rightPanelHeader'>Usage Statistics Module</div>
+				<div class='rightPanelHeader'><?php echo _("Usage Statistics Module");?></div>
 
 				<?php
 			echo "<form method='post' action='/reports/report.php' target='_blank'>";
 			echo "<input type='hidden' name='reportID' value='1'>";
 			echo "<input type='hidden' name='prm_21' value='".$resource->titleText."'>";
-			echo "<input type='submit' value='Get Statistics'>";
+			echo "<input type='submit' value='"._("Get Statistics")."'>";
 			echo "</form>";
 							?>
 
diff --git a/ajax_htmldata/getRoutingDetails.php b/ajax_htmldata/getRoutingDetails.php
index dc8b12f..8325791 100644
--- a/ajax_htmldata/getRoutingDetails.php
+++ b/ajax_htmldata/getRoutingDetails.php
@@ -10,18 +10,18 @@
 
 		if (count($resourceSteps) == "0"){
 			if (($resource->statusID != $completeStatusID) && ($resource->statusID != $archiveStatusID)){
-				echo "<i>No workflow steps have been set up for this resource's combination of Acquisition Type and Resource Format.<br />If you think this is in error, please contact your workflow administrator.</i>";
+				echo "<i>"._("No workflow steps have been set up for this resource's combination of Acquisition Type and Resource Format.")."<br />"._("If you think this is in error, please contact your workflow administrator.")."</i>";
 			}else{
-				echo "<i>Not entered into workflow.</i>";
+				echo "<i>"._("Not entered into workflow.")."</i>";
 			}
 		}else{
 			?>
 			<table class='linedDataTable' style='width:100%;margin-bottom:5px;'>
 				<tr>
-				<th style='background-color:#dad8d8;width:350px;'>Step</th>
-				<th style='background-color:#dad8d8;width:150px;'>Group</th>
-				<th style='background-color:#dad8d8;width:120px;'>Start Date</th>
-				<th style='background-color:#dad8d8;width:250px;'>Complete</th>
+				<th style='background-color:#dad8d8;width:350px;'><?php echo _("Step");?></th>
+				<th style='background-color:#dad8d8;width:150px;'><?php echo _("Group");?></th>
+				<th style='background-color:#dad8d8;width:120px;'><?php echo _("Start Date");?></th>
+				<th style='background-color:#dad8d8;width:250px;'><?php echo _("Complete");?></th>
 				</tr>
 			<?php
 			$openStep=0;
@@ -38,21 +38,21 @@
 
 				?>
 				<tr>
-				<td <?php echo $classAdd; ?>><?php echo $resourceStep->stepName; ?></td>
-				<td <?php echo $classAdd; ?>><?php echo $userGroup->groupName; ?></td>
-				<td <?php echo $classAdd; ?>><?php if ($resourceStep->stepStartDate) { echo format_date($resourceStep->stepStartDate); } ?></td>
-				<td <?php echo $classAdd; ?>>
+				<td <?php echo $classAdd; ?> ><?php echo $resourceStep->stepName; ?></td>
+				<td <?php echo $classAdd; ?> ><?php echo $userGroup->groupName; ?></td>
+				<td <?php echo $classAdd; ?> ><?php if ($resourceStep->stepStartDate) { echo format_date($resourceStep->stepStartDate); } ?></td>
+				<td <?php echo $classAdd; ?> >
 				<?php
 					if ($resourceStep->stepEndDate) {
 						if (($eUser->firstName) || ($eUser->lastName)){
-							echo format_date($resourceStep->stepEndDate) . " by " . $eUser->firstName . " " . $eUser->lastName;
+							echo format_date($resourceStep->stepEndDate) . _(" by ") . $eUser->firstName . " " . $eUser->lastName;
 						}else{
-							echo format_date($resourceStep->stepEndDate) . " by " . $resourceStep->endLoginID;
+							echo format_date($resourceStep->stepEndDate) . _(" by ") . $resourceStep->endLoginID;
 						}
 					}else{
 						//add if user is in group or an admin and resource is not completed or archived
 						if ((($user->isAdmin) || ($user->isInGroup($resourceStep->userGroupID))) && ($resourceStep->stepStartDate) &&  ($resource->statusID != $archiveStatusID) && ($resource->statusID != $completeStatusID)){
-							echo "<a href='javascript:void(0);' class='markComplete' id='" . $resourceStep->resourceStepID . "'>mark complete</a>";
+							echo "<a href='javascript:void(0);' class='markComplete' id='" . $resourceStep->resourceStepID . "'>"._("mark complete")."</a>";
 						}
 						//track how many open steps there are
 						$openStep++;
@@ -74,15 +74,15 @@
 			//this was marked complete...
 			if (($openStep > 0) && ($resource->statusID == $completeStatusID)){
 				if ($rUser->firstName){
-					echo "<i>Workflow completed on " . format_date($resource->workflowRestartDate) . " by " . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
+					echo "<i>"._("Workflow completed on ") . format_date($resource->workflowRestartDate) . _(" by ") . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
 				}else{
-					echo "<i>Workflow completed on " . format_date($resource->workflowRestartDate) . " by " . $resource->workflowRestartLoginID . "</i><br />";
+					echo "<i>"._("Workflow completed on ") . format_date($resource->workflowRestartDate) . _(" by ") . $resource->workflowRestartLoginID . "</i><br />";
 				}
 			}else{
 				if ($rUser->firstName){
-					echo "<i>Workflow restarted on " . format_date($resource->workflowRestartDate) . " by " . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
+					echo "<i>"._("Workflow restarted on ") . format_date($resource->workflowRestartDate) . " by " . $rUser->firstName . " " . $rUser->lastName . "</i><br />";
 				}else{
-					echo "<i>Workflow restarted on " . format_date($resource->workflowRestartDate) . " by " . $resource->workflowRestartLoginID . "</i><br />";
+					echo "<i>"._("Workflow restarted on ") . format_date($resource->workflowRestartDate) . (" by ") . $resource->workflowRestartLoginID . "</i><br />";
 				}
 			}
 		}
@@ -92,8 +92,8 @@
 
 		if ($user->canEdit()){
 			if (($resource->statusID != $completeStatusID) && ($resource->statusID != $archiveStatusID)){
-				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='restartWorkflow' id='" . $resourceID . "'>restart workflow</a><br />";
-				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='markResourceComplete' id='" . $resourceID . "'>mark entire workflow complete</a><br />";
+				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='restartWorkflow' id='" . $resourceID . "'>"._("restart workflow")."</a><br />";
+				echo "<img src='images/pencil.gif' />&nbsp;&nbsp;<a href='javascript:void(0);' class='markResourceComplete' id='" . $resourceID . "'>"._("mark entire workflow complete")."</a><br />";
 			}
 		}
 
diff --git a/ajax_htmldata/getSavedQueue.php b/ajax_htmldata/getSavedQueue.php
index 81f4b3b..955ebb9 100644
--- a/ajax_htmldata/getSavedQueue.php
+++ b/ajax_htmldata/getSavedQueue.php
@@ -3,22 +3,22 @@
 		$resourceArray = array();
 		$resourceArray = $user->getResourcesInQueue('saved');
 
-		echo "<div class='adminRightHeader'>Saved Requests</div>";
+		echo "<div class='adminRightHeader'>"._("Saved Requests")."</div>";
 
 
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No saved requests</i>";
+			echo "<i>"._("No saved requests")."</i>";
 		}else{
 		?>
 
 			<table class='dataTable' style='width:570px;margin-bottom:5px;'>
 			<tr>
-				<th>ID</th>
-				<th>Name</th>
-				<th>Date Created</th>
-				<th>Acquisition Type</th>
-				<th>Status</th>
+				<th><?php echo _("ID");?></th>
+				<th><?php echo _("Name");?></th>
+				<th><?php echo _("Date Created");?></th>
+				<th><?php echo _("Acquisition Type");?></th>
+				<th><?php echo _("Status");?></th>
 				<th>&nbsp;</th>
 			</tr>
 
@@ -46,8 +46,8 @@
 					<td <?php echo $classAdd; ?>><?php echo $acquisitionType->shortName; ?></td>
 					<td <?php echo $classAdd; ?>><?php echo $status->shortName; ?></td>
 					<td <?php echo $classAdd; ?> style='text-align:right; width:40px;'>
-					<a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit request'></a>&nbsp;
-					<a href='javascript:void(0);' class='deleteRequest' id='<?php echo $resource['resourceID']; ?>'><img src='images/cross.gif' alt='remove request' title='remove request'></a>
+					<a href='ajax_forms.php?action=getNewResourceForm&height=483&width=775&resourceID=<?php echo $resource['resourceID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit request");?>'></a>&nbsp;
+					<a href='javascript:void(0);' class='deleteRequest' id='<?php echo $resource['resourceID']; ?>'><img src='images/cross.gif' alt='<?php echo _("remove request");?>' title='<?php echo _("remove request");?>'></a>
 					</td>
 				</tr>
 
diff --git a/ajax_htmldata/getSearchResources.php b/ajax_htmldata/getSearchResources.php
index b6ddd78..8c20e44 100644
--- a/ajax_htmldata/getSearchResources.php
+++ b/ajax_htmldata/getSearchResources.php
@@ -35,7 +35,7 @@
 		$resourceArray = $resourceObj->search($whereAdd, $orderBy, $limit);
 
 		if (count($resourceArray) == 0){
-			echo "<br /><br /><i>Sorry, no requests fit your query</i>";
+			echo "<br /><br /><i>"._("Sorry, no requests fit your query")."</i>";
 			$i=0;
 		}else{
 			//maximum number of pages to display on screen at one time
@@ -49,7 +49,7 @@
 			}
 
 			//div for displaying record count
-			echo "<span style='float:left; font-weight:bold; width:650px;'>Displaying " . $displayStartingRecNumber . " to " . $displayEndingRecNumber . " of " . $totalRecords . " Resource Records</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
+			echo "<span style='float:left; font-weight:bold; width:650px;'>"._("Displaying ") . $displayStartingRecNumber . _(" to ") . $displayEndingRecNumber . _(" of ") . $totalRecords . _(" Resource Records")."</span><span style='float:right;width:20px;'><a href='javascript:void(0);'><img src='images/xls.gif' id='export'></a></span>";
 
 
 			//print out page selectors as long as there are more records than the number that should be displayed
@@ -61,7 +61,7 @@
 					echo "<span class='smallerText'><<</span>&nbsp;";
 				}else{
 					$prevPage = $page - 1;
-					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='previous page' title='previous page'><<</a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='"._("previous page")."' title='"._("previous page")."'><<</a>&nbsp;";
 				}
 
 
@@ -95,7 +95,7 @@
 				if ($nextPage >= $maxPages){
 					echo "<span class='smallerText'>>></span>&nbsp;";
 				}else{
-					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='next page' title='next page'>>></a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='"._("next page")."' title='"._("next page")."'>>></a>&nbsp;";
 				}
 
 				echo "</div>";
@@ -109,12 +109,12 @@
 			?>
 			<table class='dataTable' style='width:727px'>
 			<tr>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>ID</td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Name</td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Creator</td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Date Created</td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Acquisition Type</td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
-			<th><table class='noBorderTable' style='width:100%'><tr><td>Status</td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("ID");?></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.resourceID + 0","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("Name");?></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("R.titleText","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("Creator");?></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("CU.loginID","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("Date Created");?></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("R.createDate","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("Acquisition Type");?></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;vertical-align:top;'><a href='javascript:setOrder("acquisitionType","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
+			<th><table class='noBorderTable' style='width:100%'><tr><td><?php echo _("Status");?></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","asc");'><img src='images/arrowup.gif' border=0></a></td><td style='width:10px;'><a href='javascript:setOrder("S.shortName","desc");'><img src='images/arrowdown.gif' border=0></a></td></tr></table></th>
 			</tr>
 
 			<?php
@@ -158,7 +158,7 @@
 					echo "<span class='smallerText'><<</span>&nbsp;";
 				}else{
 					$prevPage = $page - 1;
-					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='previous page' title='previous page'><<</a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $prevPage . "' class='setPage smallLink' alt='"._("previous page")."' title='"._("previous page")."'><<</a>&nbsp;";
 				}
 
 
@@ -192,7 +192,7 @@
 				if ($nextPage >= $maxPages){
 					echo "<span class='smallerText'>>></span>&nbsp;";
 				}else{
-					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='next page' title='next page'>>></a>&nbsp;";
+					echo "<a href='javascript:void(0);' id='" . $nextPage . "' class='setPage smallLink' alt='"._("next page")."' title='"._("next page")."'>>></a>&nbsp;";
 				}
 			}
 			?>
@@ -209,7 +209,7 @@
 				}
 				?>
 			</select>
-			<span class='smallText'>records per page</span>
+			<span class='smallText'><?php echo _("records per page");?></span>
 			</td>
 			</tr>
 			</table>
diff --git a/ajax_htmldata/getSubmittedQueue.php b/ajax_htmldata/getSubmittedQueue.php
index 6320475..1aa1d6c 100644
--- a/ajax_htmldata/getSubmittedQueue.php
+++ b/ajax_htmldata/getSubmittedQueue.php
@@ -2,20 +2,20 @@
 		$resourceArray = array();
 		$resourceArray = $user->getResourcesInQueue('progress');
 
-		echo "<div class='adminRightHeader'>Submitted Requests</div>";
+		echo "<div class='adminRightHeader'>"._("Submitted Requests")."</div>";
 
 		if (count($resourceArray) == "0"){
-			echo "<i>No submitted requests</i>";
+			echo "<i>"._("No submitted requests")."</i>";
 		}else{
 		?>
 
 			<table class='dataTable' style='width:570px;margin-bottom:5px;'>
 			<tr>
-				<th>ID</th>
-				<th>Name</th>
-				<th>Date Created</th>
-				<th>Acquisition Type</th>
-				<th>Status</th>
+				<th><?php echo _("ID");?></th>
+				<th><?php echo _("Name");?></th>
+				<th><?php echo _("Date Created");?></th>
+				<th><?php echo _("Acquisition Type");?></th>
+				<th><?php echo _("Status");?></th>
 			</tr>
 
 		<?php
diff --git a/ajax_processing/deleteDetailedSubject.php b/ajax_processing/deleteDetailedSubject.php
index bec6ce0..7c27070 100644
--- a/ajax_processing/deleteDetailedSubject.php
+++ b/ajax_processing/deleteDetailedSubject.php
@@ -9,7 +9,7 @@
 				$instance->delete();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 
 ?>
diff --git a/ajax_processing/deleteGeneralSubject.php b/ajax_processing/deleteGeneralSubject.php
index 8870edd..8270781 100644
--- a/ajax_processing/deleteGeneralSubject.php
+++ b/ajax_processing/deleteGeneralSubject.php
@@ -9,7 +9,7 @@
 				$instance->deleteGeneralSubject();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 
 ?>
diff --git a/ajax_processing/deleteInstance.php b/ajax_processing/deleteInstance.php
index 78c589c..b238157 100644
--- a/ajax_processing/deleteInstance.php
+++ b/ajax_processing/deleteInstance.php
@@ -9,13 +9,13 @@
 
 		if ($numberOfChildren > 0){
 			//print out a friendly message...
-			echo "Unable to delete  - this " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " is in use.  Please make sure no resources are set up with this information.";
+			echo _("Unable to delete  - this " ). strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" is in use.  Please make sure no resources are set up with this information.");
 		}else{
 			try {
 				$instance->delete();
 			} catch (Exception $e) {
 				//print out a friendly message...
-				echo "Unable to delete.  Please make sure no resources are set up with this information.";
+				echo _("Unable to delete.  Please make sure no resources are set up with this information.");
 			}
 		}
 ?>
diff --git a/ajax_processing/deleteResource.php b/ajax_processing/deleteResource.php
index 9aa0ff0..54b6c34 100644
--- a/ajax_processing/deleteResource.php
+++ b/ajax_processing/deleteResource.php
@@ -4,7 +4,7 @@
 
 		try {
 			$resource->removeResource();
-			echo "Resource successfully deleted.";
+			echo _("Resource successfully deleted.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
diff --git a/ajax_processing/deleteResourceAndChildren.php b/ajax_processing/deleteResourceAndChildren.php
index 9946ac9..f11a776 100644
--- a/ajax_processing/deleteResourceAndChildren.php
+++ b/ajax_processing/deleteResourceAndChildren.php
@@ -5,7 +5,7 @@
 
     try {
       $resource->removeResourceAndChildren();
-      echo "Resource successfully deleted.";
+      echo _("Resource successfully deleted.");
     } catch (Exception $e) {
       echo $e->getMessage();
     }
diff --git a/ajax_processing/deleteResourceNote.php b/ajax_processing/deleteResourceNote.php
index 409e16a..96fa4ef 100644
--- a/ajax_processing/deleteResourceNote.php
+++ b/ajax_processing/deleteResourceNote.php
@@ -4,7 +4,7 @@
 
 		try {
 			$resourceNote->delete();
-			echo "Note successfully deleted.";
+			echo _("Note successfully deleted.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
diff --git a/ajax_processing/removeResourceSubjectRelationship.php b/ajax_processing/removeResourceSubjectRelationship.php
index 7c08296..2f44646 100644
--- a/ajax_processing/removeResourceSubjectRelationship.php
+++ b/ajax_processing/removeResourceSubjectRelationship.php
@@ -7,7 +7,7 @@
 		try {
 
 			$resourceSubject->removeResourceSubject($resourceID, $generalDetailSubjectID);
-			echo "Subject successfully removed.";
+			echo _("Subject successfully removed.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
diff --git a/ajax_processing/updateDetailedSubject.php b/ajax_processing/updateDetailedSubject.php
index 8660e97..8329285 100644
--- a/ajax_processing/updateDetailedSubject.php
+++ b/ajax_processing/updateDetailedSubject.php
@@ -19,7 +19,7 @@
 				echo $e->getMessage();
 			}
 		} else {
-			echo "A duplicate " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " exists.";
+			echo _("A duplicate ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" exists.");
 		}
 
 ?>
diff --git a/ajax_processing/updateGeneralSubject.php b/ajax_processing/updateGeneralSubject.php
index 41a3819..30cb250 100644
--- a/ajax_processing/updateGeneralSubject.php
+++ b/ajax_processing/updateGeneralSubject.php
@@ -18,7 +18,7 @@
 				echo $e->getMessage();
 			}
 		} else {
-			echo "A duplicate " . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . " exists.";
+			echo _("A duplicate ") . strtolower(preg_replace("/[A-Z]/", " \\0" , lcfirst($className))) . _(" exists.");
 		}
 
 ?>
diff --git a/ajax_processing/updateUserData.php b/ajax_processing/updateUserData.php
index 27bebfe..055b678 100644
--- a/ajax_processing/updateUserData.php
+++ b/ajax_processing/updateUserData.php
@@ -23,7 +23,7 @@
 
 		try {
 			$user->save();
-			echo "User successfully saved.";
+			echo _("User successfully saved.");
 		} catch (Exception $e) {
 			echo $e->getMessage();
 		}
diff --git a/ajax_processing/uploadAttachment.php b/ajax_processing/uploadAttachment.php
index 96785d2..7915ae8 100644
--- a/ajax_processing/uploadAttachment.php
+++ b/ajax_processing/uploadAttachment.php
@@ -26,7 +26,7 @@
 			echo "success uploading!";
 		} else {
 		  header('HTTP/1.1 500 Internal Server Error');
-		  echo "<div id=\"error\">There was a problem saving your file to $target_path.  Please ensure your attachments directory is writable.</div>";
+		  echo "<div id=\"error\">"._("There was a problem saving your file to ").$target_path._(".  Please ensure your attachments directory is writable.")."</div>";
 		}
 
 	}
diff --git a/import.php b/import.php
index 990cc24..b1fe71d 100644
--- a/import.php
+++ b/import.php
@@ -19,7 +19,7 @@
 session_start();
 include_once 'directory.php';
 //print header
-$pageTitle='Resources import';
+$pageTitle=_('Resources import');
 include 'templates/header.php';
 ?><div id="importPage"><h1>CSV File import</h1><?php
 // CSV configuration
@@ -29,7 +29,7 @@
   $uploaddir = 'attachments/';
   $uploadfile = $uploaddir . basename($_FILES['uploadFile']['name']);
   if (move_uploaded_file($_FILES['uploadFile']['tmp_name'], $uploadfile)) {  
-    print '<p>The file has been successfully uploaded.</p>';
+    print '<p>'._("The file has been successfully uploaded.").'</p>';
   
   // Let's analyze this file
   if (($handle = fopen($uploadfile, "r")) !== FALSE) {
@@ -39,18 +39,18 @@
         $available_columns[$value] = $key;
       } 
     } else {
-      $error = 'Unable to get columns headers from the file';
+      $error = _("Unable to get columns headers from the file");
     }
   } else {
-    $error = 'Unable to open the uploaded file';
+    $error = _("Unable to open the uploaded file");
   }
   } else {
-    $error = 'Unable to upload the file';
+    $error = _("Unable to upload the file");
   }
   if ($error) {
-    print "<p>Error: $error.</p>";
+    print "<p>"._("Error: ").$error.".</p>";
   } else {
-    print "<p>Please choose columns from your CSV file:</p>";
+    print "<p>"._("Please choose columns from your CSV file:")."</p>";
     print "<form action=\"import.php\" method=\"post\">";
     foreach ($required_columns as $rkey => $rvalue) {
       print "<label for=\"$rkey\">" . $rkey . "</label><select name=\"$rkey\">";
@@ -83,8 +83,8 @@
     while (($data = fgetcsv($handle, 0, $delimiter)) !== FALSE) {
       // Getting column names again for deduping
       if ($row == 0) {
-        print "<h2>Settings</h2>";
-        print "<p>Importing and deduping isbnOrISSN on the following columns: " ;
+        print "<h2>"._("Settings")."</h2>";
+        print "<p>"._("Importing and deduping isbnOrISSN on the following columns: ") ;
         foreach ($data as $key => $value) {
           if (in_array($value, $deduping_config)) {
             $deduping_columns[] = $key;
@@ -140,7 +140,7 @@
                   $organizationsInserted++;
                   array_push($arrayOrganizationsCreated, $organizationName);
                 } catch (Exception $e) {
-                  print "<p>Organization $organizationName could not be added.</p>";
+                  print "<p>"._("Organization ").$organizationName._(" could not be added.")."</p>";
                 }
               // If yes, we attach it to our resource
               } elseif ($result['count'] == 1) {
@@ -149,7 +149,7 @@
                 $organizationID = $result['organizationID'];
                 $organizationsAttached++;
               } else {
-                print "<p>Error: more than one organization is called $organizationName. Please consider deduping.</p>";
+                print "<p>"._("Error: more than one organization is called ").$organizationName._(". Please consider deduping.")."</p>";
               }
               if ($organizationID) {
                 $dbName = $config->settings->organizationsDatabaseName;
@@ -171,7 +171,7 @@
                       array_push($arrayOrganizationsCreated, $organizationName);
                     }
                   } catch (Exception $e) {
-                    print "<p>Unable to associate organization $organizationName with its role.</p>";
+                    print "<p>"._("Unable to associate organization ").$organizationName._(" with its role.")."</p>";
                   }
                 }
               }
@@ -192,7 +192,7 @@
                 $organizationID = $organization->getOrganizationIDByName($organizationName);
                 $organizationsAttached++;
               } else {
-                print "<p>Error: more than one organization is called $organizationName. Please consider deduping.</p>";
+                print "<p>"._("Error: more than one organization is called ").$organizationName._(" Please consider deduping.")."</p>";
               }
               // Find role
               $organizationRoles = $organizationRole->getArray();
@@ -250,33 +250,33 @@
         }
       $row++;
     }
-    print "<h2>Results</h2>";
-    print "<p>" . ($row - 1) . " rows have been processed. $inserted rows have been inserted.</p>";
-    print "<p>$parentInserted parents have been created. $parentAttached resources have been attached to an existing parent.</p>";
-    print "<p>$organizationsInserted organizations have been created";
+    print "<h2>"._("Results")."</h2>";
+    print "<p>" . ($row - 1) . _(" rows have been processed. ").$inserted._(" rows have been inserted.")."</p>";
+    print "<p>".$parentInserted._(" parents have been created. ").$parentAttached._(" resources have been attached to an existing parent.")."</p>";
+    print "<p>".$organizationsInserted._(" organizations have been created");
     if (count($arrayOrganizationsCreated) > 0) print " (" . implode(',', $arrayOrganizationsCreated) . ")";
-    print ". $organizationsAttached resources have been attached to an existing organization.</p>";
+    print ". $organizationsAttached"._(" resources have been attached to an existing organization.")."</p>";
   }
 } else {
           
 ?>
-<p>The first line of the CSV file must contain column names, and not data. These names will be used during the import process.</p>
+<p><?php echo _("The first line of the CSV file must contain column names, and not data. These names will be used during the import process.");?></p>
 <form enctype="multipart/form-data" action="import.php" method="post" id="importForm">
   <fieldset>
-  <legend>File selection</legend>
-  <label for="uploadFile">CSV File</label>
+  <legend><?php echo _("File selection");?></legend>
+  <label for="uploadFile"><?php echo _("CSV File");?></label>
   <input type="file" name="uploadFile" id="uploadFile" />
   </fieldset>
   <fieldset>
-  <legend>Import options</legend>
-  <label for="CSV delimiter">CSV delimiter</label>
+  <legend><?php echo _("Import options");?></legend>
+  <label for="CSV delimiter"><?php echo _("CSV delimiter");?></label>
   <select name="delimiter">
-    <option value=",">, (comma)</option>
-    <option value=";">; (semicolon)</option>
-    <option value="|">| (pipe)</option>
+    <option value=",">, <?php echo _("(comma)");?></option>
+    <option value=";">; <?php echo _("(semicolon)");?></option>
+    <option value="|">| <?php echo _("(pipe)");?></option>
   </select>
   </fieldset>
-  <input type="submit" name="submit" value="Upload" />
+  <input type="submit" name="submit" value="<?php echo _("Upload");?>" />
 </form>
 
 <?php
diff --git a/index.php b/index.php
index e0bf299..c603282 100644
--- a/index.php
+++ b/index.php
@@ -55,8 +55,8 @@
     
 	<table class='noBorder'>
 	<tr><td style='text-align:left;width:75px;' align='left'>
-	<span style='font-size:130%;font-weight:bold;'><?= _("Search");?></span><br />
-	<a href='javascript:void(0)' class='newSearch'><?= _("new search");?></a>
+	<span style='font-size:130%;font-weight:bold;'><?php echo _("Search");?></span><br />
+	<a href='javascript:void(0)' class='newSearch'><?php echo _("new search");?></a>
 	</td>
 	<td><div id='div_feedback'>&nbsp;</div>
 	</td></tr>
@@ -65,11 +65,11 @@
 	<table class='borderedFormTable' style="width:150px">
 
 	<tr>
-	<td class='searchRow'><label for='searchName'><b><?= _("Name (contains)");?></b></label>
+	<td class='searchRow'><label for='searchName'><b><?php echo _("Name (contains)");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('name', $search['name']); ?>
 	<br />
-	<div id='div_searchName' style='<?php if (!$search['name']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='<?= _("go!");?>' class='searchButton' /></div>
+	<div id='div_searchName' style='<?php if (!$search['name']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchName' value='<?php echo _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
@@ -80,27 +80,27 @@
 	<br />
 	<?php echo Html::text_search_field_tag('resourceISBNOrISSN', $search['resourceISBNOrISSN']); ?>
 	<br />
-	<div id='div_searchISBNOrISSN' style='<?php if (!$search['resourceISBNOrISSN']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='<?= _("go!");?>' class='searchButton' /></div>
+	<div id='div_searchISBNOrISSN' style='<?php if (!$search['resourceISBNOrISSN']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceISBNOrISSN' value='<?php echo _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchFund'><b><?= _("Fund");?></b></label>
+	<td class='searchRow'><label for='searchFund'><b><?php echo _("Fund");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('fund', $search['fund']); ?><br />
-	<div id='div_searchFund' style='<?php if (!$search['fund']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchFund' value='<?= _("go!");?>' class='searchButton' /></div>
+	<div id='div_searchFund' style='<?php if (!$search['fund']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchFund' value='<?php echo _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAcquisitionTypeID'><b><?= _("Acquisition Type");?></b></label>
+	<td class='searchRow'><label for='searchAcquisitionTypeID'><b><?php echo _("Acquisition Type");?></b></label>
 	<br />
 	<select name='search[acquisitionTypeID]' id='searchAcquisitionTypeID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		$display = array();
@@ -120,10 +120,10 @@
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchStatusID'><b><?= _("Status");?></b></label>
+	<td class='searchRow'><label for='searchStatusID'><b><?php echo _("Status");?></b></label>
 	<br />
 	<select name='search[statusID]' id='searchStatusID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		$display = array();
@@ -151,10 +151,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchCreatorLoginID'><b><?= _("Creator");?></b></label>
+	<td class='searchRow'><label for='searchCreatorLoginID'><b><?php echo _("Creator");?></b></label>
 	<br />
 	<select name='search[creatorLoginID]' id='searchCreatorLoginID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 
 	<?php
 
@@ -183,10 +183,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceFormatID'><b><?= _("Resource Format");?></b></label>
+	<td class='searchRow'><label for='searchResourceFormatID'><b><?php echo _("Resource Format");?></b></label>
 	<br />
 	<select name='search[resourceFormatID]' id='searchResourceFormatID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		$display = array();
@@ -207,10 +207,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceTypeID'><b><?= _("Resource Type");?></b></label>
+	<td class='searchRow'><label for='searchResourceTypeID'><b><?php echo _("Resource Type");?></b></label>
 	<br />
 	<select name='search[resourceTypeID]' id='searchResourceTypeID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 
 	<?php
 
@@ -239,19 +239,19 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceID'><b><?= _("Record ID");?></b></label>
+	<td class='searchRow'><label for='searchResourceID'><b><?php echo _("Record ID");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('resourceID', ''); ?>
 	<br />
-	<div id='div_searchID' style='<?php if (!$search['resourceID']) echo "display:none;"; ?>margin-left:123px;'><input type='button' value='<?= _("go!");?>' id='searchResourceIDButton' /></div>
+	<div id='div_searchID' style='<?php if (!$search['resourceID']) echo "display:none;"; ?>margin-left:123px;'><input type='button' value='<?php echo _("go!");?>' id='searchResourceIDButton' /></div>
 	</td>
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchGeneralSubjectID'><b><?= _("General Subject");?></b></label>
+	<td class='searchRow'><label for='searchGeneralSubjectID'><b><?php echo _("General Subject");?></b></label>
 	<br />
 	<select name='search[generalSubjectID]' id='searchGeneralSubjectID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 
 	<?php
 
@@ -279,10 +279,10 @@
 	</tr>
 
 	<tr>
-	<td class='searchRow'><label for='searchDetailedSubjectID'><b><?= _("Detailed Subject");?></b></label>
+	<td class='searchRow'><label for='searchDetailedSubjectID'><b><?php echo _("Detailed Subject");?></b></label>
 	<br />
 	<select name='search[detailedSubjectID]' id='searchDetailedSubjectID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 
 	<?php
 
@@ -310,7 +310,7 @@
 	</tr>
 	
 	<tr>
-	<td class='searchRow'><label for='searchFirstLetter'><b><?= _("Starts with");?></b></label>
+	<td class='searchRow'><label for='searchFirstLetter'><b><?php echo _("Starts with");?></b></label>
 	<br />
 	<?php
 	$resource = new Resource();
@@ -336,15 +336,15 @@
 
 	</table>
 
-	<div id='hideShowOptions'><a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'><?= _("more options...");?></a></div>
+	<div id='hideShowOptions'><a href='javascript:void(0);' name='showMoreOptions' id='showMoreOptions'><?php echo _("more options...");?></a></div>
 	<div id='div_additionalSearch' style='display:none;'>
 	<table class='borderedFormTable' style="width:150px">
 
 	<tr>
-	<td class='searchRow'><label for='searchNoteTypeID'><b><?= _("Note Type");?></b></label>
+	<td class='searchRow'><label for='searchNoteTypeID'><b><?php echo _("Note Type");?></b></label>
 	<br />
 	<select name='search[noteTypeID]' id='searchNoteTypeID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		if ($search['noteTypeID'] == "none") {
@@ -371,11 +371,11 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchResourceNote'><b><?= _("Note (contains)");?></b></label>
+	<td class='searchRow'><label for='searchResourceNote'><b><?php echo _("Note (contains)");?></b></label>
 	<br />
 	<?php echo Html::text_search_field_tag('resourceNote', $search['resourceNote']); ?>
 	<br />
-	<div id='div_searchResourceNote' style='<?php if (!$search['resourceNote']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='<?= _("go!");?>' class='searchButton' /></div>
+	<div id='div_searchResourceNote' style='<?php if (!$search['resourceNote']) echo "display:none;"; ?>margin-left:123px;'><input type='button' name='btn_searchResourceNote' value='<?php echo _("go!");?>' class='searchButton' /></div>
 	</td>
 	</tr>
 
@@ -383,26 +383,26 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='createDate'><b><?= _("Date Created Between");?></b></label><br />
+	<td class='searchRow'><label for='createDate'><b><?php echo _("Date Created Between");?></b></label><br />
 	  <?php echo Html::text_search_field_tag('createDateStart', $search['createDateStart'], array('class' => 'date-pick', 'width' => '65px')); ?>
-	&nbsp;&nbsp;<b><?= _("and");?></b>
+	&nbsp;&nbsp;<b><?php echo _("and");?></b>
 	</td>
 	</tr>
 	<tr>
 	<td style="border-top:0px;padding-top:0px;">
 	  <?php echo Html::text_search_field_tag('createDateEnd', $search['createDateEnd'], array('class' => 'date-pick', 'width' => '65px')); ?>
 	<br />
-	<div id='div_searchCreateDate' style='display:none;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='button' class='searchButton' value='<?= _("go!");?>' /></div>
+	<div id='div_searchCreateDate' style='display:none;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type='button' class='searchButton' value='<?php echo _("go!");?>' /></div>
 	</td>
 	</tr>
 
 
 
 	<tr>
-	<td class='searchRow'><label for='searchPurchaseSiteID'><b><?= _("Purchase Site");?></b></label>
+	<td class='searchRow'><label for='searchPurchaseSiteID'><b><?php echo _("Purchase Site");?></b></label>
 	<br />
 	<select name='search[purchaseSiteID]' id='searchPurchaseSiteID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		if ($search['purchaseSiteID'] == "none"){
@@ -431,10 +431,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAuthorizedSiteID'><b><?= _("Authorized Site");?></b></label>
+	<td class='searchRow'><label for='searchAuthorizedSiteID'><b><?php echo _("Authorized Site");?></b></label>
 	<br />
 	<select name='search[authorizedSiteID]' id='searchAuthorizedSiteID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		if ($search['authorizedSiteID'] == "none") {
@@ -463,10 +463,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAdministeringSiteID'><b><?= _("Administering Site");?></b></label>
+	<td class='searchRow'><label for='searchAdministeringSiteID'><b><?php echo _("Administering Site");?></b></label>
 	<br />
 	<select name='search[administeringSiteID]' id='searchAdministeringSiteID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		if ($search['administeringSiteID'] == "none") {
@@ -493,10 +493,10 @@
 
 
 	<tr>
-	<td class='searchRow'><label for='searchAuthenticationTypeID'><b><?= _("Authentication Type");?></b></label>
+	<td class='searchRow'><label for='searchAuthenticationTypeID'><b><?php echo _("Authentication Type");?></b></label>
 	<br />
 	<select name='search[authenticationTypeID]' id='searchAuthenticationTypeID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 
 		if ($search['authenticationTypeID'] == "none") {
@@ -523,10 +523,10 @@
 	</tr>
 	
 	<tr>
-	<td class='searchRow'><label for='searchCatalogingStatusID'><b><?= _("Cataloging Status");?></b></label>
+	<td class='searchRow'><label for='searchCatalogingStatusID'><b><?php echo _("Cataloging Status");?></b></label>
 	<br />
 	<select name='search[catalogingStatusID]' id='searchCatalogingStatusID' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 	  if ($search['catalogingStatusID'] == "none") {
 			echo "<option value='none' selected>"._("(none)")."</option>";
@@ -550,10 +550,10 @@
 	</tr>
   
   <tr>
-	<td class='searchRow'><label for='searchStepName'><b><?= _("Routing Step");?></b></label>
+	<td class='searchRow'><label for='searchStepName'><b><?php echo _("Routing Step");?></b></label>
 	<br />
 	<select name='search[stepName]' id='searchStepName' style='width:150px'>
-	<option value=''><?= _("All");?></option>
+	<option value=''><?php echo _("All");?></option>
 	<?php
 	  $step = new Step();
     $stepNames = $step->allStepNames();
diff --git a/install/install.php b/install/install.php
index b0c18eb..7774847 100644
--- a/install/install.php
+++ b/install/install.php
@@ -21,7 +21,6 @@
 	$database_username = trim($_POST['database_username']);
 	$database_password = trim($_POST['database_password']);
 	$database_name = trim($_POST['database_name']);
-    $database_lang = trim($_POST['lang_db']);
 
 	if (!$database_host) $errorMessage[] = 'Host name is required';
 	if (!$database_name) $errorMessage[] = 'Database name is required';
@@ -60,7 +59,6 @@
 						//make sure SQL file exists
 						$test_sql_file = "protected/test_create.sql";
                         $sql_file = "protected/install.sql";
-                        $sql_data = "protected/data/data_".$database_lang.".sql";
                         
                         // Assign the charset to specials chars
                         mysql_query("SET NAMES 'utf8'");
@@ -121,33 +119,6 @@
 							}
 						}
                         
-                        // Insert data according the language selected
-                        if (count($errorMessage) == 0){
-							if (!file_exists($sql_data)) {
-								$errorMessage[] = "Could not open sql file: " . $sql_data . ".  If this file does not exist you must download new install files.";
-							}else{
-								//run the file - checking for errors at each SQL execution
-								$f = fopen($sql_data,"r");
-								$sqlFile = fread($f,filesize($sql_data));
-								$sqlArray = explode(';',$sqlFile);
-
-								//Process the sql file by statements
-								foreach ($sqlArray as $stmt) {
-								   if (strlen(trim($stmt))>3){
-										//replace the DATABASE_NAME parameter with what was actually input
-										$stmt = str_replace("_DATABASE_NAME_", $database_name, $stmt);
-
-										$result = mysql_query($stmt);
-										if (!$result){
-											$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
-											 break;
-										}
-									}
-								}
-
-							}
-						} // end if(count($errorMessage) == 0)
-                        
 					}
 				}
 			}
@@ -534,15 +505,6 @@
 					<input type="password" name="database_password" size="30" value="<?php echo $database_password?>">
 				</td>
 			</tr>
-			<tr>
-			    <td>&nbsp;Data language</td>
-			    <td>
-			        <select name="lang_db" id="lang_db">
-			            <option value="en">English</option>
-			            <option value="fr">French</option>
-			        </select>
-			    </td>
-			</tr>
 			<tr>
 				<td colspan=2>&nbsp;</td>
 			</tr>
diff --git a/install/protected/data/data_en.sql b/install/protected/data/data_en.sql
deleted file mode 100644
index ca311d0..0000000
--- a/install/protected/data/data_en.sql
+++ /dev/null
@@ -1,639 +0,0 @@
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Standalone CD');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('External Host');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Local Host');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Paid');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Free');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Trial');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Main Library');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abbreviation');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Alternate Name');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Name Change');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('User Guide');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Title List');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('General');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('IP Address');
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Username');
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Referring URL');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Main Campus');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Batch');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Completed');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'Ongoing');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejected');
-
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Support');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Accounting');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('General');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licensing');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Sales');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Training');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
-
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistics');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Support');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Pending');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completed');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('No License Required');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Product Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Acquisition Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Access Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('General');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Licensing Details');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Initial Note');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Ongoing');
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('One Time');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Library");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Platform");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Provider");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Publisher");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendor");
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('add/edit');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('view only');
-
-
-INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Main Library');
-
-
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Print + Electronic');
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronic');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('In Progress');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completed');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Saved');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archived');
-
-
-INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Reserve Book Room');
-
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (1, '2', '','1');
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (2, '2', '','2');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Access');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licensing');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Funding Approval');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Receipt');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (1, NULL, 'Funding Approval', 3, 1, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (2, NULL, 'Licensing', 2, 1, 2);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (3, 2, 'Order Processing', 4, 1, 3);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (4, 3, 'Activation', 1, 1, 4);
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (5, NULL, 'Licensing', 2, 2, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (6, NULL, 'Activation', 1, 2, 2);
diff --git a/install/protected/data/data_fr.sql b/install/protected/data/data_fr.sql
deleted file mode 100644
index 33f0319..0000000
--- a/install/protected/data/data_fr.sql
+++ /dev/null
@@ -1,640 +0,0 @@
- 
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('CD Autonome');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Hôte externe');
-INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Hôte local');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Payant');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Gratuit');
-INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Démonstration');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Bibliothèque Unique');
-
-
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
-INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abréviation');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Nom alternative');
-INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Nom Change');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ("Guide d'Utilisateur");
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Liste des titres');
-INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Géneral');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Adress IP');
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ("Nom d'utilisateur");
-INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('URL de Réference');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Campus Unique');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Lot');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
-
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Terminé');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'En cours');
-INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejeté');
-
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Soutien');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Comptabilité');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Géneral');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licence');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Ventes');
-INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Formation');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
-INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
-
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistiques');
-INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Soutien');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('En suspens');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completé');
-INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Aucune Licence requise');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails du Produit');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails Acquisition');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails Accès');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Géneral');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Détails de la Licence');
-INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Note Initial');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('En cours');
-INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Une fois');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
-INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Bibliothèque");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Plate-forme");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Fornisseur");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Éditeur");
-INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendeur");
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('ajouter/modifier');
-INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('regarder seulement');
-
-
-INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Bibliothèque Unique');
-
-
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
-INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Imprimible + Electronique');
-INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronique');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('En Cours');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completé');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Enregistré');
-INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archivé');
-
-
-INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Chambre des réserves des livres');
-
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
-INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (1, '2', '','1');
-
-INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
-VALUES (2, '2', '','2');
-
-
-
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Accès');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licence');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Approbation du Financement');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
-INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Reçu');
-
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (1, NULL, 'Approbation du financement', 3, 1, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (2, NULL, 'Licence', 2, 1, 2);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (3, 2, 'Process du commande', 4, 1, 3);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (4, 3, 'Activation', 1, 1, 4);
-
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (5, NULL, 'Licence', 2, 2, 1);
-INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
-VALUES (6, NULL, 'Activation', 1, 2, 2);
\ No newline at end of file
diff --git a/install/protected/install.sql b/install/protected/install.sql
index c97393b..2264fcf 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -673,3 +673,642 @@ ALTER TABLE `_DATABASE_NAME_`.`CostDetails` ADD INDEX `costDetailsID` ( `costDet
  ADD INDEX `Index_shortName` (`shortName`),
  ADD INDEX `Index_All`(`costDetailsID`, `shortName`);
 
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Standalone CD');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('External Host');
+INSERT INTO `_DATABASE_NAME_`.`AccessMethod` (shortName) values ('Local Host');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (1, 'Paid');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (2, 'Free');
+INSERT INTO `_DATABASE_NAME_`.`AcquisitionType` (acquisitionTypeID, shortName) values (3, 'Trial');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AdministeringSite` (shortName) values ('Main Library');
+
+
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('30');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('60');
+INSERT INTO `_DATABASE_NAME_`.`AlertDaysInAdvance` (daysInAdvanceNumber) values ('90');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Abbreviation');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Alternate Name');
+INSERT INTO `_DATABASE_NAME_`.`AliasType` (shortName) values ('Name Change');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Email');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('User Guide');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('Title List');
+INSERT INTO `_DATABASE_NAME_`.`AttachmentType` (shortName) values ('General');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('IP Address');
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Username');
+INSERT INTO `_DATABASE_NAME_`.`AuthenticationType` (shortName) values ('Referring URL');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`AuthorizedSite` (shortName) values ('Main Campus');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (1, 'Batch');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (2, 'Manual');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingType` (catalogingTypeID, shortName) values (3, 'MARCit');
+
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (1, 'Completed');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (2, 'Ongoing');
+INSERT INTO `_DATABASE_NAME_`.`CatalogingStatus` (catalogingStatusID, shortName) values (3, 'Rejected');
+
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Support');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Accounting');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('General');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Licensing');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Sales');
+INSERT INTO `_DATABASE_NAME_`.`ContactRole` (shortName) values ('Training');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('USD', 'United States Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('EUR', 'Euro');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('GBP', 'Great Britain (UK) Pound');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('CAD', 'Canadian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('ARS', 'Argentine Peso');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('AUD', 'Australian Dollar');
+INSERT INTO `_DATABASE_NAME_`.`Currency` (currencyCode, shortName) values ('SEK', 'Swedish Krona');
+
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Admin');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('FTP');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Statistics');
+INSERT INTO `_DATABASE_NAME_`.`ExternalLoginType` (shortName) values ('Support');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Pending');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('Completed');
+INSERT INTO `_DATABASE_NAME_`.`LicenseStatus` (shortName) values ('No License Required');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Product Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Acquisition Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Access Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('General');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Licensing Details');
+INSERT INTO `_DATABASE_NAME_`.`NoteType` (shortName) values ('Initial Note');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('Ongoing');
+INSERT INTO `_DATABASE_NAME_`.`OrderType` (shortName) values ('One Time');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (2, 'Institute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (3, 'American Institute of Aeronautics and Astronautics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (4, 'American Physical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (5, 'American Society of Civil Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (6, 'American Insitute of Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (7, 'Society for Industrial and Applied Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (8, 'TNS Media Intelligence');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (9, 'Chemical Abstracts Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (10, 'Risk Management Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (11, 'American Concrete Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (12, 'American Association for Cancer Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (13, 'Institution of Engineering and Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (14, 'American Economic Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (15, 'American Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (16, 'American Medical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (18, 'Consejo Superior de Investigaciones Cientificas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (19, 'American Meteorological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (20, 'American Library Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (21, 'American Society for Testing and Materials');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (22, 'Association of Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (23, 'American Society of Limnology and Oceanography');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (24, 'Tablet Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (25, 'American Psychological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (26, 'American Council of Learned Societies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (27, 'American Association for the Advancement of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (28, 'Thomson Healthcare and Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (29, 'Elsevier');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (30, 'JSTOR');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (31, 'SAGE Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (32, 'American Geophysical Union');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (33, 'Annual Reviews');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (34, 'BioOne');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (35, 'Gale');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (36, 'Wiley');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (37, 'Oxford University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (38, 'Springer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (39, 'Taylor and Francis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (40, 'Stanford University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (41, 'University of California Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (42, 'EBSCO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (43, 'Blackwell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (44, 'Ovid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (45, 'Project Muse');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (46, 'American Fisheries Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (47, 'Neilson Journals Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (48, 'GuideStar USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (49, 'Alexander Street Press, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (50, 'Informa Healthcare USA, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (51, 'ProQuest LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (52, 'Accessible Archives Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (53, 'ACCU Weather Sales and Services, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (54, 'Adam Matthew Digital Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (55, 'Akademiai Kiado');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (56, 'World Trade Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (57, 'World Scientific');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (58, 'Walter de Gruyter');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (59, 'Cambridge University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (60, 'GeoScienceWorld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (61, 'IEEE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (62, 'Yankelovich Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (63, 'Nature Publishing Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (64, 'Verlag der Zeitschrift fur Naturforschung ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (65, 'White Horse Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (66, 'Verlag C.H. Beck');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (67, 'Vault, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (68, 'Value Line, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (69, 'Vanderbilt University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (70, 'Uniworld Business Publications, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (71, 'Universum USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (72, 'University of Wisconsin Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (73, 'University of Virginia Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (74, 'University of Toronto Press Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (75, 'University of Toronto');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (76, 'University of Pittsburgh');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (77, 'University of Illinois Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (78, 'University of Chicago Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (79, 'University of Barcelona');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (80, 'UCLA Chicano Studies Research Center Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (81, 'Transportation Research Board');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (82, 'Trans Tech Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (83, 'Thomas Telford Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (84, 'Thesaurus Linguae Graecae');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (85, 'Tetrad Computer Applications Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (86, 'Swank Motion Pictures, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (87, 'Standard and Poors');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (88, 'SPIE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (89, 'European Society of Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (90, 'Society of Environmental Toxicology and Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (91, 'Society of Antiquaries of Scotland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (92, 'Society for Reproduction and Fertility');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (93, 'Society for Neuroscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (94, 'Society for Leukocyte Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (95, 'Society for General Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (96, 'Society for Experimental Biology and Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (97, 'Society for Endocrinology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (98, 'Societe Mathematique de France');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (99, 'Social Explorer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (404, 'SETAC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (101, 'Swiss Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (102, 'Scholarly Digital Editions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (103, 'Royal Society of London');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (104, 'Royal Society of Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (105, 'Roper Center for Public Opinion Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (106, 'Rockefeller University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (107, 'Rivista di Studi italiani');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (108, 'Reuters Loan Pricing Corporation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (109, 'Religious and Theological Abstracts, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (110, 'Psychoanalytic Electronic Publishing Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (111, 'Cornell University Library');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (112, 'Preservation Technologies LP');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (113, 'Portland Press Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (114, 'ITHAKA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (115, 'Philosophy Documentation Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (116, 'Peeters Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (117, 'Paratext');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (118, 'Mathematical Sciences Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (119, 'Oxford Centre of Hebrew and Jewish Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (120, 'NewsBank, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (121, 'Massachusetts Medical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (122, 'Naxos of America, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (123, 'National Research Council of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (124, 'National Gallery Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (125, 'National Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (126, 'Mintel International Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (127, 'Metropolitan Opera');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (128, 'M.E. Sharpe, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (129, 'Mergent, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (130, 'Mediamark Research and Intelligence, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (131, 'Mary Ann Liebert, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (132, 'MIT Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (133, 'MarketResearch.com, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (134, 'Marine Biological Laboratory');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (135, 'W.S. Maney and Son Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (136, 'Manchester University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (137, 'Lord Music Reference Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (138, 'Liverpool University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (139, 'Seminario Matematico of the University of Padua');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (140, 'Library of Congress, Cataloging Distribution Service');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (141, 'LexisNexis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (142, 'Corporacion Latinobarometro');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (143, 'Landes Bioscience');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (144, 'Keesings Worldwide, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (145, 'Karger');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (146, 'John Benjamins Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (147, 'Irish Newspaper Archives Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (148, 'IPA Source, LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (149, 'International Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (150, 'Intelligence Research Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (151, 'Intellect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (152, 'InteLex');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (153, 'Institute of Mathematics of the Polish Academy of Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (154, 'Ingentaconnect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (155, 'INFORMS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (156, 'Information Resources, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (157, 'Indiana University Mathematics Journal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (158, 'Incisive Media Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (159, 'IGI Global ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (160, 'IBISWorld USA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (161, 'H.W. Wilson Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (162, 'University of Houston Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (163, 'Histochemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (164, 'Morningstar Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (165, 'Paradigm Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (166, 'HighWire Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (167, 'Heldref Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (168, 'Haworth Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (417, 'Thomson Legal');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (170, 'IOS Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (171, 'Agricultural Institute of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (172, 'Allen Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (173, 'H1 Base, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (175, 'Global Science Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (176, 'Geographic Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (177, 'Genetics Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (178, 'Franz Steiner Verlag');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (179, 'Forrester Research, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (180, 'Federation of American Societies for Experimental Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (181, 'Faulkner Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (182, 'ExLibris');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (183, 'Brill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (184, 'Evolutionary Ecology Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (185, 'European Mathematical Society Publishing House');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (186, 'New York Review of Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (187, 'Dunstans Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (188, 'Equinox Publishing Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (189, 'Entomological Society of Canada');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (190, 'American Association of Immunologists, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (191, 'Endocrine Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (192, 'EDP Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (193, 'Edinburgh University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (194, 'Ecological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (195, 'East View Information Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (196, 'Dun and Bradstreet Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (197, 'Duke University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (198, 'Digital Distributed Community Archive');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (199, 'Albert C. Muller');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (200, 'Dialogue Foundation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (201, 'Dialog');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (202, 'Current History, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (203, 'CSIRO Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (204, 'CQ Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (205, 'Japan Focus');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (206, 'Carbon Disclosure Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (207, 'University of Buckingham Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (208, 'Boopsie, INC.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (209, 'Company of Biologists Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (210, 'Chronicle of Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (211, 'CCH Incorporated');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (212, 'CareerShift LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (213, 'Canadian Mathematical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (214, 'Cambridge Crystallographic Data Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (215, 'CABI Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (216, 'Business Monitor International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (217, 'Bureau of National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (218, 'Bulletin of the Atomic Scientists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (219, 'Brepols Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (221, 'Botanical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (222, 'BMJ Publishing Group Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (223, 'BioMed Central');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (224, 'Berkeley Electronic Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (225, 'Berghahn Books');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (226, 'Berg Publishers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (227, 'Belser Wissenschaftlicher Dienst Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (228, 'Beilstein Information Systems, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (229, 'Barkhuis Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (230, 'Augustine Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (231, 'Asempa Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (232, 'ARTstor Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (233, 'Applied Probability Trust');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (234, 'Antiquity Publications Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (235, 'Ammons Scientific Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (236, 'American Statistical Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (237, 'American Society of Tropical Medicine and Hygiene');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (238, 'American Society of Plant Biologists');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (239, 'Teachers College Record');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (240, 'American Society of Agronomy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (241, 'American Society for Nutrition');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (242, 'American Society for Horticultural Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (243, 'American Society for Clinical Investigation');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (244, 'American Society for Cell Biology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (245, 'American Psychiatric Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (246, 'American Phytopathological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (247, 'American Physiological Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (248, 'Encyclopaedia Britannica Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (249, 'Agricultural History Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (250, 'Begell House, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (251, 'Hans Zell Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (252, 'Alliance for Children and Families');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (253, 'Robert Blakemore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (254, 'IVES Group, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (255, 'Massachusetts Institute of Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (256, 'Marquis Who\'s Who LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (257, 'Atypon Systems Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (258, 'Worldwatch Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (259, 'Thomson Financial');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (260, 'Digital Heritage Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (261, 'U.S. Department of Commerce');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (262, 'Lipper Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (263, 'Chiniquy Collection');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (264, 'OCLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (265, 'Consumer Electronics Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (267, 'Institutional Shareholder Services Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (268, 'KLD Research and Analytics Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (269, 'BIGresearch LLC');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (270, 'Cambridge Scientific Abstracts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (271, 'American Institute of Certified Public Accountants');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (272, 'Terra Scientific Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (273, 'American Counseling Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (274, 'Army Times Publishing Company');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (275, 'Librairie Droz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (276, 'American Academy of Religion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (277, 'Boyd Printing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (278, 'Canadian Association of African Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (279, 'Experian Marketing Solutions, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (280, 'Centro de Investigaciones Sociologicas');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (281, 'Chorus America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (282, 'College Art Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (283, 'Human Kinetics Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (288, 'NERL');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (293, 'Colegio de Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (294, 'University of Iowa');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (295, 'Academy of the Hebrew Language');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (296, 'FamilyLink.com, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (297, 'SISMEL - Edizioni del Galluzzo');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (301, 'Informaworld');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (302, 'ScienceDirect');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (304, 'China Data Center');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (305, 'Association for Computing Machinery');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (306, 'American Chemical Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (307, 'Design Research Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (308, 'ABC-CLIO');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (311, 'American Association on Intellectual and Developmental Disabilities ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (310, 'American Antiquarian Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (312, 'American Society for Microbiology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (314, 'American Society of Mechanical Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (315, 'Now Publishers, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (316, 'Cabell Publishing Company, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (317, 'Center for Research Libraries');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (444, 'Cold North Wind Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (321, 'Erudit ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (322, 'American Institute of Mathematical Sciences');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (324, 'American Sociological Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (325, 'Archaeological Institute of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (326, 'Bertrand Russell Research Centre');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (328, 'Cork University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (329, 'College Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (330, 'Council for Learning Disabilities');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (331, 'International Society on Hypertension in Blacks (ISHIB)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (332, 'Firenze University Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (333, 'History of Earth Sciences Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (334, 'History Today Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (335, 'Journal of Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (336, 'University of Nebraska at Omaha');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (337, 'Journal of Indo-European Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (338, 'Library Binding Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (339, 'McFarland & Co. Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (340, 'Lyrasis');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (341, 'Amigos Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (343, 'Fabrizio Serra Editore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (344, 'Aux Amateurs');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (346, 'National Affairs, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (357, 'Society of Chemical Industry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (347, 'New Criterion');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (348, 'Casa Editrice Leo S. Olschki s.r.l.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (349, 'Rhodes University, Department of Philosophy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (350, 'Rocky Mountain Mathematics Consortium');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (352, 'Royal Irish Academy');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (353, 'Chadwyck-Healey');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (354, 'CSA illumina');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (355, 'New School for Social Research');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (356, 'Society of Biblical Literature');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (358, 'Stazione Zoologica Anton Dohrn');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (359, 'BioScientifica Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (360, 'CASALINI LIBRI');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (361, 'Institute of Organic Chemistry');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (362, 'Columbia International Affairs Online ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (363, 'Corporation for National Research Initiatives ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (364, 'Tilgher-Genova');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (365, 'Emerald Group Publishing Limited');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (366, 'Geological Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (367, 'Institute of Mathematical Statistics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (368, 'Institute of Pure and Applied Physics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (369, 'JSTAGE');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (370, 'Metapress');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (371, 'Modern Language Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (372, 'Optical Society of America');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (373, 'University of British Columbia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (374, 'University of New Mexico');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (375, 'Vandenhoeck & Ruprecht');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (376, 'Verlag Mohr Siebeck GmbH & Co. KG');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (377, 'Palgrave Macmillan');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (378, 'Vittorio Klostermann');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (379, 'Project Euclid');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (380, 'Psychonomic Society ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (411, 'Cengage Learning');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (382, 'Infotrieve');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (383, 'Society of Automotive Engineers');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (384, 'Turpion Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (426, 'Midwest Collaborative for Library Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (386, 'Lawrence Erlbaum Associates');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (387, 'Alphagraphics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (388, 'Bellerophon Publications, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (389, 'Boydell & Brewer Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (390, 'Carcanet Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (391, 'Feminist Studies');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (393, 'Dustbooks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (394, 'Society for Applied Anthropology ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (395, 'United Nations Publications');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (396, 'Wharton Research Data Services');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (398, 'Human Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (399, 'infoUSA Marketing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (400, 'Bowker');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (402, 'Brown University');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (401, 'Women Writers Project');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (445, 'Coutts');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (446, 'Numara Software, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (447, 'Trinity College Library Dublin');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (405, 'Oldenbourg Wissenschaftsverlag ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (406, 'Dow Jones');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (412, 'Financial Information Inc. (FII)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (408, 'Jackson Publishing and Distribution');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (409, 'Elsevier Engineering Information, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (410, 'Eneclann Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (413, 'UCLA Latin American Institute');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (414, 'Harmonie Park Press ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (415, 'Harrassowitz');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (416, 'Thomson Reuters');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (418, 'Human Relations Area Files, Inc. ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (432, 'Capital IQ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (419, 'Society for Ethnomusicology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (420, 'MSCI RiskMetrics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (421, 'Rapid Multimedia');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (422, 'MSCI Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (423, 'New England Journal of Medicine');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (424, 'NetLibrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (425, 'CARMA');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (427, 'Public Library of Science');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (428, 'Social Science Electronic Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (429, 'United Nations Industrial Develoipment Organization');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (430, 'University of Michigan Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (431, 'ORS Publishing, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (433, 'McGraw-Hill');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (434, 'Biblical Archaeology Society');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (435, 'GeoLytics, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (436, 'JoVE ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (437, 'ICEsoft Technologies, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (438, 'Films Media Group');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (439, 'Films on Demand');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (440, 'Connect Journals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (441, 'Scuola Normale Superiore');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (442, 'Wolters Kluwer');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (448, 'Pier Professional');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (449, 'ABC News');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (450, 'University of Aberdeen ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (451, 'BullFrog Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (453, 'FirstSearch');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (455, 'History Cooperative ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (456, 'Omohundro Institute of Early American History and Culture');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (457, 'Arms Control Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (458, 'Heritage Archives');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (459, 'International Historic Films, Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (460, 'Euromonitor International ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (461, 'Safari Books Online');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (462, 'Mirabile');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (466, 'Publishing Technology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (463, 'SageWorks, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (464, 'Johns Hopkins Universtiy Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (465, 'Knovel ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (467, 'American Society of Nephrology');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (468, 'Water Envrionment Federation ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (469, 'Refworks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (470, 'Cinemagician Productions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (471, 'Algorithmics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (472, 'YBP Library Services ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (474, 'Maydream Inc.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (475, 'Organization for Economic Cooperation and Development');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (476, 'The Chronicle for Higher Education');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (477, 'Association for Research in Vision and Ophthalmologie (ARVO)');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (478, 'SRDS Media Solutions');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (479, 'Kantar Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (480, 'Peace & Justice Studies Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (481, 'Addison Publications Ltd.');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (482, 'Mutii-Science Publishing');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (483, 'ASM International');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (484, 'Verlag der Osterreichischen Akademie der Wissenschaften');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (485, 'Anthology of Recorded Music');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (486, 'Left Coast Press, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (487, 'Video Data Bank');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (488, 'Atlassian');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (489, 'medici.tv');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (490, 'Bar Ilan Research & Development Company Ltd');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (491, 'Primary Source Media');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (492, 'Ebrary');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (493, 'University of Michigan, Department of Mathematics');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (494, 'StataCorp LP ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (495, 'L\' Enseignement Mathematique  ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (496, 'Audio Engineering Society, Inc');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (497, 'LOCKSS');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (498, 'MUSEEC ');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (499, 'Mortgage Bankers Association');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (500, 'BibleWorks');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (501, 'National Library of Ireland');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (502, 'Scholars Press');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (503, 'Index to Jewish periodicals');
+INSERT INTO `_DATABASE_NAME_`.Organization (organizationID, shortName) values (504, 'Cold Spring Harbor Laboratory Press');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Consortium");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Library");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Platform");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Provider");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Publisher");
+INSERT INTO `_DATABASE_NAME_`.OrganizationRole (shortName) values ("Vendor");
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('admin');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('add/edit');
+INSERT INTO `_DATABASE_NAME_`.`Privilege` (shortName) values ('view only');
+
+
+INSERT INTO `_DATABASE_NAME_`.`PurchaseSite` (shortName) values ('Main Library');
+
+
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('Parent');
+INSERT INTO `_DATABASE_NAME_`.`RelationshipType` (shortName) values ('General');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (1, 'Print + Electronic');
+INSERT INTO `_DATABASE_NAME_`.`ResourceFormat` (resourceFormatID, shortName) values (2, 'Electronic');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('In Progress');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Completed');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Saved');
+INSERT INTO `_DATABASE_NAME_`.`Status` (shortName) values ('Archived');
+
+
+INSERT INTO `_DATABASE_NAME_`.`StorageLocation` (shortName) values ('Reserve Book Room');
+
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('1');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('2');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('3');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('4');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('5');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('6');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('7');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('8');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('9');
+INSERT INTO `_DATABASE_NAME_`.`UserLimit` (shortName) values ('10+');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (1, '2', '','1');
+
+INSERT INTO `_DATABASE_NAME_`.`Workflow` (workflowID, resourceFormatIDValue, resourceTypeIDValue, acquisitionTypeIDValue)
+VALUES (2, '2', '','2');
+
+
+
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (1, 'Access');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (2, 'Licensing');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (3, 'Funding Approval');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (4, 'Acquisitions');
+INSERT INTO `_DATABASE_NAME_`.`UserGroup` (userGroupID, groupName) VALUES (5, 'Receipt');
+
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (1, NULL, 'Funding Approval', 3, 1, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (2, NULL, 'Licensing', 2, 1, 2);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (3, 2, 'Order Processing', 4, 1, 3);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (4, 3, 'Activation', 1, 1, 4);
+
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (5, NULL, 'Licensing', 2, 2, 1);
+INSERT INTO `_DATABASE_NAME_`.`Step` (stepID, priorStepID, stepName, userGroupID, workflowID, displayOrderSequence)
+VALUES (6, NULL, 'Activation', 1, 2, 2);
diff --git a/js/forms/costForm.js b/js/forms/costForm.js
index 8d5fc7e..cd3bffd 100644
--- a/js/forms/costForm.js
+++ b/js/forms/costForm.js
@@ -105,13 +105,13 @@ $(function(){
 		var cNote     = $('.newPaymentTable').children().children().children().children('.costNote').val();
 						
 		if ((pAmount == '' || pAmount == null) && (fName == '' || fName == null)){
-			$('#div_errorPayment').html('Error - Either amount or fund is required');
+			$('#div_errorPayment').html(_("Error - Either amount or fund is required"));
 			return false;		
 		}else if((typeID == '') || (typeID == null)){
-			$('#div_errorPayment').html('Error - order type is a required field');
+			$('#div_errorPayment').html(_("Error - order type is a required field"));
 			return false;
 		}else if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-			$('#div_errorPayment').html('Error - price is not numeric');
+			$('#div_errorPayment').html(_("Error - price is not numeric"));
 			return false;		
 		}else{
 
@@ -129,8 +129,8 @@ $(function(){
 
 			$('.newPaymentTR').children().children().children('.addPayment').attr({
 			  src: 'images/cross.gif',
-			  alt: 'remove this payment',
-			  title: 'remove this payment'
+			  alt: _("remove this payment"),
+			  title: _("remove this payment")
 			});
 			$('.newPaymentTR').children().children().children('.addPayment').addClass('remove').css("text-align","center");
 			$('.newPaymentTR').children().children('.paymentAmount').val(pAmount);
@@ -280,19 +280,19 @@ function submitCostForm(){
 
 	//also perform same checks on the current record in case add button wasn't clicked
 	if ((((pAmount == '') || (pAmount == null)) && ((fName == '') || (fName == null))) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - Either price or fund is required');
+		$('#div_errorPayment').html(_("Error - Either price or fund is required"));
 		myReturn="1";		
 
 	}
 
 	if(((typeID == '') || (typeID == null)) && ((pAmount != '') || (fName != ''))){
-		$('#div_errorPayment').html('Error - order type is a required field');
+		$('#div_errorPayment').html(_("Error - order type is a required field"));
 		myReturn="1";
 	}
 
 	
 	if ((pAmount != '') && (pAmount != null) && (isAmount(pAmount) === false)){
-		$('#div_errorPayment').html('Error - price is not numeric');
+		$('#div_errorPayment').html(_("Error - price is not numeric"));
 		myReturn="1";		
 	}
  	
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 6f8e9dc46b33a67b505c02a7d8ce666f00d84f60..ed4104b13ed431224e0a17bd5046e3756a20241e 100644
GIT binary patch
literal 35657
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
XtAhS;HE(k!phoV7s>|L<+Q<8Ug953C

delta 11361
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index cdb722a..44e9fcd 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-04-27 15:49+0100\n"
-"PO-Revision-Date: 2015-04-27 15:49+0100\n"
+"POT-Creation-Date: 2015-05-04 17:16+0100\n"
+"PO-Revision-Date: 2015-05-04 17:17+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -16,7 +16,11 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
 
-#: admin.php:51 ajax_htmldata.php:2175 ajax_htmldata.php:2468
+#: admin.php:22 admin.php:40
+msgid "Administration"
+msgstr "Administration"
+
+#: admin.php:51 ajax_htmldata/getAdminWorkflowDisplay.php:74
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -32,9 +36,11 @@ msgstr "Mèthode d'accès"
 msgid "Account Type"
 msgstr "Type d'account"
 
-#: admin.php:55 ajax_forms.php:279 ajax_htmldata.php:1700
-#: ajax_htmldata.php:1769 ajax_htmldata.php:1831 ajax_htmldata.php:2046
-#: ajax_htmldata.php:2410 index.php:100
+#: admin.php:55 ajax_forms/getNewResourceForm.php:176
+#: ajax_htmldata/getAdminWorkflowDisplay.php:16
+#: ajax_htmldata/getOutstandingQueue.php:21 ajax_htmldata/getSavedQueue.php:20
+#: ajax_htmldata/getSearchResources.php:116
+#: ajax_htmldata/getSubmittedQueue.php:17 index.php:100
 msgid "Acquisition Type"
 msgstr "Type d'acquisition"
 
@@ -42,7 +48,7 @@ msgstr "Type d'acquisition"
 msgid "Administering Site"
 msgstr "Administration du site"
 
-#: admin.php:58 ajax_htmldata.php:2328
+#: admin.php:58 ajax_htmldata/getAdminAlertDisplay.php:10
 msgid "Alert Settings"
 msgstr "Configuration des alertes"
 
@@ -67,66 +73,71 @@ msgid "Cataloging Status"
 msgstr "Statut de catalogue "
 
 #: admin.php:65
-msgid "Cataloging Type"
-msgstr "Type de catalogue "
+msgid "CatalogingType"
+msgstr "Type de catalogage"
 
 #: admin.php:66
 msgid "Contact Role"
 msgstr "Contact Rôle"
 
-#: admin.php:67 ajax_htmldata.php:2234
+#: admin.php:68 ajax_forms/getCostForm.php:70
+msgid "Cost Details"
+msgstr "Détails de coût"
+
+#: admin.php:70 ajax_htmldata/getAdminCurrencyDisplay.php:8
 msgid "Currency"
 msgstr "Concurrence"
 
-#: admin.php:68
+#: admin.php:71
 msgid "License Status"
 msgstr "Statut de la licence"
 
-#: admin.php:69 index.php:344
+#: admin.php:72 index.php:344
 msgid "Note Type"
 msgstr "Type de note"
 
-#: admin.php:70
+#: admin.php:73
 msgid "Order Type"
 msgstr "Type d'ordre"
 
-#: admin.php:77
+#: admin.php:80
 msgid "Organization Role"
 msgstr "Rôle dans l'organisation"
 
-#: admin.php:78 ajax_forms.php:747
+#: admin.php:81
 msgid "Organizations"
 msgstr "Organisation"
 
-#: admin.php:82
+#: admin.php:85
 msgid "Purchasing Site"
 msgstr "Site d'achat"
 
-#: admin.php:83 ajax_htmldata.php:2411 index.php:186
+#: admin.php:86 ajax_htmldata/getAdminWorkflowDisplay.php:17 index.php:186
 msgid "Resource Format"
 msgstr "Format de la ressource"
 
-#: admin.php:84 ajax_forms.php:466 ajax_htmldata.php:2412 index.php:210
+#: admin.php:87 ajax_forms/getNewResourceForm.php:223
+#: ajax_htmldata/getAdminWorkflowDisplay.php:18 index.php:210
 msgid "Resource Type"
 msgstr "Type de ressource"
 
-#: admin.php:85
+#: admin.php:88
 msgid "Storage Location"
 msgstr "Lieu de stockage"
 
-#: admin.php:86 ajax_htmldata.php:326
+#: admin.php:89 ajax_htmldata/getProductDetails.php:301
 msgid "Subjects"
 msgstr "Sujets"
 
-#: admin.php:87
+#: admin.php:90
 msgid "User Limit"
 msgstr "Limit d'utilisateurs"
 
-#: admin.php:92 queue.php:59
+#: admin.php:95 queue.php:59
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: admin.php:115
+#: admin.php:118
 msgid "You do not have permissions to access this screen."
 msgstr "Vous n'avez pas la permission d'accéder dans cette page."
 
@@ -154,867 +165,1186 @@ msgstr "Modifier selections DDW facet/term à: "
 msgid "Email template file not found: "
 msgstr "Le fichier template pour l'email est introuvable: "
 
-#: ajax_forms.php:47
-msgid "Edit Note"
-msgstr "Modifier une note"
-
-#: ajax_forms.php:47
-msgid "Add Note"
-msgstr "Ajouter une note"
-
-#: ajax_forms.php:57
-msgid "Note Type:"
-msgstr "Type de note:"
-
-#: ajax_forms.php:77 ajax_forms.php:1934 ajax_htmldata.php:1297
-msgid "Notes:"
-msgstr "Notes:"
-
-#: ajax_forms.php:90 ajax_forms.php:538 ajax_forms.php:941 ajax_forms.php:1296
-#: ajax_forms.php:1505 ajax_forms.php:1780 ajax_forms.php:1957
-#: ajax_forms.php:2064 ajax_forms.php:2171 ajax_forms.php:2234
-#: ajax_forms.php:2303 ajax_forms.php:2413 ajax_forms.php:2506
-#: ajax_forms.php:2578 ajax_forms.php:2879 ajax_forms.php:3045
-#: ajax_forms.php:3098 ajax_forms.php:3151 ajax_forms.php:3295
-#: resources/cataloging_edit.php:102
-msgid "submit"
-msgstr "Confirmer"
-
-#: ajax_forms.php:91 ajax_forms.php:539 ajax_forms.php:942 ajax_forms.php:1297
-#: ajax_forms.php:1506 ajax_forms.php:1781 ajax_forms.php:1958
-#: ajax_forms.php:2065 ajax_forms.php:2172 ajax_forms.php:2235
-#: ajax_forms.php:2304 ajax_forms.php:2414 ajax_forms.php:2507
-#: ajax_forms.php:2579 ajax_forms.php:2880 ajax_forms.php:3046
-#: ajax_forms.php:3099 ajax_forms.php:3152 ajax_forms.php:3296
-#: resources/cataloging_edit.php:103
-msgid "cancel"
-msgstr "Annuler"
-
-#: ajax_forms.php:188
-msgid "Edit Saved Resource"
-msgstr "Modifier ressource enregistré"
-
-#: ajax_forms.php:188
-msgid "Add New Resource"
-msgstr "Ajouter une nouvelle ressource"
-
-#: ajax_forms.php:189
-msgid "* required fields"
-msgstr "* champs obligatoires"
-
-#: ajax_forms.php:195 ajax_forms.php:635
-msgid "Product"
-msgstr "Produit"
-
-#: ajax_forms.php:204 ajax_forms.php:645 ajax_forms.php:1839
-#: ajax_forms.php:2109 ajax_forms.php:2736
-msgid "Name:"
-msgstr "Nom:"
-
-#: ajax_forms.php:209 ajax_forms.php:650 ajax_htmldata.php:290 summary.php:347
-msgid "Description:"
-msgstr "Description:"
-
-#: ajax_forms.php:214
-msgid "Provider:"
-msgstr "Fournisseur:"
-
-#: ajax_forms.php:235
-msgid "Format"
-msgstr "Format"
-
-#: ajax_forms.php:326 ajax_forms.php:1104 ajax_htmldata.php:612
-#: summary.php:477
-msgid "Initial Cost"
-msgstr "Coût Initial"
-
-#: ajax_forms.php:335 ajax_forms.php:1112
-msgid "Fund:"
-msgstr "Fond:"
-
-#: ajax_forms.php:336 ajax_forms.php:1113
-msgid "Price:"
-msgstr "Prix:"
-
-#: ajax_forms.php:337 ajax_forms.php:707 ajax_forms.php:848
-#: ajax_forms.php:1114 ajax_forms.php:2117 ajax_forms.php:2702
-#: ajax_htmldata.php:1367
-msgid "Type:"
-msgstr "Type:"
-
-#: ajax_forms.php:382 ajax_forms.php:1157
-msgid "add this payment"
-msgstr "Ajouter ce payment"
-
-#: ajax_forms.php:382 ajax_forms.php:1157
-msgid "add payment"
-msgstr "Ajouter un payment"
-
-#: ajax_forms.php:446 ajax_forms.php:1220 js/forms/acquisitionsForm.js:142
-#: js/forms/acquisitionsForm.js:143 js/forms/resourceNewForm.js:246
-#: js/forms/resourceNewForm.js:247
-msgid "remove this payment"
-msgstr "Effacer ce payment"
-
-#: ajax_forms.php:512
-msgid "Notes"
-msgstr "Notes"
-
-#: ajax_forms.php:521
-msgid "Include any additional information"
-msgstr "Inclure quelque information additional"
-
-#: ajax_forms.php:537
-msgid "save"
-msgstr "Enregistrer"
-
-#: ajax_forms.php:626
-msgid "Edit Resource"
-msgstr "Modifier la ressource"
-
-#: ajax_forms.php:672
-msgid "Parent:"
-msgstr "Parent:"
-
-#: ajax_forms.php:688 ajax_forms.php:2687
-msgid "Format:"
-msgstr "Format:"
-
-#: ajax_forms.php:726 ajax_forms.php:1888 ajax_htmldata.php:115
-msgid "Archived:"
-msgstr "Archivé:"
-
-#: ajax_forms.php:755
-msgid "Role:"
-msgstr "Rôle:"
-
-#: ajax_forms.php:756 ajax_htmldata.php:1058 ajax_htmldata.php:1249
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: ajax_forms.php:778
-msgid "add organization"
-msgstr "Ajouter une organisation"
-
-#: ajax_forms.php:818
-msgid "remove organization"
-msgstr "Supprimer une organisation"
-
-#: ajax_forms.php:818 ajax_forms.php:1417
-msgid "remove "
-msgstr "Supprimer "
-
-#: ajax_forms.php:818
-msgid " organization"
-msgstr " organisation"
-
-#: ajax_forms.php:840
-msgid "Aliases"
-msgstr "Des alias:"
-
-#: ajax_forms.php:849
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ajax_forms.php:871
-msgid "add this alias"
-msgstr "Ajouter cet alias"
-
-#: ajax_forms.php:871
-msgid "add alias"
-msgstr "Ajouter alias"
-
-#: ajax_forms.php:912 js/forms/resourceUpdateForm.js:223
-#: js/forms/resourceUpdateForm.js:224
-msgid "remove this alias"
-msgstr "Effacer cet alias"
-
-#: ajax_forms.php:1029
-msgid "Edit Acquisitions Information"
-msgstr "Modifier l'information des acquisitions"
-
-#: ajax_forms.php:1038 ajax_htmldata.php:547 summary.php:414
-msgid "Order"
-msgstr "Ordre"
-
-#: ajax_forms.php:1045 ajax_forms.php:2671 ajax_htmldata.php:558
-#: summary.php:421
-msgid "Acquisition Type:"
-msgstr "Type d'acquisition:"
-
-#: ajax_forms.php:1063 ajax_htmldata.php:565 summary.php:428
-msgid "Order Number:"
-msgstr "Numero d'ordre:"
-
-#: ajax_forms.php:1068 ajax_htmldata.php:572 summary.php:435
-msgid "System Number:"
-msgstr "Nombre de système:"
-
-#: ajax_forms.php:1073 ajax_htmldata.php:593 summary.php:458
-msgid "Subscription Start:"
-msgstr "Début d'abonnement:"
-
-#: ajax_forms.php:1078 ajax_htmldata.php:600 summary.php:465
-msgid "Subscription End:"
-msgstr "Fin d'abonnement:"
-
-#: ajax_forms.php:1088
-msgid "Enable Alert"
-msgstr "Activer l'alerte"
-
-#: ajax_forms.php:1247
-msgid "Purchasing Site(s)"
-msgstr "Site d'achat(s)"
-
-#: ajax_forms.php:1364
-msgid "Edit Licenses"
-msgstr "Modifier les licences"
-
-#: ajax_forms.php:1374
-msgid "License Records"
-msgstr "Licences entregistrées"
-
-#: ajax_forms.php:1390
-msgid "add license"
-msgstr "Ajouter une licence"
-
-#: ajax_forms.php:1417
-msgid "remove license link"
-msgstr "Supprimer le lien de la licence"
-
-#: ajax_forms.php:1417
-msgid " license"
-msgstr " licence"
-
-#: ajax_forms.php:1442
-msgid "Licensing Status"
-msgstr "Statut des licences"
-
-#: ajax_forms.php:1450 ajax_htmldata.php:105 ajax_htmldata.php:666
-#: summary.php:205 summary.php:508
-msgid "Status:"
-msgstr "Statut:"
-
-#: ajax_forms.php:1474
-msgid "History:"
-msgstr "Historie:"
-
-#: ajax_forms.php:1480 ajax_htmldata.php:124 ajax_htmldata.php:126
-#: ajax_htmldata.php:149 ajax_htmldata.php:151 ajax_htmldata.php:173
-#: ajax_htmldata.php:175 ajax_htmldata.php:447 ajax_htmldata.php:672
-#: ajax_htmldata.php:766 ajax_htmldata.php:1451 ajax_htmldata.php:1453
-#: ajax_htmldata.php:1480 ajax_htmldata.php:1482 ajax_htmldata.php:1486
-#: ajax_htmldata.php:1488 resources/cataloging.php:223 summary.php:219
-#: summary.php:245 summary.php:399 summary.php:514 summary.php:590
-#: summary.php:712 summary.php:825
-msgid " by "
-msgstr " par "
+#: ajax_forms.php:25
+msgid "Form action "
+msgstr "Action "
 
-#: ajax_forms.php:1483 ajax_htmldata.php:675 summary.php:517
-msgid "No license status information available."
-msgstr "L'information de statut de la licence n'est pas disponible."
+#: ajax_forms.php:25 ajax_htmldata.php:27 ajax_processing.php:27
+msgid " not set up!"
+msgstr " ne pas etabli!"
 
-#: ajax_forms.php:1588
+#: ajax_forms/getAccessForm.php:59
 msgid "Edit Access"
 msgstr "Modifier l'accès"
 
-#: ajax_forms.php:1597
+#: ajax_forms/getAccessForm.php:68
 msgid "Access"
 msgstr "Acèss"
 
-#: ajax_forms.php:1604 ajax_htmldata.php:843 summary.php:625
+#: ajax_forms/getAccessForm.php:75 ajax_htmldata/getAccessDetails.php:57
+#: summary.php:633
 msgid "Authentication Type:"
 msgstr "Type d'accès:"
 
-#: ajax_forms.php:1619 ajax_forms.php:2036
+#: ajax_forms/getAccessForm.php:90 ajax_forms/getAccountForm.php:58
 msgid "Username:"
 msgstr "Nom d'utilisateur:"
 
-#: ajax_forms.php:1623 ajax_htmldata.php:888 summary.php:662
+#: ajax_forms/getAccessForm.php:94 ajax_htmldata/getAccessDetails.php:102
+#: summary.php:670
 msgid "Access Method:"
 msgstr "Mèthode d'accès:"
 
-#: ajax_forms.php:1638 ajax_forms.php:2043 ajax_htmldata.php:1273
+#: ajax_forms/getAccessForm.php:109 ajax_forms/getAccountForm.php:65
+#: ajax_htmldata/getAccountDetails.php:80
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: ajax_forms.php:1642 ajax_htmldata.php:874 summary.php:655
+#: ajax_forms/getAccessForm.php:113 ajax_htmldata/getAccessDetails.php:88
+#: summary.php:663
 msgid "Storage Location:"
 msgstr "Lieu de stockage:"
 
-#: ajax_forms.php:1657 ajax_htmldata.php:858 summary.php:639
+#: ajax_forms/getAccessForm.php:128 ajax_htmldata/getAccessDetails.php:72
+#: summary.php:647
 msgid "Simultaneous User Limit:"
 msgstr "Limite d'utilisateurs similtanées"
 
-#: ajax_forms.php:1674 ajax_htmldata.php:881
+#: ajax_forms/getAccessForm.php:145 ajax_htmldata/getAccessDetails.php:95
 msgid "Coverage:"
 msgstr "Coverture:"
 
-#: ajax_forms.php:1692
+#: ajax_forms/getAccessForm.php:163
 msgid "Authorized Site(s)"
 msgstr "Site(s) autorisé(s)"
 
-#: ajax_forms.php:1737
+#: ajax_forms/getAccessForm.php:208
 msgid "Administering Site(s)"
 msgstr "Administration du site(s)"
 
-#: ajax_forms.php:1826
-msgid "Edit Contact"
-msgstr "Modifier le contact"
-
-#: ajax_forms.php:1826
-msgid "Add Contact"
-msgstr "Ajouter un contact"
-
-#: ajax_forms.php:1846 ajax_htmldata.php:1075
-msgid "Title:"
-msgstr "Titre:"
-
-#: ajax_forms.php:1853 ajax_htmldata.php:1108
-msgid "Phone:"
-msgstr "Téléphone:"
-
-#: ajax_forms.php:1860 ajax_htmldata.php:1116
-msgid "Alt Phone:"
-msgstr "Téléphone Alt:"
-
-#: ajax_forms.php:1881 ajax_htmldata.php:1083
-msgid "Address:"
-msgstr "Adresse:"
+#: ajax_forms/getAccessForm.php:251 ajax_forms/getAccountForm.php:86
+#: ajax_forms/getAdminAlertDaysForm.php:34
+#: ajax_forms/getAdminAlertEmailForm.php:34
+#: ajax_forms/getAdminCurrencyUpdateForm.php:38
+#: ajax_forms/getAdminUpdateForm.php:44
+#: ajax_forms/getAdminUserGroupForm.php:147
+#: ajax_forms/getAdminUserUpdateForm.php:66
+#: ajax_forms/getAdminWorkflowForm.php:266 ajax_forms/getAttachmentForm.php:89
+#: ajax_forms/getContactForm.php:161 ajax_forms/getCostForm.php:252
+#: ajax_forms/getDetailSubjectUpdateForm.php:38
+#: ajax_forms/getGeneralDetailSubjectForm.php:128
+#: ajax_forms/getGeneralSubjectUpdateForm.php:38
+#: ajax_forms/getLicenseForm.php:191 ajax_forms/getNewResourceForm.php:295
+#: ajax_forms/getNoteForm.php:61 ajax_forms/getOrderForm.php:160
+#: ajax_forms/getUpdateProductForm.php:423 resources/cataloging_edit.php:102
+msgid "submit"
+msgstr "Confirmer"
 
-#: ajax_forms.php:1898
-msgid "Role(s):"
-msgstr "Rôle(s)"
+#: ajax_forms/getAccessForm.php:252 ajax_forms/getAccountForm.php:87
+#: ajax_forms/getAdminAlertDaysForm.php:35
+#: ajax_forms/getAdminAlertEmailForm.php:35
+#: ajax_forms/getAdminCurrencyUpdateForm.php:39
+#: ajax_forms/getAdminUpdateForm.php:45
+#: ajax_forms/getAdminUserGroupForm.php:148
+#: ajax_forms/getAdminUserUpdateForm.php:67
+#: ajax_forms/getAdminWorkflowForm.php:267 ajax_forms/getAttachmentForm.php:90
+#: ajax_forms/getContactForm.php:162 ajax_forms/getCostForm.php:253
+#: ajax_forms/getDetailSubjectUpdateForm.php:39
+#: ajax_forms/getGeneralDetailSubjectForm.php:129
+#: ajax_forms/getGeneralSubjectUpdateForm.php:39
+#: ajax_forms/getLicenseForm.php:192 ajax_forms/getNewResourceForm.php:296
+#: ajax_forms/getNoteForm.php:62 ajax_forms/getOrderForm.php:161
+#: ajax_forms/getResourceSubjectForm.php:49
+#: ajax_forms/getUpdateProductForm.php:424 resources/cataloging_edit.php:103
+msgid "cancel"
+msgstr "Annuler"
 
-#: ajax_forms.php:1995
+#: ajax_forms/getAccountForm.php:17
 msgid "Edit Account"
 msgstr "Modifier la compte"
 
-#: ajax_forms.php:1995
+#: ajax_forms/getAccountForm.php:17
 msgid "Add Account"
 msgstr "Ajouter une compte"
 
-#: ajax_forms.php:2005
+#: ajax_forms/getAccountForm.php:27
 msgid "Login Type:"
 msgstr "Type de connexion:"
 
-#: ajax_forms.php:2029 ajax_htmldata.php:1289
+#: ajax_forms/getAccountForm.php:44 ajax_forms/getNewResourceForm.php:115
+#: ajax_forms/getUpdateProductForm.php:101 summary.php:743
+msgid "URL:"
+msgstr "URL:"
+
+#: ajax_forms/getAccountForm.php:51 ajax_htmldata/getAccountDetails.php:96
 msgid "Registered Email:"
 msgstr "Email enregistré:"
 
-#: ajax_forms.php:2098
-msgid "Edit Attachment"
-msgstr "Modifier la pièce jointe"
+#: ajax_forms/getAccountForm.php:72 ajax_forms/getContactForm.php:138
+#: ajax_forms/getNoteForm.php:48 ajax_htmldata/getAccountDetails.php:104
+#: ajax_htmldata/getContactDetails.php:165
+msgid "Notes:"
+msgstr "Notes:"
 
-#: ajax_forms.php:2098
-msgid "Add Attachment"
-msgstr "Ajouter pièce jointe"
+#: ajax_forms/getAdminAlertDaysForm.php:14
+msgid "Edit Alert Days In Advance"
+msgstr "Modifier l'alerte jours à l'avance"
 
-#: ajax_forms.php:2137
-msgid "File:"
-msgstr "Fichier:"
+#: ajax_forms/getAdminAlertDaysForm.php:14
+msgid "Add Alert Days In Advance"
+msgstr "Ajouter alerte jours à l'avance"
 
-#: ajax_forms.php:2143
-msgid "replace with new file"
-msgstr "remplacer avec un nouveau fichier"
+#: ajax_forms/getAdminAlertEmailForm.php:14
+msgid "Edit Alert Email Address"
+msgstr "Modifier l'alerte d'adresse email"
 
-#: ajax_forms.php:2158 ajax_htmldata.php:1375
-msgid "Details:"
-msgstr "Détails:"
+#: ajax_forms/getAdminAlertEmailForm.php:14
+msgid "Add Alert Email Address"
+msgstr "Ajouter alerte d'adresse email"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:14
+msgid "Edit Currency"
+msgstr "Modifier la Concurrence"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:14
+msgid "Add Currency"
+msgstr "Ajouter Concurrence"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:24
+#: ajax_htmldata/getAdminCurrencyDisplay.php:14
+msgid "Code"
+msgstr "Code"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:27
+#: ajax_htmldata/getAdminCurrencyDisplay.php:15
+#: ajax_htmldata/getOutstandingQueue.php:20 ajax_htmldata/getSavedQueue.php:18
+#: ajax_htmldata/getSearchResources.php:113
+#: ajax_htmldata/getSubmittedQueue.php:15
+msgid "Name"
+msgstr "Nom"
 
-#: ajax_forms.php:2206 ajax_forms.php:3076 ajax_forms.php:3129
+#: ajax_forms/getAdminUpdateForm.php:16
+#: ajax_forms/getDetailSubjectUpdateForm.php:16
+#: ajax_forms/getGeneralSubjectUpdateForm.php:16
 msgid "Edit "
 msgstr "Modifier"
 
-#: ajax_forms.php:2206 ajax_forms.php:3076 ajax_forms.php:3129
+#: ajax_forms/getAdminUpdateForm.php:16
+#: ajax_forms/getDetailSubjectUpdateForm.php:16
+#: ajax_forms/getGeneralSubjectUpdateForm.php:16
 msgid "Add "
 msgstr "Ajouter"
 
-#: ajax_forms.php:2221
+#: ajax_forms/getAdminUpdateForm.php:31
 msgid "Show stats button?"
 msgstr "Montrer les boutons de statistiques?"
 
-#: ajax_forms.php:2279
-msgid "Edit Currency"
-msgstr "Modifier la Concurrence"
+#: ajax_forms/getAdminUserGroupForm.php:17
+msgid "Edit User Group"
+msgstr "Modifier le groupe d'utilisateur"
 
-#: ajax_forms.php:2279
-msgid "Add Currency"
-msgstr "Ajouter Concurrence"
+#: ajax_forms/getAdminUserGroupForm.php:17
+msgid "Add User Group"
+msgstr "Ajouter une groupe d'utilisateur"
 
-#: ajax_forms.php:2289 ajax_htmldata.php:2240
-msgid "Code"
-msgstr "Code"
+#: ajax_forms/getAdminUserGroupForm.php:26
+msgid "User Group"
+msgstr "Groupe d'utilisateur"
 
-#: ajax_forms.php:2292 ajax_htmldata.php:1698 ajax_htmldata.php:1767
-#: ajax_htmldata.php:1830 ajax_htmldata.php:2043 ajax_htmldata.php:2241
-msgid "Name"
-msgstr "Nom"
+#: ajax_forms/getAdminUserGroupForm.php:34
+msgid "Group Name:"
+msgstr "Nom du groupe"
+
+#: ajax_forms/getAdminUserGroupForm.php:41
+msgid "Email Address:"
+msgstr "Adresse email"
+
+#: ajax_forms/getAdminUserGroupForm.php:58
+msgid "Assigned Users"
+msgstr "Utilisateurs asignés"
 
-#: ajax_forms.php:2368
+#: ajax_forms/getAdminUserGroupForm.php:82
+msgid "add user"
+msgstr "Ajouter un utilisateur"
+
+#: ajax_forms/getAdminUserGroupForm.php:121
+#: js/forms/generalDetailSubjectForm.js:135 js/forms/userGroupForm.js:117
+msgid "remove user from group"
+msgstr "Supprimer un utilisateur du groupe"
+
+#: ajax_forms/getAdminUserUpdateForm.php:21
 msgid "Edit User"
 msgstr "Modifier l'utilisateur"
 
-#: ajax_forms.php:2368
+#: ajax_forms/getAdminUserUpdateForm.php:21
 msgid "Add New User"
 msgstr "Ajouter un nouveau utilisateur"
 
-#: ajax_forms.php:2379 ajax_htmldata.php:2178
+#: ajax_forms/getAdminUserUpdateForm.php:32
+#: ajax_htmldata/getAdminUserDisplay.php:22
 msgid "Login ID"
 msgstr "Identifiant de connexion"
 
-#: ajax_forms.php:2380 ajax_htmldata.php:2179
+#: ajax_forms/getAdminUserUpdateForm.php:33
+#: ajax_htmldata/getAdminUserDisplay.php:23
 msgid "First Name"
 msgstr "Prènom"
 
-#: ajax_forms.php:2381 ajax_htmldata.php:2180
+#: ajax_forms/getAdminUserUpdateForm.php:34
+#: ajax_htmldata/getAdminUserDisplay.php:24
 msgid "Last Name"
 msgstr "Nom"
 
-#: ajax_forms.php:2382 ajax_htmldata.php:2183 ajax_htmldata.php:2334
-#: ajax_htmldata.php:2467
+#: ajax_forms/getAdminUserUpdateForm.php:35
+#: ajax_htmldata/getAdminAlertDisplay.php:16
+#: ajax_htmldata/getAdminUserDisplay.php:27
+#: ajax_htmldata/getAdminWorkflowDisplay.php:73
 msgid "Email Address"
 msgstr "Adresse email"
 
-#: ajax_forms.php:2383 ajax_htmldata.php:2181
+#: ajax_forms/getAdminUserUpdateForm.php:36
+#: ajax_htmldata/getAdminUserDisplay.php:25
 msgid "Privilege"
 msgstr "Privilège"
 
-#: ajax_forms.php:2401 ajax_htmldata.php:2182
+#: ajax_forms/getAdminUserUpdateForm.php:54
+#: ajax_htmldata/getAdminUserDisplay.php:26
 msgid "View Accounts"
 msgstr "Montrer les comptes"
 
-#: ajax_forms.php:2486
-msgid "Edit Alert Email Address"
-msgstr "Modifier l'alerte d'adresse email"
+#: ajax_forms/getAdminWorkflowForm.php:42
+msgid "Edit Workflow"
+msgstr "Modifier le workflow"
 
-#: ajax_forms.php:2486
-msgid "Add Alert Email Address"
-msgstr "Ajouter alerte d'adresse email"
+#: ajax_forms/getAdminWorkflowForm.php:51
+msgid "Resource Entry Requirements"
+msgstr "Conditions d'entrée des ressources"
 
-#: ajax_forms.php:2558
-msgid "Edit Alert Days In Advance"
-msgstr "Modifier l'alerte jours à l'avance"
-
-#: ajax_forms.php:2558
-msgid "Add Alert Days In Advance"
-msgstr "Ajouter alerte jours à l'avance"
+#: ajax_forms/getAdminWorkflowForm.php:58 ajax_forms/getOrderForm.php:46
+#: ajax_htmldata/getAcquisitionsDetails.php:108 summary.php:429
+msgid "Acquisition Type:"
+msgstr "Type d'acquisition:"
 
-#: ajax_forms.php:2655
-msgid "Edit Workflow"
-msgstr "Modifier le workflow"
+#: ajax_forms/getAdminWorkflowForm.php:74
+#: ajax_forms/getUpdateProductForm.php:170
+msgid "Format:"
+msgstr "Format:"
 
-#: ajax_forms.php:2664
-msgid "Resource Entry Requirements"
-msgstr "Conditions d'entrée des ressources"
+#: ajax_forms/getAdminWorkflowForm.php:89 ajax_forms/getAttachmentForm.php:35
+#: ajax_forms/getUpdateProductForm.php:330
+#: ajax_htmldata/getAttachmentDetails.php:47
+msgid "Type:"
+msgstr "Type:"
 
-#: ajax_forms.php:2727
+#: ajax_forms/getAdminWorkflowForm.php:114
 msgid "Workflow Steps"
 msgstr "Étapes du Workflow"
 
-#: ajax_forms.php:2737
+#: ajax_forms/getAdminWorkflowForm.php:123 ajax_forms/getAttachmentForm.php:27
+#: ajax_forms/getContactForm.php:43 ajax_forms/getNewResourceForm.php:100
+#: ajax_forms/getUpdateProductForm.php:91
+msgid "Name:"
+msgstr "Nom:"
+
+#: ajax_forms/getAdminWorkflowForm.php:124
 msgid "Approval/Notification Group:"
 msgstr "Approbation/Notification de Groupe"
 
-#: ajax_forms.php:2738
+#: ajax_forms/getAdminWorkflowForm.php:125
 msgid "Parent Step"
 msgstr "Parent étape"
 
-#: ajax_forms.php:2768
+#: ajax_forms/getAdminWorkflowForm.php:155
 msgid "add step"
 msgstr "Ajouter une étape"
 
-#: ajax_forms.php:2851 js/forms/workflowForm.js:201
+#: ajax_forms/getAdminWorkflowForm.php:238 js/forms/workflowForm.js:201
 #: js/forms/workflowForm.js:202
 msgid "remove this step"
 msgstr "Effacer cet étape"
 
-#: ajax_forms.php:2915
-msgid "Edit User Group"
-msgstr "Modifier le groupe d'utilisateur"
+#: ajax_forms/getAttachmentForm.php:16
+msgid "Edit Attachment"
+msgstr "Modifier la pièce jointe"
 
-#: ajax_forms.php:2915
-msgid "Add User Group"
-msgstr "Ajouter une groupe d'utilisateur"
+#: ajax_forms/getAttachmentForm.php:16
+msgid "Add Attachment"
+msgstr "Ajouter pièce jointe"
 
-#: ajax_forms.php:2924
-msgid "User Group"
-msgstr "Groupe d'utilisateur"
+#: ajax_forms/getAttachmentForm.php:55
+msgid "File:"
+msgstr "Fichier:"
 
-#: ajax_forms.php:2932
-msgid "Group Name:"
-msgstr "Nom du groupe"
+#: ajax_forms/getAttachmentForm.php:61
+msgid "replace with new file"
+msgstr "remplacer avec un nouveau fichier"
 
-#: ajax_forms.php:2939
-msgid "Email Address:"
-msgstr "Adresse email"
+#: ajax_forms/getAttachmentForm.php:76
+#: ajax_htmldata/getAttachmentDetails.php:55
+msgid "Details:"
+msgstr "Détails:"
 
-#: ajax_forms.php:2956
-msgid "Assigned Users"
-msgstr "Utilisateurs asignés"
+#: ajax_forms/getContactForm.php:30
+msgid "Edit Contact"
+msgstr "Modifier le contact"
 
-#: ajax_forms.php:2980
-msgid "add user"
-msgstr "Ajouter un utilisateur"
+#: ajax_forms/getContactForm.php:30
+msgid "Add Contact"
+msgstr "Ajouter un contact"
 
-#: ajax_forms.php:3019 js/forms/generalDetailSubjectForm.js:135
-#: js/forms/userGroupForm.js:117
-msgid "remove user from group"
-msgstr "Supprimer un utilisateur du groupe"
+#: ajax_forms/getContactForm.php:50 ajax_htmldata/getContactDetails.php:100
+msgid "Title:"
+msgstr "Titre:"
+
+#: ajax_forms/getContactForm.php:57 ajax_htmldata/getContactDetails.php:133
+msgid "Phone:"
+msgstr "Téléphone:"
+
+#: ajax_forms/getContactForm.php:64 ajax_htmldata/getContactDetails.php:141
+msgid "Alt Phone:"
+msgstr "Téléphone Alt:"
+
+#: ajax_forms/getContactForm.php:71 ajax_htmldata/getContactDetails.php:149
+msgid "Fax:"
+msgstr "Fax:"
+
+#: ajax_forms/getContactForm.php:78 ajax_htmldata/getContactDetails.php:157
+msgid "Email:"
+msgstr "Email:"
+
+#: ajax_forms/getContactForm.php:85 ajax_htmldata/getContactDetails.php:108
+msgid "Address:"
+msgstr "Adresse:"
+
+#: ajax_forms/getContactForm.php:92 ajax_forms/getUpdateProductForm.php:208
+#: ajax_htmldata/getProductDetails.php:90
+msgid "Archived:"
+msgstr "Archivé:"
+
+#: ajax_forms/getContactForm.php:102
+msgid "Role(s):"
+msgstr "Rôle(s)"
+
+#: ajax_forms/getCostForm.php:48
+msgid "Edit Cost Information"
+msgstr "Modifier l'information de coût"
+
+#: ajax_forms/getCostForm.php:55 ajax_htmldata/getAcquisitionsDetails.php:169
+#: summary.php:485
+msgid "Cost History"
+msgstr "Historie de coût"
+
+#: ajax_forms/getCostForm.php:62 ajax_htmldata/getAcquisitionsDetails.php:178
+msgid "Year"
+msgstr "Année"
+
+#: ajax_forms/getCostForm.php:63 ajax_htmldata/getAcquisitionsDetails.php:179
+msgid "Sub Start"
+msgstr "Début d'abonnement"
+
+#: ajax_forms/getCostForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:180
+msgid "Sub End"
+msgstr "Fin d'abonnement"
+
+#: ajax_forms/getCostForm.php:66 ajax_htmldata/getAcquisitionsDetails.php:182
+#: index.php:90
+msgid "Fund"
+msgstr "Fonds"
+
+#: ajax_forms/getCostForm.php:67 ajax_htmldata/getAcquisitionsDetails.php:183
+msgid "Payment"
+msgstr "Paiement"
+
+#: ajax_forms/getCostForm.php:68 ajax_htmldata/getAcquisitionsDetails.php:187
+msgid "Type"
+msgstr "Type"
+
+#: ajax_forms/getCostForm.php:72
+msgid "Note"
+msgstr "Note"
+
+#: ajax_forms/getCostForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:193
+msgid "Invoice"
+msgstr "Facture"
+
+#: ajax_forms/getCostForm.php:138
+msgid "add this payment"
+msgstr "Ajouter ce paiement"
 
-#: ajax_forms.php:3185
+#: ajax_forms/getCostForm.php:138
+msgid "add payment"
+msgstr "Ajouter un paiement"
+
+#: ajax_forms/getCostForm.php:222 js/forms/acquisitionsForm.js:147
+#: js/forms/acquisitionsForm.js:148 js/forms/costForm.js:132
+#: js/forms/costForm.js:133
+msgid "remove this payment"
+msgstr "Effacer ce paiement"
+
+#: ajax_forms/getGeneralDetailSubjectForm.php:18
 msgid "Add / Edit Subject Relationships"
 msgstr "Ajouter / Modifier la relation des sujets"
 
-#: ajax_forms.php:3194 ajax_htmldata.php:2553 ajax_htmldata.php:2642
-#: index.php:251
+#: ajax_forms/getGeneralDetailSubjectForm.php:27
+#: ajax_htmldata/getAdminSubjectDisplay.php:98 index.php:251
 msgid "General Subject"
 msgstr "Sujet général"
 
-#: ajax_forms.php:3220
+#: ajax_forms/getGeneralDetailSubjectForm.php:53
 msgid "Detailed Subjects"
 msgstr "Sujet détaillé"
 
-#: ajax_forms.php:3242
+#: ajax_forms/getGeneralDetailSubjectForm.php:75
 msgid "add detail subject"
 msgstr "Ajouter sujet détaillé"
 
-#: ajax_forms.php:3272
+#: ajax_forms/getGeneralDetailSubjectForm.php:105
 msgid "remove detailed subject"
 msgstr "Supprimer le sujet détaillé"
 
-#: ajax_forms.php:3274 ajax_htmldata.php:2574 ajax_htmldata.php:2615
+#: ajax_forms/getGeneralDetailSubjectForm.php:107
+#: ajax_htmldata/getAdminSubjectDisplay.php:30
+#: ajax_htmldata/getAdminSubjectDisplay.php:71
 msgid "subject in use"
 msgstr "Sujet en utilisation"
 
-#: ajax_forms.php:3318
+#: ajax_forms/getLicenseForm.php:50
+msgid "Edit Licenses"
+msgstr "Modifier les licences"
+
+#: ajax_forms/getLicenseForm.php:60
+msgid "License Records"
+msgstr "Licences entregistrées"
+
+#: ajax_forms/getLicenseForm.php:76
+msgid "add license"
+msgstr "Ajouter une licence"
+
+#: ajax_forms/getLicenseForm.php:103
+msgid "remove license link"
+msgstr "Supprimer le lien de la licence"
+
+#: ajax_forms/getLicenseForm.php:103 ajax_forms/getUpdateProductForm.php:300
+msgid "remove "
+msgstr "Supprimer "
+
+#: ajax_forms/getLicenseForm.php:103
+msgid " license"
+msgstr " licence"
+
+#: ajax_forms/getLicenseForm.php:128
+msgid "Licensing Status"
+msgstr "Statut des licences"
+
+#: ajax_forms/getLicenseForm.php:136
+#: ajax_htmldata/getAcquisitionsDetails.php:270
+#: ajax_htmldata/getProductDetails.php:80 summary.php:212 summary.php:516
+msgid "Status:"
+msgstr "Statut:"
+
+#: ajax_forms/getLicenseForm.php:160
+msgid "History:"
+msgstr "Historie:"
+
+#: ajax_forms/getLicenseForm.php:166 ajax_htmldata/getAccessDetails.php:173
+#: ajax_htmldata/getAcquisitionsDetails.php:276
+#: ajax_htmldata/getAcquisitionsDetails.php:370
+#: ajax_htmldata/getProductDetails.php:99
+#: ajax_htmldata/getProductDetails.php:101
+#: ajax_htmldata/getProductDetails.php:124
+#: ajax_htmldata/getProductDetails.php:126
+#: ajax_htmldata/getProductDetails.php:148
+#: ajax_htmldata/getProductDetails.php:150
+#: ajax_htmldata/getProductDetails.php:422
+#: ajax_htmldata/getRoutingDetails.php:48
+#: ajax_htmldata/getRoutingDetails.php:50
+#: ajax_htmldata/getRoutingDetails.php:77
+#: ajax_htmldata/getRoutingDetails.php:79 resources/cataloging.php:223
+#: summary.php:226 summary.php:252 summary.php:407 summary.php:522
+#: summary.php:598 summary.php:720 summary.php:833
+msgid " by "
+msgstr " par "
+
+#: ajax_forms/getLicenseForm.php:169
+#: ajax_htmldata/getAcquisitionsDetails.php:279 summary.php:525
+msgid "No license status information available."
+msgstr "L'information de statut de la licence n'est pas disponible."
+
+#: ajax_forms/getNewResourceForm.php:84
+msgid "Edit Saved Resource"
+msgstr "Modifier ressource enregistré"
+
+#: ajax_forms/getNewResourceForm.php:84
+msgid "Add New Resource"
+msgstr "Ajouter une nouvelle ressource"
+
+#: ajax_forms/getNewResourceForm.php:85
+msgid "required fields"
+msgstr "champs obligatoires"
+
+#: ajax_forms/getNewResourceForm.php:91 ajax_forms/getUpdateProductForm.php:81
+msgid "Product"
+msgstr "Produit"
+
+#: ajax_forms/getNewResourceForm.php:105
+#: ajax_forms/getUpdateProductForm.php:96
+#: ajax_htmldata/getProductDetails.php:265 summary.php:355
+msgid "Description:"
+msgstr "Description:"
+
+#: ajax_forms/getNewResourceForm.php:110
+msgid "Provider:"
+msgstr "Fournisseur:"
+
+#: ajax_forms/getNewResourceForm.php:120
+#: ajax_forms/getUpdateProductForm.php:106
+#: ajax_htmldata/getProductDetails.php:257 summary.php:347
+msgid "Alt URL:"
+msgstr "URL Alt:"
+
+#: ajax_forms/getNewResourceForm.php:131
+msgid "Format"
+msgstr "Format"
+
+#: ajax_forms/getNewResourceForm.php:269
+#: ajax_htmldata/getAcquisitionsDetails.php:191
+msgid "Notes"
+msgstr "Notes"
+
+#: ajax_forms/getNewResourceForm.php:278
+msgid "Include any additional information"
+msgstr "Inclure quelque information additional"
+
+#: ajax_forms/getNewResourceForm.php:294
+msgid "save"
+msgstr "Enregistrer"
+
+#: ajax_forms/getNoteForm.php:18
+msgid "Edit Note"
+msgstr "Modifier une note"
+
+#: ajax_forms/getNoteForm.php:18
+msgid "Add Note"
+msgstr "Ajouter une note"
+
+#: ajax_forms/getNoteForm.php:28
+msgid "Note Type:"
+msgstr "Type de note:"
+
+#: ajax_forms/getOrderForm.php:33
+msgid "Edit Acquisitions Information"
+msgstr "Modifier l'information des acquisitions"
+
+#: ajax_forms/getOrderForm.php:40 ajax_htmldata/getAcquisitionsDetails.php:98
+#: summary.php:422
+msgid "Order"
+msgstr "Ordre"
+
+#: ajax_forms/getOrderForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:115
+#: summary.php:436
+msgid "Order Number:"
+msgstr "Numero d'ordre:"
+
+#: ajax_forms/getOrderForm.php:69 ajax_htmldata/getAcquisitionsDetails.php:122
+#: summary.php:443
+msgid "System Number:"
+msgstr "Nombre de système:"
+
+#: ajax_forms/getOrderForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:143
+#: summary.php:466
+msgid "Sub Start:"
+msgstr "Début d'abonnement:"
+
+#: ajax_forms/getOrderForm.php:79 summary.php:473
+msgid "Current Sub End:"
+msgstr "Fin d'abonnement courant:"
+
+#: ajax_forms/getOrderForm.php:89
+msgid "Enable Alert"
+msgstr "Activer l'alerte"
+
+#: ajax_forms/getOrderForm.php:111
+msgid "Purchasing Site(s)"
+msgstr "Site d'achat(s)"
+
+#: ajax_forms/getResourceSubjectForm.php:7
 msgid "Add General / Detail Subject Link"
 msgstr "Ajouter général / détail lien du sujet"
 
-#: ajax_forms.php:3325
+#: ajax_forms/getResourceSubjectForm.php:14
 msgid "General Subject Name"
 msgstr "Nom général du sujet"
 
-#: ajax_forms.php:3326
+#: ajax_forms/getResourceSubjectForm.php:15
 msgid "Detail Subject Name"
 msgstr "Détail du nom de sujet"
 
-#: ajax_forms.php:3338 ajax_forms.php:3345
+#: ajax_forms/getResourceSubjectForm.php:27
+#: ajax_forms/getResourceSubjectForm.php:34
 msgid "add"
 msgstr "Ajouter"
 
-#: ajax_forms.php:3356 ajax_htmldata.php:2214 ajax_htmldata.php:2261
-#: ajax_htmldata.php:2305 ajax_htmldata.php:2353 ajax_htmldata.php:2383
-#: ajax_htmldata.php:2443 ajax_htmldata.php:2494 ajax_htmldata.php:2537
-#: ajax_htmldata.php:2585 ajax_htmldata.php:2625 ajax_htmldata.php:2668
+#: ajax_forms/getResourceSubjectForm.php:45
+#: ajax_htmldata/getAdminAlertDisplay.php:35
+#: ajax_htmldata/getAdminAlertDisplay.php:65
+#: ajax_htmldata/getAdminDisplay.php:35
+#: ajax_htmldata/getAdminSubjectDisplay.php:41
+#: ajax_htmldata/getAdminSubjectDisplay.php:81
+#: ajax_htmldata/getAdminSubjectDisplay.php:124
+#: ajax_htmldata/getAdminUserDisplay.php:58
+#: ajax_htmldata/getAdminWorkflowDisplay.php:49
+#: ajax_htmldata/getAdminWorkflowDisplay.php:100
+#: ajax_htmldata/getGeneralSubjectDisplay.php:35
 msgid "(none found)"
 msgstr "(non trouvé)"
 
-#: ajax_forms.php:3374 ajax_htmldata.php:2677 ajax_processing.php:1399
-msgid "Action "
-msgstr "Action"
+#: ajax_forms/getUpdateProductForm.php:72
+msgid "Edit Resource"
+msgstr "Modifier la ressource"
 
-#: ajax_forms.php:3374 ajax_htmldata.php:2677 ajax_processing.php:1399
-msgid " not set up!"
-msgstr " ne pas etabli!"
+#: ajax_forms/getUpdateProductForm.php:118
+msgid "Parents:"
+msgstr "Parents:"
 
-#: ajax_htmldata.php:95 ajax_htmldata.php:444 ajax_htmldata.php:550
-#: ajax_htmldata.php:660 ajax_htmldata.php:763 ajax_htmldata.php:821
-#: ajax_htmldata.php:956 ajax_htmldata.php:1043 ajax_htmldata.php:1237
-#: ajax_htmldata.php:1355 ajax_htmldata.php:1729 ajax_htmldata.php:2203
-#: ajax_htmldata.php:2251 ajax_htmldata.php:2295 ajax_htmldata.php:2343
-#: ajax_htmldata.php:2373 ajax_htmldata.php:2433 ajax_htmldata.php:2484
-#: ajax_htmldata.php:2527 ajax_htmldata.php:2568 ajax_htmldata.php:2610
-#: ajax_htmldata.php:2659
-msgid "edit"
-msgstr "Modifier"
+#: ajax_forms/getUpdateProductForm.php:124
+msgid "add Parent resource"
+msgstr "Ajouter un ressource père"
 
-#: ajax_htmldata.php:95 ajax_htmldata.php:660 ajax_htmldata.php:821
-msgid "edit resource"
-msgstr "Modifier la ressource"
+#: ajax_forms/getUpdateProductForm.php:124
+msgid "add Parent Resource"
+msgstr "Ajouter un ressource père"
 
-#: ajax_htmldata.php:95
-msgid "remove resource"
-msgstr "Supprimer la ressource"
+#: ajax_forms/getUpdateProductForm.php:137 js/forms/resourceUpdateForm.js:286
+msgid "remove parent"
+msgstr "Enlever ce parent"
 
-#: ajax_htmldata.php:100 summary.php:199
-msgid "Record ID:"
-msgstr "ID d'enregistrement:"
+#: ajax_forms/getUpdateProductForm.php:148
+#: ajax_htmldata/getProductDetails.php:197 summary.php:292
+msgid "ISSN / ISBN:"
+msgstr "ISSN / ISBN:"
 
-#: ajax_htmldata.php:140 summary.php:211
-msgid "Created:"
-msgstr "Créé:"
+#: ajax_forms/getUpdateProductForm.php:152
+msgid "add Isbn"
+msgstr "Ajouter un ISBN"
 
-#: ajax_htmldata.php:165 summary.php:237
-msgid "Last Update:"
-msgstr "Dernière mise à jour:"
+#: ajax_forms/getUpdateProductForm.php:237
+msgid "Role:"
+msgstr "Rôle:"
 
-#: ajax_htmldata.php:190 summary.php:262
-msgid "Related Products:"
-msgstr "Produits connexes:"
+#: ajax_forms/getUpdateProductForm.php:238
+#: ajax_htmldata/getContactDetails.php:83
+msgid "Organization:"
+msgstr "Organisation:"
 
-#: ajax_htmldata.php:192
-msgid "Child:"
-msgstr "Enfant:"
+#: ajax_forms/getUpdateProductForm.php:260
+msgid "add organization"
+msgstr "Ajouter une organisation"
 
-#: ajax_htmldata.php:199 summary.php:267
-msgid "(Parent)"
-msgstr "(Parent)"
+#: ajax_forms/getUpdateProductForm.php:300
+msgid "remove organization"
+msgstr "Supprimer une organisation"
 
-#: ajax_htmldata.php:199 ajax_htmldata.php:212
-msgid "view resource"
-msgstr "Regarder la ressource"
+#: ajax_forms/getUpdateProductForm.php:300
+msgid "organization"
+msgstr "organisation"
 
-#: ajax_htmldata.php:199 ajax_htmldata.php:212 ajax_htmldata.php:260
-msgid "View "
-msgstr "Regarder "
+#: ajax_forms/getUpdateProductForm.php:322
+msgid "Aliases"
+msgstr "Des alias:"
 
-#: ajax_htmldata.php:236 summary.php:293
-msgid "Aliases:"
-msgstr "Aliases:"
+#: ajax_forms/getUpdateProductForm.php:331
+msgid "Alias:"
+msgstr "Alias:"
 
-#: ajax_htmldata.php:253 summary.php:310
-msgid "Organizations:"
-msgstr "Organisations:"
+#: ajax_forms/getUpdateProductForm.php:353
+msgid "add this alias"
+msgstr "Ajouter cet alias"
 
-#: ajax_htmldata.php:274 summary.php:331
-msgid "Resource URL:"
-msgstr "Ressource URL: "
+#: ajax_forms/getUpdateProductForm.php:353
+msgid "add alias"
+msgstr "Ajouter alias"
 
-#: ajax_htmldata.php:275
-msgid "Visit Resource URL"
-msgstr "Ressource URL de visite"
+#: ajax_forms/getUpdateProductForm.php:394 js/forms/resourceUpdateForm.js:232
+#: js/forms/resourceUpdateForm.js:233
+msgid "remove this alias"
+msgstr "Effacer cet alias"
 
-#: ajax_htmldata.php:283
-msgid "Visit Secondary Resource URL"
-msgstr "Ressource URL secondaire de visite"
+#: ajax_htmldata.php:27
+msgid "Data action "
+msgstr "Data Action "
 
-#: ajax_htmldata.php:298
-msgid "edit product details"
-msgstr "Modifier les détails du produit"
+#: ajax_htmldata/getAccessDetails.php:31 summary.php:612
+msgid "Access Information"
+msgstr "Information d'accès"
 
-#: ajax_htmldata.php:365
-msgid "remove subject"
-msgstr "Supprimer le sujet"
+#: ajax_htmldata/getAccessDetails.php:35
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getAccountDetails.php:44
+#: ajax_htmldata/getAcquisitionsDetails.php:100
+#: ajax_htmldata/getAcquisitionsDetails.php:171
+#: ajax_htmldata/getAcquisitionsDetails.php:264
+#: ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getAdminAlertDisplay.php:25
+#: ajax_htmldata/getAdminAlertDisplay.php:55
+#: ajax_htmldata/getAdminCurrencyDisplay.php:25
+#: ajax_htmldata/getAdminDisplay.php:25
+#: ajax_htmldata/getAdminSubjectDisplay.php:66
+#: ajax_htmldata/getAdminSubjectDisplay.php:115
+#: ajax_htmldata/getAdminUserDisplay.php:47
+#: ajax_htmldata/getAdminWorkflowDisplay.php:39
+#: ajax_htmldata/getAdminWorkflowDisplay.php:90
+#: ajax_htmldata/getAttachmentDetails.php:35
+#: ajax_htmldata/getContactDetails.php:68
+#: ajax_htmldata/getGeneralSubjectDisplay.php:25
+#: ajax_htmldata/getProductDetails.php:69
+#: ajax_htmldata/getProductDetails.php:419 ajax_htmldata/getSavedQueue.php:49
+msgid "edit"
+msgstr "Modifier"
 
-#: ajax_htmldata.php:386
-msgid "add new subject"
-msgstr "Ajouter nouveau sujet"
+#: ajax_htmldata/getAccessDetails.php:35
+#: ajax_htmldata/getAcquisitionsDetails.php:264
+#: ajax_htmldata/getProductDetails.php:69
+msgid "edit resource"
+msgstr "Modifier la ressource"
+
+#: ajax_htmldata/getAccessDetails.php:43 summary.php:626
+msgid "Administering Sites:"
+msgstr "Administration des sites:"
+
+#: ajax_htmldata/getAccessDetails.php:50 summary.php:458
+msgid "Authorized Sites:"
+msgstr "Sites autorisés:"
+
+#: ajax_htmldata/getAccessDetails.php:65 summary.php:640
+msgid "Username / Password:"
+msgstr "Nom d'utilisateur / Mot de passe:"
 
-#: ajax_htmldata.php:433 ajax_htmldata.php:752 ajax_htmldata.php:945
-#: resources/cataloging.php:209
+#: ajax_htmldata/getAccessDetails.php:80 summary.php:655
+msgid "Registered IP Address:"
+msgstr "Adresse IP enregistré:"
+
+#: ajax_htmldata/getAccessDetails.php:109
+msgid "No access information available"
+msgstr "Pas d'information d'accès disponible"
+
+#: ajax_htmldata/getAccessDetails.php:116
+msgid "edit access information"
+msgstr "Modifier l'accès à l'information"
+
+#: ajax_htmldata/getAccessDetails.php:159
+#: ajax_htmldata/getAcquisitionsDetails.php:356
+#: ajax_htmldata/getProductDetails.php:408 resources/cataloging.php:209
 msgid "Additional Notes"
 msgstr "Notes additionales"
 
-#: ajax_htmldata.php:436 ajax_htmldata.php:455 ajax_htmldata.php:755
-#: ajax_htmldata.php:774 ajax_htmldata.php:948 ajax_htmldata.php:967
-#: resources/cataloging.php:212 resources/cataloging.php:231
+#: ajax_htmldata/getAccessDetails.php:162
+#: ajax_htmldata/getAccessDetails.php:181
+#: ajax_htmldata/getAcquisitionsDetails.php:359
+#: ajax_htmldata/getAcquisitionsDetails.php:378
+#: ajax_htmldata/getProductDetails.php:411
+#: ajax_htmldata/getProductDetails.php:430 resources/cataloging.php:212
+#: resources/cataloging.php:231
 msgid "add new note"
 msgstr "ajouter une note"
 
-#: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
-#: resources/cataloging.php:220
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
 msgid "edit note"
 msgstr "Modifier une note"
 
-#: ajax_htmldata.php:444 ajax_htmldata.php:763 ajax_htmldata.php:956
-#: ajax_htmldata.php:1044 resources/cataloging.php:220
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getContactDetails.php:69
+#: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
 msgid "remove note"
 msgstr "effacer une note"
 
-#: ajax_htmldata.php:550 resources/cataloging.php:106
+#: ajax_htmldata/getAccountDetails.php:14
+#: ajax_htmldata/getContactDetails.php:35
+msgid "Resource Specific:"
+msgstr "Ressource spécifique:"
+
+#: ajax_htmldata/getAccountDetails.php:18
+msgid "No Resource Specific Accounts"
+msgstr "Il n'y a pas une ressource spécifié par les comptes"
+
+#: ajax_htmldata/getAccountDetails.php:22
+#: ajax_htmldata/getAccountDetails.php:119
+msgid "add new account"
+msgstr "Ajouter une nouvelle compte"
+
+#: ajax_htmldata/getAccountDetails.php:27
+#: ajax_htmldata/getContactDetails.php:48
+msgid "Inherited:"
+msgstr "Hérité:"
+
+#: ajax_htmldata/getAccountDetails.php:44
+msgid "edit account"
+msgstr "Modifier la compte"
+
+#: ajax_htmldata/getAccountDetails.php:44
+msgid "remove account"
+msgstr "Supprimer une compte"
+
+#: ajax_htmldata/getAccountDetails.php:57
+msgid "Visit Account in Organizations Module"
+msgstr "Visitez Comptes sur le module Organisations"
+
+#: ajax_htmldata/getAccountDetails.php:65
+msgid "Visit Login URL"
+msgstr "Source URL de connexion"
+
+#: ajax_htmldata/getAccountDetails.php:72
+msgid "User Name:"
+msgstr "Nom d'utilisateur:"
+
+#: ajax_htmldata/getAccountDetails.php:88
+#: ajax_htmldata/getContactDetails.php:173
+msgid "Last Updated:"
+msgstr "Dernière mise à jour:"
+
+#: ajax_htmldata/getAccountDetails.php:114
+msgid "No accounts available"
+msgstr "Pas des comptes disponibles"
+
+#: ajax_htmldata/getAcquisitionsDetails.php:100
+#: ajax_htmldata/getAcquisitionsDetails.php:159 resources/cataloging.php:106
 msgid "edit order information"
 msgstr "Modifier l'order de l'information"
 
-#: ajax_htmldata.php:586
+#: ajax_htmldata/getAcquisitionsDetails.php:127
+msgid "catalog view"
+msgstr "Vue du Catalogue"
+
+#: ajax_htmldata/getAcquisitionsDetails.php:136
 msgid "Purchasing Sites:"
 msgstr "Site d'achats:"
 
-#: ajax_htmldata.php:602 summary.php:467
+#: ajax_htmldata/getAcquisitionsDetails.php:152 summary.php:475
 msgid "Expiration Alert Enabled"
 msgstr "Alerte d'expiration activé"
 
-#: ajax_htmldata.php:642 summary.php:493
-msgid "No payment information available."
-msgstr "L'information du payment n'est pas disponible."
+#: ajax_htmldata/getAcquisitionsDetails.php:171
+#: ajax_htmldata/getAcquisitionsDetails.php:253
+msgid "edit cost history"
+msgstr "Modifier l'historie de coût"
 
-#: ajax_htmldata.php:648
-msgid "edit acquisitions information"
-msgstr "Modifier l'information des acquisitions"
+#: ajax_htmldata/getAcquisitionsDetails.php:189
+msgid "Details"
+msgstr "Détails"
+
+#: ajax_htmldata/getAcquisitionsDetails.php:247
+msgid "No payment information available"
+msgstr "L'information du paiement n'est pas disponible."
 
-#: ajax_htmldata.php:658 summary.php:503
+#: ajax_htmldata/getAcquisitionsDetails.php:262 summary.php:511
 msgid "License"
 msgstr "Licence"
 
-#: ajax_htmldata.php:672 summary.php:514
+#: ajax_htmldata/getAcquisitionsDetails.php:276 summary.php:522
 msgid " on "
 msgstr " sur "
 
-#: ajax_htmldata.php:685 summary.php:525
+#: ajax_htmldata/getAcquisitionsDetails.php:289 summary.php:533
 msgid "Licenses:"
 msgstr "Licences:"
 
-#: ajax_htmldata.php:691
+#: ajax_htmldata/getAcquisitionsDetails.php:295
 msgid "View License"
 msgstr "Regarder la licence"
 
-#: ajax_htmldata.php:694 summary.php:534
+#: ajax_htmldata/getAcquisitionsDetails.php:298 summary.php:542
 msgid "No associated licenses available."
 msgstr "Pas des licences associées disponibles."
 
-#: ajax_htmldata.php:708
+#: ajax_htmldata/getAcquisitionsDetails.php:312
 msgid "edit license and status"
 msgstr "Modifier la licence et le statut"
 
-#: ajax_htmldata.php:710
+#: ajax_htmldata/getAcquisitionsDetails.php:314
 msgid "edit license status"
 msgstr "Modifier le statut de la licence"
 
-#: ajax_htmldata.php:817 summary.php:604
-msgid "Access Information"
-msgstr "Information d'accès"
+#: ajax_htmldata/getAdminAlertDisplay.php:26
+#: ajax_htmldata/getAdminAlertDisplay.php:56
+#: ajax_htmldata/getAdminCurrencyDisplay.php:26
+#: ajax_htmldata/getAdminDisplay.php:26
+#: ajax_htmldata/getAdminSubjectDisplay.php:28
+#: ajax_htmldata/getAdminSubjectDisplay.php:69
+#: ajax_htmldata/getAdminUserDisplay.php:48
+#: ajax_htmldata/getAdminWorkflowDisplay.php:40
+#: ajax_htmldata/getAdminWorkflowDisplay.php:91
+#: ajax_htmldata/getGeneralSubjectDisplay.php:26
+msgid "remove"
+msgstr "Supprimer"
 
-#: ajax_htmldata.php:829 summary.php:618
-msgid "Administering Sites:"
-msgstr "Administration des sites:"
+#: ajax_htmldata/getAdminAlertDisplay.php:38
+msgid "add email address"
+msgstr "Ajouter une nouvelle adresse email"
 
-#: ajax_htmldata.php:836 summary.php:450
-msgid "Authorized Sites:"
-msgstr "Sites autorisés:"
+#: ajax_htmldata/getAdminAlertDisplay.php:46
+msgid "Days in advance of expiration"
+msgstr "Jours à l'avance de expiration"
 
-#: ajax_htmldata.php:851 summary.php:632
-msgid "Username / Password:"
-msgstr "Nom d'utilisateur / Mot de passe:"
+#: ajax_htmldata/getAdminAlertDisplay.php:71
+msgid "add days"
+msgstr "Ajouter jours"
 
-#: ajax_htmldata.php:866 summary.php:647
-msgid "Registered IP Address:"
-msgstr "Adresse IP enregistré:"
+#: ajax_htmldata/getAdminCurrencyDisplay.php:38
+msgid "add new currency"
+msgstr "Ajouter une nouvelle concurrence"
 
-#: ajax_htmldata.php:895 summary.php:612
-msgid "No access information available."
-msgstr "Pas d'information d'accès disponible."
+#: ajax_htmldata/getAdminDisplay.php:16
+#: ajax_htmldata/getAdminSubjectDisplay.php:57
+#: ajax_htmldata/getGeneralSubjectDisplay.php:16
+msgid "Value"
+msgstr "Valeur"
 
-#: ajax_htmldata.php:902
-msgid "edit access information"
-msgstr "Modifier l'accès à l'information"
+#: ajax_htmldata/getAdminDisplay.php:38
+#: ajax_htmldata/getAdminSubjectDisplay.php:44
+#: ajax_htmldata/getAdminSubjectDisplay.php:84
+#: ajax_htmldata/getGeneralSubjectDisplay.php:38
+msgid "add new "
+msgstr "Ajouter un nouveau  "
 
-#: ajax_htmldata.php:998
+#: ajax_htmldata/getAdminSubjectDisplay.php:51
+#: ajax_htmldata/getAdminSubjectDisplay.php:99 index.php:282
+msgid "Detailed Subject"
+msgstr "Sujet détaillé"
+
+#: ajax_htmldata/getAdminSubjectDisplay.php:92
+msgid "Subject Relationships"
+msgstr "Relation des sujets"
+
+#: ajax_htmldata/getAdminUserDisplay.php:47
+msgid "edit user"
+msgstr "Modifier l'utilisateur"
+
+#: ajax_htmldata/getAdminUserDisplay.php:54
+#: ajax_htmldata/getAdminUserDisplay.php:58
+msgid "add new user"
+msgstr "Ajouter un nouveau utilisateur"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:10
+msgid "Workflow Setup"
+msgstr "Configuration du workflow"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:54
+msgid "add workflow"
+msgstr "Ajouter workflow"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:56
+msgid "You must set up at least one user group before you can add workflows"
+msgstr ""
+"Vous devez configurer au moins une groupe, après vous pouvez ajouter "
+"workflows"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:66
+msgid "User Group Setup"
+msgstr "Configuration du groupe d'utilisateur"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:72
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#: ajax_htmldata/getAdminWorkflowDisplay.php:104
+msgid "add user group"
+msgstr "Ajouter groupe d'utilisateur"
+
+#: ajax_htmldata/getAttachmentDetails.php:30
+msgid "view attachment"
+msgstr "Regarder la pièce jointe"
+
+#: ajax_htmldata/getAttachmentDetails.php:35
+msgid "edit attachment"
+msgstr "Modifier la pièce jointe"
+
+#: ajax_htmldata/getAttachmentDetails.php:35
+msgid "remove this attachment"
+msgstr "Supprimer cette pièce jointe"
+
+#: ajax_htmldata/getAttachmentDetails.php:67
+msgid "No attachments available"
+msgstr "Pas des pièces jointes disponibles."
+
+#: ajax_htmldata/getAttachmentDetails.php:72
+msgid "add new attachment"
+msgstr "Ajouter une nouvelle pièce jointe"
+
+#: ajax_htmldata/getContactDetails.php:23
 msgid "The following are archived contacts:"
 msgstr "Les suivantes contacts sont archivées: "
 
-#: ajax_htmldata.php:1010 ajax_htmldata.php:1207
-msgid "Resource Specific:"
-msgstr "Ressource spécifique:"
-
-#: ajax_htmldata.php:1014
+#: ajax_htmldata/getContactDetails.php:39
 msgid "No Resource Specific Contacts"
 msgstr "Il n'y a pas une ressource spécifique par les contacts"
 
-#: ajax_htmldata.php:1018 ajax_htmldata.php:1162 ajax_htmldata.php:1172
+#: ajax_htmldata/getContactDetails.php:43
+#: ajax_htmldata/getContactDetails.php:187
+#: ajax_htmldata/getContactDetails.php:197
 msgid "add contact"
 msgstr "Ajouter un contact"
 
-#: ajax_htmldata.php:1023 ajax_htmldata.php:1220
-msgid "Inherited:"
-msgstr "Hérité:"
-
-#: ajax_htmldata.php:1043
+#: ajax_htmldata/getContactDetails.php:68
 msgid "edit contact"
 msgstr "Modifier le contact"
 
-#: ajax_htmldata.php:1044
+#: ajax_htmldata/getContactDetails.php:69
 msgid "remove contact"
 msgstr "Supprimer le contact"
 
-#: ajax_htmldata.php:1059
+#: ajax_htmldata/getContactDetails.php:84
 msgid "Visit Contact in Organizations Module"
 msgstr "Visitez contact dans le module Organisations"
 
-#: ajax_htmldata.php:1067
+#: ajax_htmldata/getContactDetails.php:92
 msgid "No longer valid:"
 msgstr "N'est plus valide:"
 
-#: ajax_htmldata.php:1091
+#: ajax_htmldata/getContactDetails.php:116
 msgid "Location:"
 msgstr "Emplacement:"
 
-#: ajax_htmldata.php:1148 ajax_htmldata.php:1281
-msgid "Last Updated:"
-msgstr "Dernière mise à jour:"
-
-#: ajax_htmldata.php:1170
+#: ajax_htmldata/getContactDetails.php:195
 msgid "No contacts available"
 msgstr "Pas de contacts disponibles"
 
-#: ajax_htmldata.php:1180
-msgid " archived contact(s) available. "
+#: ajax_htmldata/getContactDetails.php:205
+msgid " archived contact(s) available."
 msgstr " contact(s) archivée(s) disponible(s)."
 
-#: ajax_htmldata.php:1180
+#: ajax_htmldata/getContactDetails.php:205
 msgid "show archived contacts"
 msgstr "Montrer les contacts archivées"
 
-#: ajax_htmldata.php:1184
+#: ajax_htmldata/getContactDetails.php:209
 msgid "hide archived contacts"
 msgstr "Cacher les contacts archivées"
 
-#: ajax_htmldata.php:1211
-msgid "No Resource Specific Accounts"
-msgstr "Il n'y a pas une ressource spécifié par les comptes"
+#: ajax_htmldata/getOutstandingQueue.php:7 queue.php:51
+msgid "Outstanding Tasks"
+msgstr "Tâches en suspens"
+
+#: ajax_htmldata/getOutstandingQueue.php:12
+msgid "No outstanding requests"
+msgstr "Pas des requêtes en suspens"
+
+#: ajax_htmldata/getOutstandingQueue.php:19 ajax_htmldata/getSavedQueue.php:17
+#: ajax_htmldata/getSearchResources.php:112
+#: ajax_htmldata/getSubmittedQueue.php:14
+msgid "ID"
+msgstr "Identifiant"
+
+#: ajax_htmldata/getOutstandingQueue.php:22 index.php:553
+msgid "Routing Step"
+msgstr "Etape de routage"
+
+#: ajax_htmldata/getOutstandingQueue.php:23
+#: ajax_htmldata/getRoutingDetails.php:23
+msgid "Start Date"
+msgstr "Date de début"
+
+#: ajax_htmldata/getProductDetails.php:69
+msgid "remove resource"
+msgstr "Supprimer la ressource"
+
+#: ajax_htmldata/getProductDetails.php:69
+msgid "remove resource and its children"
+msgstr "Enlever ce ressource et ses fils"
+
+#: ajax_htmldata/getProductDetails.php:75 summary.php:206
+msgid "Record ID:"
+msgstr "ID d'enregistrement:"
+
+#: ajax_htmldata/getProductDetails.php:115 summary.php:218
+msgid "Created:"
+msgstr "Créé:"
+
+#: ajax_htmldata/getProductDetails.php:140 summary.php:244
+msgid "Last Update:"
+msgstr "Dernière mise à jour:"
+
+#: ajax_htmldata/getProductDetails.php:165 summary.php:269
+msgid "Related Products:"
+msgstr "Produits liées:"
+
+#: ajax_htmldata/getProductDetails.php:173
+#: ajax_htmldata/getProductDetails.php:181
+msgid "view resource"
+msgstr "Regarder la ressource"
+
+#: ajax_htmldata/getProductDetails.php:173
+#: ajax_htmldata/getProductDetails.php:181
+#: ajax_htmldata/getProductDetails.php:235
+msgid "View "
+msgstr "Regarder "
+
+#: ajax_htmldata/getProductDetails.php:211 summary.php:301
+msgid "Aliases:"
+msgstr "Aliases:"
+
+#: ajax_htmldata/getProductDetails.php:228 summary.php:318
+msgid "Organizations:"
+msgstr "Organisations:"
+
+#: ajax_htmldata/getProductDetails.php:249 summary.php:339
+msgid "Resource URL:"
+msgstr "Ressource URL: "
 
-#: ajax_htmldata.php:1215 ajax_htmldata.php:1312
-msgid "add new account"
-msgstr "Ajouter une nouvelle compte"
+#: ajax_htmldata/getProductDetails.php:250
+msgid "Visit Resource URL"
+msgstr "Ressource URL de visite"
 
-#: ajax_htmldata.php:1237
-msgid "edit account"
-msgstr "Modifier la compte"
+#: ajax_htmldata/getProductDetails.php:258
+msgid "Visit Secondary Resource URL"
+msgstr "Ressource URL secondaire de visite"
 
-#: ajax_htmldata.php:1237
-msgid "remove account"
-msgstr "Supprimer une compte"
+#: ajax_htmldata/getProductDetails.php:273
+msgid "edit product details"
+msgstr "Modifier les détails du produit"
 
-#: ajax_htmldata.php:1250
-msgid "Visit Account in Organizations Module"
-msgstr "Visitez Comptes sur le module Organisations"
+#: ajax_htmldata/getProductDetails.php:340
+msgid "remove subject"
+msgstr "Supprimer le sujet"
 
-#: ajax_htmldata.php:1257
-msgid "Login URL:"
-msgstr "URL de connexion:"
+#: ajax_htmldata/getProductDetails.php:361
+msgid "add new subject"
+msgstr "Ajouter nouveau sujet"
 
-#: ajax_htmldata.php:1258
-msgid "Visit Login URL"
-msgstr "Source URL de connexion"
+#: ajax_htmldata/getRightPanel.php:40
+msgid "Print View"
+msgstr "Vue d'Impresion"
 
-#: ajax_htmldata.php:1265
-msgid "User Name:"
-msgstr "Nom d'utilisateur:"
+#: ajax_htmldata/getRightPanel.php:42
+msgid "Catalog View"
+msgstr "Vue du Catalogue"
 
-#: ajax_htmldata.php:1307
-msgid "No accounts available"
-msgstr "Pas des comptes disponibles"
+#: ajax_htmldata/getRightPanel.php:50
+msgid "Parent Record(s)"
+msgstr "Registre(s) du parent"
 
-#: ajax_htmldata.php:1350
-msgid "view attachment"
-msgstr "Regarder la pièce jointe"
+#: ajax_htmldata/getRightPanel.php:58
+msgid "Child Record(s)"
+msgstr "Registre(s) enfant(s)"
 
-#: ajax_htmldata.php:1355
-msgid "edit attachment"
-msgstr "Modifier la pièce jointe"
+#: ajax_htmldata/getRightPanel.php:77
+msgid "Organizations Module"
+msgstr "Module d'organisations"
 
-#: ajax_htmldata.php:1355
-msgid "remove this attachment"
-msgstr "Supprimer cette pièce jointe"
+#: ajax_htmldata/getRightPanel.php:93
+msgid "Licensing Module"
+msgstr "Module des licences"
 
-#: ajax_htmldata.php:1387
-msgid "No attachments available"
-msgstr "Pas des pièces jointes disponibles."
+#: ajax_htmldata/getRightPanel.php:111
+msgid "Usage Statistics Module"
+msgstr "Module des statistiques d'utilisation"
 
-#: ajax_htmldata.php:1392
-msgid "add new attachment"
-msgstr "Ajouter une nouvelle pièce jointe"
+#: ajax_htmldata/getRightPanel.php:117
+msgid "Get Statistics"
+msgstr "Obtenir les statistiques"
 
-#: ajax_htmldata.php:1416
+#: ajax_htmldata/getRoutingDetails.php:13
 msgid ""
 "No workflow steps have been set up for this resource's combination of "
 "Acquisition Type and Resource Format."
@@ -1022,295 +1352,319 @@ msgstr ""
 "Pas d'étapes de workflow ont été mis en place pour la combinaison de Type "
 "d'Acquisition et le Format de Ressource."
 
-#: ajax_htmldata.php:1416
+#: ajax_htmldata/getRoutingDetails.php:13
 msgid ""
 "If you think this is in error, please contact your workflow administrator."
 msgstr ""
 "Si vous pensez qui cet un erreur, s'il vous plaît contactez à "
 "l'administrateur de workflow"
 
-#: ajax_htmldata.php:1418
+#: ajax_htmldata/getRoutingDetails.php:15
 msgid "Not entered into workflow."
 msgstr "N'a pas entré dans le workflow"
 
-#: ajax_htmldata.php:1424
+#: ajax_htmldata/getRoutingDetails.php:21
 msgid "Step"
 msgstr "Étape"
 
-#: ajax_htmldata.php:1425
+#: ajax_htmldata/getRoutingDetails.php:22
 msgid "Group"
 msgstr "Groupe"
 
-#: ajax_htmldata.php:1426 ajax_htmldata.php:1833
-msgid "Start Date"
-msgstr "Date de début"
-
-#: ajax_htmldata.php:1427
+#: ajax_htmldata/getRoutingDetails.php:24
 msgid "Complete"
 msgstr "Complète"
 
-#: ajax_htmldata.php:1458
+#: ajax_htmldata/getRoutingDetails.php:55
 msgid "mark complete"
 msgstr "Marquer comme complète"
 
-#: ajax_htmldata.php:1480 ajax_htmldata.php:1482
+#: ajax_htmldata/getRoutingDetails.php:77
+#: ajax_htmldata/getRoutingDetails.php:79
 msgid "Workflow completed on "
 msgstr "Workflow completé le "
 
-#: ajax_htmldata.php:1486 ajax_htmldata.php:1488
+#: ajax_htmldata/getRoutingDetails.php:83
+#: ajax_htmldata/getRoutingDetails.php:85
 msgid "Workflow restarted on "
 msgstr "Workflow redémarré le "
 
-#: ajax_htmldata.php:1498
+#: ajax_htmldata/getRoutingDetails.php:95
 msgid "restart workflow"
 msgstr "Redémarrer le workflow"
 
-#: ajax_htmldata.php:1499
+#: ajax_htmldata/getRoutingDetails.php:96
 msgid "mark entire workflow complete"
 msgstr "Marquer tout le workflow comme complète"
 
-#: ajax_htmldata.php:1587
-msgid "Print View"
-msgstr "Imprimer ***"
-
-#: ajax_htmldata.php:1589
-msgid "Catalog View"
-msgstr "Regarder le Catalogue"
-
-#: ajax_htmldata.php:1600
-msgid "Parent Record"
-msgstr "Registre du parent"
-
-#: ajax_htmldata.php:1606
-msgid "Child Record(s)"
-msgstr "Registre(s) enfant(s)"
-
-#: ajax_htmldata.php:1625
-msgid "Organizations Module"
-msgstr "Module d'organisations"
-
-#: ajax_htmldata.php:1641
-msgid "Licensing Module"
-msgstr "Module des licences"
-
-#: ajax_htmldata.php:1659
-msgid "Usage Statistics Module"
-msgstr "Module des statistiques d'utilisation"
-
-#: ajax_htmldata.php:1665
-msgid "Get Statistics"
-msgstr "Obtenir les statistiques"
-
-#: ajax_htmldata.php:1686 queue.php:52
+#: ajax_htmldata/getSavedQueue.php:6 queue.php:52
 msgid "Saved Requests"
 msgstr "Rêquetes enregistrées"
 
-#: ajax_htmldata.php:1691
+#: ajax_htmldata/getSavedQueue.php:11
 msgid "No saved requests"
 msgstr "Pas des requêtes enregistrées"
 
-#: ajax_htmldata.php:1697 ajax_htmldata.php:1766 ajax_htmldata.php:1829
-#: ajax_htmldata.php:2042
-msgid "ID"
-msgstr "Identifiant"
-
-#: ajax_htmldata.php:1699 ajax_htmldata.php:1768 ajax_htmldata.php:2045
+#: ajax_htmldata/getSavedQueue.php:19 ajax_htmldata/getSearchResources.php:115
+#: ajax_htmldata/getSubmittedQueue.php:16
 msgid "Date Created"
 msgstr "Date de création"
 
-#: ajax_htmldata.php:1701 ajax_htmldata.php:1770 ajax_htmldata.php:2047
-#: index.php:123
+#: ajax_htmldata/getSavedQueue.php:21 ajax_htmldata/getSearchResources.php:117
+#: ajax_htmldata/getSubmittedQueue.php:18 index.php:123
 msgid "Status"
 msgstr "Statut"
 
-#: ajax_htmldata.php:1729
+#: ajax_htmldata/getSavedQueue.php:49
 msgid "edit request"
 msgstr "Modifier la requête"
 
-#: ajax_htmldata.php:1730
+#: ajax_htmldata/getSavedQueue.php:50
 msgid "remove request"
 msgstr "Supprimer la requête"
 
-#: ajax_htmldata.php:1755 queue.php:53
-msgid "Submitted Requests"
-msgstr "Requêtes soumises"
-
-#: ajax_htmldata.php:1760
-msgid "No submitted requests"
-msgstr "Pas des requêtes soumises"
-
-#: ajax_htmldata.php:1817 queue.php:51
-msgid "Outstanding Tasks"
-msgstr "Tâches en suspens"
-
-#: ajax_htmldata.php:1822
-msgid "No outstanding requests"
-msgstr "Pas des requêtes en suspens"
-
-#: ajax_htmldata.php:1832 index.php:553
-msgid "Routing Step"
-msgstr "Etape de routage"
-
-#: ajax_htmldata.php:1968
+#: ajax_htmldata/getSearchResources.php:38
 msgid "Sorry, no requests fit your query"
 msgstr "Désolé, il n'y a pas des résultats par votre requête"
 
-#: ajax_htmldata.php:1982
+#: ajax_htmldata/getSearchResources.php:52
 msgid "Displaying "
 msgstr "En montrant "
 
-#: ajax_htmldata.php:1982
+#: ajax_htmldata/getSearchResources.php:52
 msgid " to "
 msgstr " sur "
 
-#: ajax_htmldata.php:1982
+#: ajax_htmldata/getSearchResources.php:52
 msgid " of "
 msgstr " de "
 
-#: ajax_htmldata.php:1982
+#: ajax_htmldata/getSearchResources.php:52
 msgid " Resource Records"
 msgstr " ressources enregistrées"
 
-#: ajax_htmldata.php:2028
+#: ajax_htmldata/getSearchResources.php:64
+#: ajax_htmldata/getSearchResources.php:161
+msgid "previous page"
+msgstr "Page précédente"
+
+#: ajax_htmldata/getSearchResources.php:98
+#: ajax_htmldata/getSearchResources.php:195
 msgid "next page"
 msgstr "Page suivante"
 
-#: ajax_htmldata.php:2044 index.php:154
+#: ajax_htmldata/getSearchResources.php:114 index.php:154
 msgid "Creator"
 msgstr "Créateur"
 
-#: ajax_htmldata.php:2091
-msgid "previous page"
-msgstr "Page précédente"
-
-#: ajax_htmldata.php:2142
+#: ajax_htmldata/getSearchResources.php:212
 msgid "records per page"
 msgstr "resultats par page"
 
-#: ajax_htmldata.php:2203
-msgid "edit user"
-msgstr "Modifier l'utilisateur"
+#: ajax_htmldata/getSubmittedQueue.php:5 queue.php:53
+msgid "Submitted Requests"
+msgstr "Requêtes soumises"
 
-#: ajax_htmldata.php:2204 ajax_htmldata.php:2252 ajax_htmldata.php:2296
-#: ajax_htmldata.php:2344 ajax_htmldata.php:2374 ajax_htmldata.php:2434
-#: ajax_htmldata.php:2485 ajax_htmldata.php:2528 ajax_htmldata.php:2572
-#: ajax_htmldata.php:2613
-msgid "remove"
-msgstr "Supprimer"
+#: ajax_htmldata/getSubmittedQueue.php:8
+msgid "No submitted requests"
+msgstr "Pas des requêtes soumises"
 
-#: ajax_htmldata.php:2210 ajax_htmldata.php:2214
-msgid "add new user"
-msgstr "Ajouter un nouveau utilisateur"
+#: ajax_processing.php:27
+msgid "Processing action "
+msgstr "Processing Action "
 
-#: ajax_htmldata.php:2264
-msgid "add new currency"
-msgstr "Ajouter une nouvelle concurrence"
+#: ajax_processing/deleteDetailedSubject.php:12
+#: ajax_processing/deleteGeneralSubject.php:12
+#: ajax_processing/deleteInstance.php:18
+msgid ""
+"Unable to delete.  Please make sure no resources are set up with this "
+"information."
+msgstr ""
+"N'est pas possible supprimer. S'il vous plaît, assurez-vous qu'aucune "
+"ressource est configurée avec cet information."
 
-#: ajax_htmldata.php:2286 ajax_htmldata.php:2518 ajax_htmldata.php:2559
-#: ajax_htmldata.php:2601
-msgid "Value"
-msgstr "Valeur"
+#: ajax_processing/deleteInstance.php:12
+msgid "Unable to delete  - this "
+msgstr "N'est pas possible supprimer - "
 
-#: ajax_htmldata.php:2308 ajax_htmldata.php:2540 ajax_htmldata.php:2628
-msgid "add new "
-msgstr "Ajouter un nouveau  "
+#: ajax_processing/deleteInstance.php:12
+msgid ""
+" is in use.  Please make sure no resources are set up with this information."
+msgstr ""
+" est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
+"configurée avec cet information."
 
-#: ajax_htmldata.php:2356
-msgid "add email address"
-msgstr "Ajouter une nouvelle adresse email"
+#: ajax_processing/deleteResource.php:7
+#: ajax_processing/deleteResourceAndChildren.php:8
+msgid "Resource successfully deleted."
+msgstr "La ressource a été supprimé avec succès"
 
-#: ajax_htmldata.php:2364
-msgid "Days in advance of expiration"
-msgstr "Jours à l'avance de expiration"
+#: ajax_processing/deleteResourceNote.php:7
+msgid "Note successfully deleted."
+msgstr "La note a été supprimé avec succès."
 
-#: ajax_htmldata.php:2389
-msgid "add days"
-msgstr "Ajouter jours"
+#: ajax_processing/removeResourceSubjectRelationship.php:10
+msgid "Subject successfully removed."
+msgstr "Sujet enlevé avec succès."
 
-#: ajax_htmldata.php:2404
-msgid "Workflow Setup"
-msgstr "Configuration du workflow"
+#: ajax_processing/updateDetailedSubject.php:22
+#: ajax_processing/updateGeneralSubject.php:21
+msgid "A duplicate "
+msgstr "Il y a un doublon "
 
-#: ajax_htmldata.php:2450
-msgid "You must set up at least one user group before you can add workflows"
-msgstr ""
-"Vous devez configurer au moins une groupe, après vous pouvez ajouter "
-"workflows"
+#: ajax_processing/updateDetailedSubject.php:22
+#: ajax_processing/updateGeneralSubject.php:21
+msgid " exists."
+msgstr " existant."
 
-#: ajax_htmldata.php:2460
-msgid "User Group Setup"
-msgstr "Configuration du groupe d'utilisateur"
+#: ajax_processing/updateUserData.php:26
+msgid "User successfully saved."
+msgstr "Utilisateur enregistré avec succès"
 
-#: ajax_htmldata.php:2466
-msgid "Group Name"
-msgstr "Nom du groupe"
+#: ajax_processing/uploadAttachment.php:29
+msgid "There was a problem saving your file to "
+msgstr "Il y avait un problème pour enregistrer votre fichier sur "
 
-#: ajax_htmldata.php:2498
-msgid "add user group"
-msgstr "Ajouter groupe d'utilisateur"
+#: ajax_processing/uploadAttachment.php:29
+msgid ".  Please ensure your attachments directory is writable."
+msgstr ""
+". S'il vous plaît assurez-vous que votre dossier des piecès jointes est "
+"accessible en écriture."
 
-#: ajax_htmldata.php:2595 ajax_htmldata.php:2643 index.php:282
-msgid "Detailed Subject"
-msgstr "Sujet détaillé"
+#: import.php:22
+msgid "Resources import"
+msgstr "Importer des ressources"
 
-#: ajax_htmldata.php:2636
-msgid "Subject Relationships"
-msgstr "Relation des sujets"
+#: import.php:32
+msgid "The file has been successfully uploaded."
+msgstr "Le fichier a été téléchargé avec succès."
 
-#: ajax_processing.php:64
-msgid "Note successfully deleted."
-msgstr "La note a été supprimé avec succès."
+#: import.php:42
+msgid "Unable to get columns headers from the file"
+msgstr "N'est pas possible d'obtenir les noms des colonnes du fichier"
 
-#: ajax_processing.php:337
-msgid "Resource successfully deleted."
-msgstr "La ressource a été supprimé avec succès"
+#: import.php:45
+msgid "Unable to open the uploaded file"
+msgstr "N'est pas possible de télécharger le fichier"
 
-#: ajax_processing.php:718
-msgid "success uploading!"
-msgstr "Téléchargement correcte!"
+#: import.php:48
+msgid "Unable to upload the file"
+msgstr "N'est pas possible télécharger le fichier"
 
-#: ajax_processing.php:721
-msgid "There was a problem saving your file to "
-msgstr "Il y avait un problème pour enregistrer votre fichier sur "
+#: import.php:51
+msgid "Error: "
+msgstr "Erreur: "
 
-#: ajax_processing.php:721
-msgid "Please ensure your attachments directory is writable."
-msgstr ""
-"S'il vous plaît, verifiez que votre dossier des pièces jointes a des droits "
-"d'écriture."
+#: import.php:53
+msgid "Please choose columns from your CSV file:"
+msgstr "S'il vous plaît, choisissez les colonnes de votre fichier CSV:"
 
-#: ajax_processing.php:740
-msgid "Unable to delete  - this "
-msgstr "N'est pas possible supprimer - "
+#: import.php:86
+msgid "Settings"
+msgstr "Configuration"
 
-#: ajax_processing.php:740
-msgid ""
-" is in use.  Please make sure no resources are set up with this information."
+#: import.php:87
+msgid "Importing and deduping isbnOrISSN on the following columns: "
 msgstr ""
-" est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
-"configurée avec cet information."
+"Importation et dédoublonnage d'isbnOrISSN dans les suivantes colonnes: "
+
+#: import.php:143
+msgid "Organization "
+msgstr "Organisation"
 
-#: ajax_processing.php:746 ajax_processing.php:1210 ajax_processing.php:1227
+#: import.php:143
+msgid " could not be added."
+msgstr " ne pu pas être ajouté."
+
+#: import.php:152 import.php:195
+msgid "Error: more than one organization is called "
+msgstr "Erreur: Plus d'une organisation a été appelé "
+
+#: import.php:152
+msgid ". Please consider deduping."
+msgstr ". S'il vous plaît considérez dédoublonner."
+
+#: import.php:174
+msgid "Unable to associate organization "
+msgstr "N'est pas possible d'associer l'organisation "
+
+#: import.php:174
+msgid " with its role."
+msgstr " avec ce rôle"
+
+#: import.php:195
+msgid " Please consider deduping."
+msgstr " S'il vous plaît considérez dédoublonner."
+
+#: import.php:253
+msgid "Results"
+msgstr "Résultats"
+
+#: import.php:254
+msgid " rows have been processed. "
+msgstr " rangs ont été traitées. "
+
+#: import.php:254
+msgid " rows have been inserted."
+msgstr " rangs ont été insérés."
+
+#: import.php:255
+msgid " parents have been created. "
+msgstr " parents ont été créés. "
+
+#: import.php:255
+msgid " resources have been attached to an existing parent."
+msgstr " ressources ont été ajoutés dans un parent existant."
+
+#: import.php:256
+msgid " organizations have been created"
+msgstr " organisations ont été créés"
+
+#: import.php:258
+msgid " resources have been attached to an existing organization."
+msgstr " ressources ont été ajoutés dans une organisation existante."
+
+#: import.php:263
 msgid ""
-"Unable to delete.  Please make sure no resources are set up with this "
-"information."
+"The first line of the CSV file must contain column names, and not data. "
+"These names will be used during the import process."
 msgstr ""
-"N'est pas possible supprimer. S'il vous plaît, assurez-vous qu'aucune "
-"ressource est configurée avec cet information."
+"La première ligne du fichier CSV doit contenir le noms des colonnes, et pas "
+"des données. Ces noms seront utilisés pendant le processus d'importation."
 
-#: ajax_processing.php:889
-msgid "User successfully saved."
-msgstr "Utilisateur enregistré avec succès"
+#: import.php:266
+msgid "File selection"
+msgstr "Sélection du fichier"
 
-#: ajax_processing.php:1360 ajax_processing.php:1386
-msgid "A duplicate "
-msgstr "Il y a un doublon "
+#: import.php:267
+msgid "CSV File"
+msgstr "Fichier CSV"
 
-#: ajax_processing.php:1360 ajax_processing.php:1386
-msgid " exists."
-msgstr " existant."
+#: import.php:271
+msgid "Import options"
+msgstr "Options d'importation"
+
+#: import.php:272
+msgid "CSV delimiter"
+msgstr "Délimiteur CSV"
 
-#: index.php:26 templates/header.php:112
+#: import.php:274
+msgid "(comma)"
+msgstr "(virgule)"
+
+#: import.php:275
+msgid "(semicolon)"
+msgstr "(point-virgule)"
+
+#: import.php:276
+msgid "(pipe)"
+msgstr "(pipe)"
+
+#: import.php:279
+msgid "Upload"
+msgstr "Télécharger"
+
+#: index.php:26 templates/header.php:113
 msgid "Home"
 msgstr "Accueil"
 
@@ -1331,10 +1685,6 @@ msgstr "Nom (contains)"
 msgid "go!"
 msgstr "Valider!"
 
-#: index.php:90
-msgid "Fund"
-msgstr "Fonds"
-
 #: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
 #: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
 #: index.php:469 index.php:499 index.php:529 index.php:556
@@ -1376,7 +1726,7 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: queue.php:22 queue.php:40 templates/header.php:114
+#: queue.php:22 queue.php:40 templates/header.php:115
 msgid "My Queue"
 msgstr "Ma liste"
 
@@ -1388,11 +1738,15 @@ msgstr "Fait!"
 msgid "New resource added"
 msgstr "Nouvelle ressource ajouté"
 
-#: resources/cataloging.php:103 summary.php:723
+#: resource.php:236
+msgid "Send feedback on this resource"
+msgstr "Envoyer une évaluation dans ce ressource"
+
+#: resources/cataloging.php:103 summary.php:731
 msgid "Cataloging"
 msgstr "Catalogage"
 
-#: resources/cataloging.php:114 summary.php:729
+#: resources/cataloging.php:114 summary.php:737
 msgid "Identifier:"
 msgstr "Identifiant:"
 
@@ -1404,11 +1758,11 @@ msgstr "Source URL: "
 msgid "Visit Source URL"
 msgstr "Source URL de visite"
 
-#: resources/cataloging.php:128 summary.php:743
+#: resources/cataloging.php:128 summary.php:751
 msgid "Cataloging Type:"
 msgstr "Type de catalogage:"
 
-#: resources/cataloging.php:136 summary.php:751
+#: resources/cataloging.php:136 summary.php:759
 msgid "Cataloging Status:"
 msgstr "Statut de catalogage:"
 
@@ -1416,7 +1770,7 @@ msgstr "Statut de catalogage:"
 msgid "Number of Records Available"
 msgstr "Nombre des enregistrements disponibles"
 
-#: resources/cataloging.php:142 summary.php:757
+#: resources/cataloging.php:142 summary.php:765
 msgid "# Records Available:"
 msgstr "# Enregistrements disponibles"
 
@@ -1424,23 +1778,23 @@ msgstr "# Enregistrements disponibles"
 msgid "Number of Records Loaded"
 msgstr "Nombre des enregistrements chargées"
 
-#: resources/cataloging.php:148 summary.php:763
+#: resources/cataloging.php:148 summary.php:771
 msgid "# Records Loaded:"
 msgstr "# Enregistrements chargées"
 
-#: resources/cataloging.php:153 summary.php:769
+#: resources/cataloging.php:153 summary.php:777
 msgid "OCLC Holdings:"
 msgstr "OCLC Holdings:"
 
-#: resources/cataloging.php:154 summary.php:770
+#: resources/cataloging.php:154 summary.php:778
 msgid "Yes"
 msgstr "Oui"
 
-#: resources/cataloging.php:154 summary.php:770
+#: resources/cataloging.php:154 summary.php:778
 msgid "No"
 msgstr "Non"
 
-#: resources/cataloging.php:159 summary.php:776
+#: resources/cataloging.php:159 summary.php:784
 msgid "No cataloging information available."
 msgstr "Le catalogue d'information n'est pas disponible."
 
@@ -1496,39 +1850,35 @@ msgstr ""
 msgid " Summary"
 msgstr " Resumé"
 
-#: summary.php:272
-msgid "(child)"
-msgstr "(enfant)"
-
-#: summary.php:284
-msgid "ISSN / ISBN:"
-msgstr "ISSN / ISBN:"
-
-#: summary.php:339
-msgid "Alt URL:"
-msgstr "URL Alt:"
+#: summary.php:275
+msgid "(Parent)"
+msgstr "(Parent)"
 
-#: summary.php:394
+#: summary.php:402
 msgid "Additional Product Notes"
 msgstr "Notes additionales du produit"
 
-#: summary.php:443
+#: summary.php:451
 msgid "Purchasing Site:"
 msgstr "Site d'achat:"
 
-#: summary.php:582
+#: summary.php:501
+msgid "No payment information available."
+msgstr "L'information du paiement n'est pas disponible."
+
+#: summary.php:590
 msgid "Additional Acquisitions Notes"
 msgstr "Notes additionales d'acquisition"
 
-#: summary.php:707
+#: summary.php:620
+msgid "No access information available."
+msgstr "Pas d'information d'accès disponible."
+
+#: summary.php:715
 msgid "Additional Access Notes"
 msgstr "Notes additionales de connexion:"
 
-#: summary.php:735
-msgid "URL:"
-msgstr "URL:"
-
-#: summary.php:820
+#: summary.php:828
 msgid "Additional Cataloging Notes"
 msgstr "Notes additionales du catalogue"
 
@@ -1551,27 +1901,35 @@ msgstr "réessayez"
 msgid "Hello, "
 msgstr "Bonjour, "
 
-#: templates/header.php:101
+#: templates/header.php:102
 msgid "logout"
 msgstr "Se déconnecter"
 
-#: templates/header.php:113
+#: templates/header.php:104
+msgid "(Test)"
+msgstr "(Test)"
+
+#: templates/header.php:114
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
 #: templates/header.php:115
+msgid "Import"
+msgstr "Importer"
+
+#: templates/header.php:116
 msgid "Admin"
 msgstr "Administrateur"
 
-#: templates/header.php:131
+#: templates/header.php:132
 msgid "Change Module"
 msgstr "Changer le module"
 
-#: templates/header.php:161 templates/header.php:162
+#: templates/header.php:162 templates/header.php:163
 msgid "French"
 msgstr "Français"
 
-#: templates/header.php:161 templates/header.php:162
+#: templates/header.php:162 templates/header.php:163
 msgid "English"
 msgstr "Anglais"
 
@@ -1619,24 +1977,23 @@ msgstr "Pas des coincidences!"
 msgid "Selected: "
 msgstr "Sélectionné: "
 
-#: js/forms/acquisitionsForm.js:118
+#: js/forms/acquisitionsForm.js:123 js/forms/costForm.js:108
 msgid "Error - Either amount or fund is required"
 msgstr "Erreur, les deux cantitées ou fonds sont réquises"
 
-#: js/forms/acquisitionsForm.js:121 js/forms/acquisitionsForm.js:248
-#: js/forms/resourceNewForm.js:225 js/forms/resourceNewForm.js:295
+#: js/forms/acquisitionsForm.js:126 js/forms/costForm.js:111
+#: js/forms/costForm.js:289
 msgid "Error - order type is a required field"
 msgstr "Erreur - le type d'ordre est un champ réquise"
 
-#: js/forms/acquisitionsForm.js:124 js/forms/acquisitionsForm.js:254
-#: js/forms/resourceNewForm.js:228 js/forms/resourceNewForm.js:300
+#: js/forms/acquisitionsForm.js:129 js/forms/costForm.js:114
+#: js/forms/costForm.js:295
 msgid "Error - price is not numeric"
 msgstr "Erreur: le price n'est pas numérique"
 
-#: js/forms/acquisitionsForm.js:242 js/forms/resourceNewForm.js:222
-#: js/forms/resourceNewForm.js:290
-msgid "Error - Either price or fund is required"
-msgstr "Erreur, les deux prices ou fonds sont réquises"
+#: js/forms/acquisitionsForm.js:227
+msgid "Error - acquisition type is a required field"
+msgstr "Erreur - le type d'acquisition est un champ réquise"
 
 #: js/forms/attachmentForm.js:94
 msgid "File name is already being used..."
@@ -1658,7 +2015,7 @@ msgstr "Le dossier des pièces jointes n'a pas des droits d'écriture."
 msgid " successfully uploaded."
 msgstr " téléchargé avec succès."
 
-#: js/forms/attachmentForm.js:159 js/forms/resourceUpdateForm.js:340
+#: js/forms/attachmentForm.js:159 js/forms/resourceUpdateForm.js:378
 msgid "Name must be entered to continue."
 msgstr "Le nom doit être écrit avant de continuer."
 
@@ -1674,6 +2031,10 @@ msgstr "Le fichier doit être téléchargé"
 msgid "Please choose at least one role."
 msgstr "S'il vous plaît, choisissez au moins un rôle."
 
+#: js/forms/costForm.js:283
+msgid "Error - Either price or fund is required"
+msgstr "Erreur, les deux prices ou fonds sont réquises"
+
 #: js/forms/detailedSubjectForm.js:60 js/forms/generalSubjectForm.js:59
 msgid "Error - Please enter a value"
 msgstr "Erreur - S'il vous plaît, tappez un valeur"
@@ -1707,45 +2068,52 @@ msgstr "Effacer cette licence"
 msgid "Warning: this name already exists."
 msgstr "Attention: le nom est déjà existant."
 
-#: js/forms/resourceNewForm.js:282
-msgid "Title must be entered to continue."
-msgstr "Le titre doit être écrit avant de continuer."
+#: js/forms/resourceNewForm.js:227
+msgid "A title must be entered to continue."
+msgstr "Un titre doit être écrit avant de continuer."
+
+#: js/forms/resourceNewForm.js:232
+msgid "The resource format is required."
+msgstr "Le format de resource est requis."
+
+#: js/forms/resourceNewForm.js:237
+msgid "The resource type is required."
+msgstr "Le type de ressource est un nécessaire."
 
 #: js/forms/resourceNoteForm.js:34
 msgid "Note must be entered to continue."
 msgstr "Le nom de la note doit être écrit avant de continuer."
 
-#: js/forms/resourceUpdateForm.js:88
+#: js/forms/resourceUpdateForm.js:90
 msgid "Error - Parent cannot be the same as the child"
 msgstr "Erreur - Le père ne peut pas être pareil comme l'enfant"
 
-#: js/forms/resourceUpdateForm.js:208 js/forms/resourceUpdateForm.js:258
-#: js/forms/resourceUpdateForm.js:354 js/forms/resourceUpdateForm.js:365
+#: js/forms/resourceUpdateForm.js:217 js/forms/resourceUpdateForm.js:302
+#: js/forms/resourceUpdateForm.js:392 js/forms/resourceUpdateForm.js:403
 msgid "Error - Both fields are required"
 msgstr "Erreur, Les deux champs sont exigés"
 
-#: js/forms/resourceUpdateForm.js:260
+#: js/forms/resourceUpdateForm.js:277
+msgid "Error - Parent is not found.  Please use the Autocomplete."
+msgstr ""
+"Erreur - Le parent n'est pas trouvé. S'il vous plaît utilisez l'autocomplete."
+
+#: js/forms/resourceUpdateForm.js:304
 msgid "Error - Organization is not found.  Please use the Autocomplete."
 msgstr ""
 "Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
 "l'autocomplete."
 
-#: js/forms/resourceUpdateForm.js:277 js/forms/resourceUpdateForm.js:278
+#: js/forms/resourceUpdateForm.js:321 js/forms/resourceUpdateForm.js:322
 msgid "remove this organization"
 msgstr "Supprimer cette organisation"
 
-#: js/forms/resourceUpdateForm.js:356
+#: js/forms/resourceUpdateForm.js:394
 msgid "Error - Organization is not found.  Please use Autocomplete."
 msgstr ""
 "Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
 "l'autocomplete."
 
-#: js/forms/resourceUpdateForm.js:373
-msgid "Error - Parent resource is not found.  Please use Autocomplete."
-msgstr ""
-"Erreur - Le ressource père n'est pas trouvé. S'il vous plaît, utilisez "
-"l'autocomplete."
-
 #: js/forms/userGroupForm.js:101
 msgid "Error - User is required"
 msgstr "Erreur, un utilisateur est nécessaire pour cette action"
@@ -1982,15 +2350,15 @@ msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
 msgid "Do you really want to delete this resource?"
 msgstr "Voulez-vous vraiment supprimer ce ressource?"
 
-#: js/resource.js:447
+#: js/resource.js:464
 msgid "Do you really want to remove this Subject?"
 msgstr "Voulez-vous vraiment enlever ce sujet?"
 
-#: js/resource.js:465
+#: js/resource.js:482
 msgid "Do you really want to delete this note?"
 msgstr "Voulez-vous vraiment supprimer cette note?"
 
-#: js/resource.js:508
+#: js/resource.js:525
 msgid ""
 "Warning!  You are about to remove any steps that have been started and "
 "completed.  Are you sure you wish to continue?"
@@ -1998,7 +2366,7 @@ msgstr ""
 "Attention! Vous êtes sur le point d'effacer quelques étapes qui ont été "
 "commencés et complétés. Etes-vous sûrs que vous voulez continuer?"
 
-#: js/resource.js:525
+#: js/resource.js:542
 msgid ""
 "Do you really want to mark this resource complete?  This action cannot be "
 "undone."
@@ -2006,9 +2374,51 @@ msgstr ""
 "Êtes-vous sûrs de marquer ce ressource comme complète? Cette action ne peut "
 "pas être annulée."
 
+#~ msgid "Provider:  "
+#~ msgstr "Fournisseur:  "
+
+#, fuzzy
+#~ msgid "Detailed Subject</div>"
+#~ msgstr "Sujet détaillé"
+
 #, fuzzy
-#~ msgid "CatalogingType"
-#~ msgstr "Stat de catalogue "
+#~ msgid "Acquisition Type<"
+#~ msgstr "Type d'acquisition"
+
+#~ msgid "Cataloging Type"
+#~ msgstr "Type de catalogue "
+
+#~ msgid "Initial Cost"
+#~ msgstr "Coût Initial"
+
+#~ msgid "Fund:"
+#~ msgstr "Fond:"
+
+#~ msgid "Price:"
+#~ msgstr "Prix:"
+
+#~ msgid "Subscription End:"
+#~ msgstr "Fin d'abonnement:"
+
+#~ msgid "Child:"
+#~ msgstr "Enfant:"
+
+#~ msgid "edit acquisitions information"
+#~ msgstr "Modifier l'information des acquisitions"
+
+#~ msgid "Login URL:"
+#~ msgstr "URL de connexion:"
+
+#~ msgid "success uploading!"
+#~ msgstr "Téléchargement correcte!"
+
+#~ msgid "(child)"
+#~ msgstr "(enfant)"
+
+#~ msgid "Error - Parent resource is not found.  Please use Autocomplete."
+#~ msgstr ""
+#~ "Erreur - Le ressource père n'est pas trouvé. S'il vous plaît, utilisez "
+#~ "l'autocomplete."
 
 #~ msgid "Valider!"
 #~ msgstr "Chercher"
diff --git a/queue.php b/queue.php
index 8d00e36..029e714 100644
--- a/queue.php
+++ b/queue.php
@@ -37,7 +37,7 @@
 		<table style='width:100%; margin:0 0 11px 0;padding:0;'>
 		<tr style='vertical-align:top'>
 		<td>
-		<span class="headerText"><?= _("My Queue");?></span>
+		<span class="headerText"><?php echo _("My Queue");?></span>
 		<br />
 		</td>
 		</tr>
@@ -48,15 +48,15 @@
 		<tr>
 		<td style='width:170px;vertical-align:top;'>
 			<table class='queueMenuTable' style='width:170px;'>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='OutstandingTasks'><?= _("Outstanding Tasks");?></a></div><span class='span_OutstandingTasksNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SavedRequests'><?= _("Saved Requests");?></a></div><span class='span_SavedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
-				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SubmittedRequests'><?= _("Submitted Requests");?></a></div><span class='span_SubmittedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='OutstandingTasks'><?php echo _("Outstanding Tasks");?></a></div><span class='span_OutstandingTasksNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SavedRequests'><?php echo _("Saved Requests");?></a></div><span class='span_SavedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
+				<tr><td><div class='queueMenuLink'><a href='javascript:void(0);' id='SubmittedRequests'><?php echo _("Submitted Requests");?></a></div><span class='span_SubmittedRequestsNumber smallGreyText' style='clear:right; margin-left:10px;'></span></td></tr>
 
 			</table>
 		</td>
 		<td class='queueRightPanel' style='width:720px;margin:0;'>
 			<div id='div_QueueContent'>
-			<img src = "images/circle.gif" /><?= _("Loading...");?>
+			<img src = "images/circle.gif" /><?php echo _("Loading...");?>
 			</div>
 			<div style='margin-top:5px;' class='darkRedText' id='div_error'></div>
 
diff --git a/resource.php b/resource.php
index b32b7ab..c8b7091 100644
--- a/resource.php
+++ b/resource.php
@@ -51,7 +51,7 @@
 		<div style='vertical-align:top; width:100%; height:35px; margin-left:5px;padding:0;'>
 			<span class="headerText" id='span_resourceName' style='float:left;vertical-align:text-top;'><?php echo $resource->titleText; ?>&nbsp;</span>
 			<div id='div_new' style='float:left;vertical-align:bottom;font-weight:115%;margin-top:3px;' class='darkRedText'><?php if ($_GET['ref'] == 'new'){ ?>&nbsp;&nbsp;<img src='images/red_checkmark.gif' />
-				<span class='boldText'><?= _("Success!");?></span>&nbsp;&nbsp;<?php echo _("New resource added"); } ?>
+				<span class='boldText'><?php echo _("Success!");?></span>&nbsp;&nbsp;<?php echo _("New resource added"); } ?>
 			</div>
 		</div>
 
@@ -233,7 +233,7 @@
 					<?php if ($config->settings->feedbackEmailAddress != '') {?>
 						<div style='margin:0px 8px 10px 8px;'>
 						<div style='width:219px; padding:7px; margin-bottom:5px;'>
-						<a href="mailto: <?php echo $config->settings->feedbackEmailAddress; ?>?subject=<?php echo $resource->titleText . ' (Resource ID: ' . $resource->resourceID . ')'; ?>" class='helpfulLink'>Send feedback on this resource</a>
+						<a href="mailto: <?php echo $config->settings->feedbackEmailAddress; ?>?subject=<?php echo $resource->titleText . ' (Resource ID: ' . $resource->resourceID . ')'; ?>" class='helpfulLink'><?php echo _("Send feedback on this resource");?></a>
 						</div>
 						</div>
 					<?php } ?>
diff --git a/resources/cataloging.php b/resources/cataloging.php
index b484b81..1c92074 100644
--- a/resources/cataloging.php
+++ b/resources/cataloging.php
@@ -100,10 +100,10 @@
 <table class='linedFormTable'>
   <tr>
     <th colspan='2' style='vertical-align:bottom;'>
-      <span style='float:left;vertical-align:bottom;'><?= _("Cataloging");?></span>
+      <span style='float:left;vertical-align:bottom;'><?php echo _("Cataloging");?></span>
 
       <?php if ($user->canEdit()){ ?>
-      	<span style='float:right;vertical-align:bottom;'><a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='<?= _("edit order information");?>'></a></span>
+      	<span style='float:right;vertical-align:bottom;'><a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='editOrder'><img src='images/edit.gif' alt='edit' title='<?php echo _("edit order information");?>'></a></span>
       <?php } ?>
 
     </th>
@@ -111,21 +111,21 @@
   <?php if ($resource->hasCatalogingInformation()) { ?>
     <?php if ($resource->recordSetIdentifier) { ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'><?= _("Identifier:");?></td>
+    	<td style='vertical-align:top;width:130px;'><?php echo _("Identifier:");?></td>
     	<td style='width:350px;'><?php echo $resource->recordSetIdentifier ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->bibSourceURL) { ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'><?= _("Source URL:");?></td>
-    	<td style='width:350px;'><?php echo $resource->bibSourceURL ?><?php if ($resource->bibSourceURL) { ?> &nbsp;&nbsp;<a href='<?php echo $resource->bibSourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Source URL' title='<?= _("Visit Source URL");?>' style='vertical-align:top;'></a><?php } ?></td>
+    	<td style='vertical-align:top;width:130px;'><?php echo _("Source URL:");?></td>
+    	<td style='width:350px;'><?php echo $resource->bibSourceURL ?><?php if ($resource->bibSourceURL) { ?> &nbsp;&nbsp;<a href='<?php echo $resource->bibSourceURL; ?>' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Source URL' title='<?php echo _("Visit Source URL");?>' style='vertical-align:top;'></a><?php } ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->catalogingTypeID) { 
       $catalogingType = new CatalogingType(new NamedArguments(array('primaryKey' => $resource->catalogingTypeID)));
       ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'><?= _("Cataloging Type:");?></td>
+    	<td style='vertical-align:top;width:130px;'><?php echo _("Cataloging Type:");?></td>
     	<td style='width:350px;'><?php echo $catalogingType->shortName ?></td>
   	</tr>
   	<?php } ?>
@@ -133,36 +133,36 @@
       $catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $resource->catalogingStatusID)));
       ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'><?= _("Cataloging Status:");?></td>
+    	<td style='vertical-align:top;width:130px;'><?php echo _("Cataloging Status:");?></td>
     	<td style='width:350px;'><?php echo $catalogingStatus->shortName ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsAvailable) { ?>
-  	<tr title="<?= _("Number of Records Available");?>">
-    	<td style='vertical-align:top;width:130px;'><?= _("# Records Available:");?></td>
+  	<tr title="<?php echo _("Number of Records Available");?>">
+    	<td style='vertical-align:top;width:130px;'><?php echo _("# Records Available:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsAvailable ?></td>
   	</tr>
   	<?php } ?>
   	<?php if ($resource->numberRecordsLoaded) { ?>
-  	<tr title="<?= _("Number of Records Loaded");?>">
-    	<td style='vertical-align:top;width:130px;'><?= _("# Records Loaded:");?></td>
+  	<tr title="<?php echo _("Number of Records Loaded");?>">
+    	<td style='vertical-align:top;width:130px;'><?php echo _("# Records Loaded:");?></td>
     	<td style='width:350px;'><?php echo $resource->numberRecordsLoaded ?></td>
   	</tr>
   	<?php } ?>
   	<tr>
-    	<td style='vertical-align:top;width:130px;'><?= _("OCLC Holdings:");?></td>
+    	<td style='vertical-align:top;width:130px;'><?php echo _("OCLC Holdings:");?></td>
     	<td style='width:350px;'><?php echo $resource->hasOclcHoldings ? _('Yes') : _('No') ?></td>
   	</tr>
   <?php } else { ?>
     <tr>
       <td colspan="2">
-        <em><?= _("No cataloging information available.");?></em>
+        <em><?php echo _("No cataloging information available.");?></em>
       </td>
     </tr>
   <?php } ?>
 </table>
 <?php if ($user->canEdit()){ ?>
-<a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?= _("edit cataloging details");?></a><br />
+<a href='resources/cataloging_edit.php?height=300&width=730&modal=true&resourceID=<?php echo $resourceID; ?>' class='thickbox'><?php echo _("edit cataloging details");?></a><br />
 <?php } ?>
 
 <br />
@@ -206,10 +206,10 @@
 ?>
 <table class='linedFormTable'>
 	<tr>
-	<th><?= _("Additional Notes");?></th>
+	<th><?php echo _("Additional Notes");?></th>
 	<th>
 	<?php if ($user->canEdit()){?>
-		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
+		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 	<?php } ?>
 	</th>
 	</tr>
@@ -217,7 +217,7 @@
 		<tr>
 		<td style='width:130px;'><?php echo $resourceNote['noteTypeName']; ?><br />
 		<?php if ($user->canEdit()){?>
-		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='<?= _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Cataloging'><img src='images/cross.gif' alt='remove note' title='<?= _("remove note");?>'></a>
+		<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=<?php echo $resourceNote['resourceNoteID']; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='edit' title='<?php echo _("edit note");?>'></a>  <a href='javascript:void(0);' class='removeNote' id='<?php echo $resourceNote['resourceNoteID']; ?>' tab='Cataloging'><img src='images/cross.gif' alt='remove note' title='<?php echo _("remove note");?>'></a>
 		<?php } ?>
 		</td>
 		<td><?php echo nl2br($resourceNote['noteText']); ?><br /><i><?php echo format_date($resourceNote['updateDate']) . _(" by ") . $resourceNote['updateUser']; ?></i></td>
@@ -228,7 +228,7 @@
 }else{
 if ($user->canEdit()){
 ?>
-	<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?= _("add new note");?></a>
+	<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Cataloging&resourceID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a>
 <?php
 }
 }
diff --git a/resources/cataloging_edit.php b/resources/cataloging_edit.php
index 512591a..d3e4cf7 100644
--- a/resources/cataloging_edit.php
+++ b/resources/cataloging_edit.php
@@ -12,7 +12,7 @@
 <form id='catalogingForm' method="post" action="resources/cataloging_update.php">
 <input type='hidden' name='resourceID' id='resourceID' value='<?php echo $resourceID; ?>'>
 
-<div class='formTitle' style='width:715px; margin-bottom:5px;'><span class='headerText'><?= _("Edit Cataloging");?></span></div>
+<div class='formTitle' style='width:715px; margin-bottom:5px;'><span class='headerText'><?php echo _("Edit Cataloging");?></span></div>
 
 <span class='smallDarkRedText' id='span_errors'></span>
 
@@ -21,7 +21,7 @@
 <td style='vertical-align:top;' colspan='2'>
 
 
-<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?= _("Record Set");?></b></label>&nbsp;&nbsp;</span>
+<span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='accessHead'><b><?php echo _("Record Set");?></b></label>&nbsp;&nbsp;</span>
 
 <table class='surroundBox' style='width:710px;'>
 <tr>
@@ -99,8 +99,8 @@
 
 <table class='noBorderTable' style='width:125px;'>
 <tr>
-	<td style='text-align:left'><input type='submit' value='<?= _("submit");?>' name='submitCatalogingChanges' id ='submitCatalogingChanges'></td>
-	<td style='text-align:right'><input type='button' value='<?= _("cancel");?>' onclick="kill(); tb_remove();"></td>
+	<td style='text-align:left'><input type='submit' value='<?php echo _("submit");?>' name='submitCatalogingChanges' id ='submitCatalogingChanges'></td>
+	<td style='text-align:right'><input type='button' value='<?php echo _("cancel");?>' onclick="kill(); tb_remove();"></td>
 </tr>
 </table>
 
diff --git a/summary.php b/summary.php
index 8e05469..a0fa8b3 100644
--- a/summary.php
+++ b/summary.php
@@ -203,19 +203,19 @@
 		</tr>
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Record ID:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Record ID:");?></td>
 		<td style='width:335px;'><?php echo $resource->resourceID; ?></td>
 		</tr>
 
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Status:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Status:");?></td>
 		<td style='width:335px;'><?php echo $status->shortName; ?></td>
 		</tr>
 
 		<tr>
 		<td style='vertical-align:top;width:150px;'>
-		<?= _("Created:");?>
+		<?php echo _("Created:");?>
 		</td>
 		<td>
 		<i>
@@ -241,7 +241,7 @@
 
 			<tr>
 			<td style='vertical-align:top;width:150px;'>
-			<?= _("Last Update:");?>
+			<?php echo _("Last Update:");?>
 			</td>
 			<td>
 			<i>
@@ -266,7 +266,7 @@
 
 		if ((count($parentResourceArray) > 0) || (count($childResourceArray) > 0)){ ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'><?= _("Related Products:");?></td>
+			<td style='vertical-align:top;width:150px;'><?php echo _("Related Products:");?></td>
 			<td>
 			<?php
 
@@ -289,7 +289,7 @@
 		if ($resource->isbnOrISSN){
 		?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("ISSN / ISBN:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("ISSN / ISBN:");?></td>
 		<td style='width:335px;'><?php echo $resource->isbnOrISSN; ?></td>
 		</tr>
 		<?php
@@ -298,7 +298,7 @@
 		if (count($aliasArray) > 0){
 		?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Aliases:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Aliases:");?></td>
 		<td>
 		<?php
 			foreach ($aliasArray as $resourceAlias){
@@ -315,7 +315,7 @@
 		?>
 
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Organizations:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Organizations:");?></td>
 		<td>
 
 			<?php
@@ -336,7 +336,7 @@
 
 		if ($resource->resourceURL) { ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'><?= _("Resource URL:");?></td>
+			<td style='vertical-align:top;width:150px;'><?php echo _("Resource URL:");?></td>
 			<td><?php echo $resource->resourceURL; ?></td>
 			</tr>
 		<?php
@@ -344,7 +344,7 @@
 
 		if ($resource->resourceAltURL) { ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'><?= _("Alt URL:");?></td>
+			<td style='vertical-align:top;width:150px;'><?php echo _("Alt URL:");?></td>
 			<td><?php echo $resource->resourceAltURL; ?></td>
 			</tr>
 		<?php
@@ -352,7 +352,7 @@
 		
 		if ($resource->descriptionText){ ?>
 			<tr>
-			<td style='vertical-align:top;width:150px;'><?= _("Description:");?></td>
+			<td style='vertical-align:top;width:150px;'><?php echo _("Description:");?></td>
 			<td><?php echo nl2br($resource->descriptionText); ?></td>
 			</tr>
 		<?php } ?>
@@ -399,7 +399,7 @@
 	?>
 		<table class='linedFormTable'>
 			<tr>
-			<th colspan='2'><?= _("Additional Product Notes");?></th>
+			<th colspan='2'><?php echo _("Additional Product Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
@@ -419,28 +419,28 @@
 	<table class='linedFormTable'>
 	<tr>
 	<th colspan='2' style='vertical-align:bottom;'>
-	<span style='float:left;vertical-align:bottom;'><?= _("Order");?></span>
+	<span style='float:left;vertical-align:bottom;'><?php echo _("Order");?></span>
 
 	</th>
 	</tr>
 
 	<?php if ($resource->acquisitionTypeID) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Acquisition Type:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Acquisition Type:");?></td>
 		<td><?php echo $acquisitionType->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($resource->orderNumber) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Order Number:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Order Number:");?></td>
 		<td><?php echo $resource->orderNumber; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($resource->systemNumber) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("System Number:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("System Number:");?></td>
 		<td><?php echo $resource->systemNumber; ?></td>
 		</tr>
 	<?php } ?>
@@ -448,14 +448,14 @@
 
 	<?php if (count($purchaseSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Purchasing Site:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Purchasing Site:");?></td>
 		<td><?php echo implode(", ", $purchaseSiteArray); ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if (count($authorizedSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Authorized Sites:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Authorized Sites:");?></td>
 		<td><?php echo implode(", ", $authorizedSiteArray); ?></td>
 		</tr>
 	<?php } ?>
@@ -463,14 +463,14 @@
 
 	<?php if (!is_null_date($resource->currentStartDate)) { ?>
 	<tr>
-	<td style='vertical-align:top;width:150px;'><?= _("Sub Start:");?></td>
+	<td style='vertical-align:top;width:150px;'><?php echo _("Sub Start:");?></td>
 	<td><?php echo format_date($resource->currentStartDate); ?></td>
 	</tr>
 	<?php } ?>
 
 	<?php if (!is_null_date($resource->currentEndDate)) { ?>
 	<tr>
-	<td style='vertical-align:top;width:150px;'><?= _("Current Sub End:");?></td>
+	<td style='vertical-align:top;width:150px;'><?php echo _("Current Sub End:");?></td>
 	<td><?php echo format_date($resource->currentEndDate); ?>&nbsp;&nbsp;
 	<?php if ($resource->subscriptionAlertEnabledInd == "1") { echo "<i>"._("Expiration Alert Enabled")."</i>"; } ?>
 	</td>
@@ -482,7 +482,7 @@
 
 	<table class='linedFormTable'>
 	<tr>
-	<th colspan='3'><?= _("Cost History");?></th>
+	<th colspan='3'><?php echo _("Cost History");?></th>
 	</th>
 	</tr>
 
@@ -508,12 +508,12 @@
 	<table class='linedFormTable'>
 	<tr>
 	<th colspan='2'>
-	<span style='float:left;vertical-align:bottom;'><?= _("License");?></span>
+	<span style='float:left;vertical-align:bottom;'><?php echo _("License");?></span>
 	</th>
 	</tr>
 
 	<tr>
-	<td style='vertical-align:top;width:150px;'><?= _("Status:");?></td>
+	<td style='vertical-align:top;width:150px;'><?php echo _("Status:");?></td>
 	<td>
 
 	<?php
@@ -530,7 +530,7 @@
 	</tr>
 
 	<tr>
-	<td style='vertical-align:top;width:150px;'><?= _("Licenses:");?></td>
+	<td style='vertical-align:top;width:150px;'><?php echo _("Licenses:");?></td>
 	<td>
 	<?php
 
@@ -587,7 +587,7 @@
 	?>
 		<table class='linedFormTable'>
 			<tr>
-			<th colspan='2'><?= _("Additional Acquisitions Notes");?></th>
+			<th colspan='2'><?php echo _("Additional Acquisitions Notes");?></th>
 			</th>&nbsp;
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
@@ -609,7 +609,7 @@
 	<table class='linedFormTable'>
 	<tr>
 	<th colspan='2'>
-	<span style='float:left;vertical-align:bottom;'><?= _("Access Information");?></span>
+	<span style='float:left;vertical-align:bottom;'><?php echo _("Access Information");?></span>
 	</th>
 	</tr>
 
@@ -623,28 +623,28 @@
 
 	<?php if (count($administeringSiteArray) > 0) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Administering Sites:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Administering Sites:");?></td>
 		<td><?php echo implode(", ", $administeringSiteArray); ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($authenticationType->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Authentication Type:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Authentication Type:");?></td>
 		<td><?php echo $authenticationType->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if (($resource->authenticationUserName) || ($resource->authenticationPassword)) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Username / Password:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Username / Password:");?></td>
 		<td><?php echo $resource->authenticationUserName . " / " . $resource->authenticationPassword; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($userLimit->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Simultaneous User Limit:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Simultaneous User Limit:");?></td>
 		<td><?php echo $userLimit->shortName; ?></td>
 		</tr>
 	<?php } ?>
@@ -652,7 +652,7 @@
 
 	<?php if ($resource->registeredIPAddressException){ ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Registered IP Address:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Registered IP Address:");?></td>
 		<td style='width:310px;'><?php echo $resource->registeredIPAddressException; ?></td>
 		</tr>
 	<?php } ?>
@@ -660,14 +660,14 @@
 
 	<?php if ($storageLocation->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Storage Location:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Storage Location:");?></td>
 		<td><?php echo $storageLocation->shortName; ?></td>
 		</tr>
 	<?php } ?>
 
 	<?php if ($accessMethod->shortName) { ?>
 		<tr>
-		<td style='vertical-align:top;width:150px;'><?= _("Access Method:");?></td>
+		<td style='vertical-align:top;width:150px;'><?php echo _("Access Method:");?></td>
 		<td><?php echo $accessMethod->shortName; ?></td>
 		</tr>
 	<?php } ?>
@@ -712,7 +712,7 @@
 	?>
 		<table class='linedFormTable'>
 			<tr>
-			<th colspan='2'><?= _("Additional Access Notes");?></th>
+			<th colspan='2'><?php echo _("Additional Access Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
@@ -728,19 +728,19 @@
   <table class='linedFormTable'>
     <tr>
       <th colspan='2' style='vertical-align:bottom;'>
-        <span style='float:left;vertical-align:bottom;'><?= _("Cataloging");?></span>
+        <span style='float:left;vertical-align:bottom;'><?php echo _("Cataloging");?></span>
       </th>
     </tr>
     <?php if ($resource->hasCatalogingInformation()) { ?>
       <?php if ($resource->recordSetIdentifier) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("Identifier:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("Identifier:");?></td>
       		<td><?php echo $resource->recordSetIdentifier; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->bibSourceURL) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("URL:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("URL:");?></td>
       		<td><?php echo $resource->bibSourceURL; ?></td>
     		</tr>
     	<?php } ?>
@@ -748,7 +748,7 @@
     		$catalogingType = new CatalogingType(new NamedArguments(array('primaryKey' => $resource->catalogingTypeID)));
     		?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("Cataloging Type:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("Cataloging Type:");?></td>
       		<td><?php echo $catalogingType->shortName; ?></td>
     		</tr>
     	<?php } ?>
@@ -756,32 +756,32 @@
     		$catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $resource->catalogingStatusID)));
     		?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("Cataloging Status:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("Cataloging Status:");?></td>
       		<td><?php echo $catalogingStatus->shortName; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->numberRecordsAvailable) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("# Records Available:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("# Records Available:");?></td>
       		<td><?php echo $resource->numberRecordsAvailable; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->numberRecordsLoaded) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("# Records Loaded:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("# Records Loaded:");?></td>
       		<td><?php echo $resource->numberRecordsLoaded; ?></td>
     		</tr>
     	<?php } ?>
     	<?php if ($resource->hasOclcHoldings) { ?>
     		<tr>
-      		<td style='vertical-align:top;width:150px;'><?= _("OCLC Holdings:");?></td>
+      		<td style='vertical-align:top;width:150px;'><?php echo _("OCLC Holdings:");?></td>
       		<td><?php echo $resource->hasOclcHoldings ? _('Yes') : _('No'); ?></td>
     		</tr>
     	<?php } ?>
     <?php } else { ?>
       <tr>
         <td colspan="2">
-          <em><?= _("No cataloging information available.");?></em>
+          <em><?php echo _("No cataloging information available.");?></em>
         </td>
       </tr>
     <?php } ?>
@@ -825,7 +825,7 @@
 	?>
 		<table class='linedFormTable'>
 			<tr>
-			<th colspan='2'><?= _("Additional Cataloging Notes");?></th>
+			<th colspan='2'><?php echo _("Additional Cataloging Notes");?></th>
 			</tr>
 			<?php foreach ($noteArray as $resourceNote){ ?>
 				<tr>
diff --git a/templates/header.php b/templates/header.php
index 6f8d02f..070de52 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -69,7 +69,7 @@
 <script type="text/javascript" src="js/common.js"></script>
 </head>
 <body>
-<noscript><font face='arial'><?= _("JavaScript must be enabled in order for you to use CORAL. However, it seems JavaScript is either disabled or not supported by your browser. To use CORAL, enable JavaScript by changing your browser options, then ");?><a href=""><?= _("try again");?></a>. </font></noscript>
+<noscript><font face='arial'><?php echo _("JavaScript must be enabled in order for you to use CORAL. However, it seems JavaScript is either disabled or not supported by your browser. To use CORAL, enable JavaScript by changing your browser options, then ");?><a href=""><?php echo _("try again");?></a>. </font></noscript>
 
 <div class="wrapper">
 <center>
@@ -101,7 +101,7 @@
 <br />
 <?php if($config->settings->authModule == 'Y'){ echo "<a href='" . $coralURL . "auth/?logout'>"._("logout")."</a>"; } ?>
 <?php if ($config->settings->testMode == 'Y') { ?>
-  <br><span style="color:red;font-size:90%;"><?= _("(Test)");?></span>
+  <br><span style="color:red;font-size:90%;"><?php echo _("(Test)");?></span>
 <?php } ?>
 </div>
 </td>
@@ -110,10 +110,10 @@
 <tr style='vertical-align:top'>
 <td style='width:870px;height:19px;'>
 
-<a href='index.php'><span class="menubtn<?php if ($currentPage == 'index.php') { echo " active"; } ?>" id="firstmenubtn"><?= _("Home");?></span></a><?php if ($user->isAdmin() || $user->canEdit()){ ?>
-<a href='ajax_forms.php?action=getNewResourceForm&height=503&width=775&resourceID=&modal=true' class='thickbox' id='newResourceForm'><span class="menubtn"><?= _("New Resource");?></span></a><!--
---><a href='queue.php'><span class="menubtn<?php if ($currentPage == 'queue.php') { echo " active"; } ?>"><?= _("My Queue");?></span></a><a href='import.php'><span class="menubtn<?php if ($currentPage == 'import.php') { echo " active"; } ?>"><?= _("Import");?></span></a><!--
---><?php if ($user->isAdmin()) { ?><a href='admin.php'><span class="menubtn<?php if ($currentPage == 'admin.php') { echo " active"; } ?>" id="lastmenubtn"><?= _("Admin");?></span></a><?php } ?>
+<a href='index.php'><span class="menubtn<?php if ($currentPage == 'index.php') { echo " active"; } ?>" id="firstmenubtn"><?php echo _("Home");?></span></a><?php if ($user->isAdmin() || $user->canEdit()){ ?>
+<a href='ajax_forms.php?action=getNewResourceForm&height=503&width=775&resourceID=&modal=true' class='thickbox' id='newResourceForm'><span class="menubtn"><?php echo _("New Resource");?></span></a><!--
+--><a href='queue.php'><span class="menubtn<?php if ($currentPage == 'queue.php') { echo " active"; } ?>"><?php echo _("My Queue");?></span></a><a href='import.php'><span class="menubtn<?php if ($currentPage == 'import.php') { echo " active"; } ?>"><?php echo _("Import");?></span></a><!--
+--><?php if ($user->isAdmin()) { ?><a href='admin.php'><span class="menubtn<?php if ($currentPage == 'admin.php') { echo " active"; } ?>" id="lastmenubtn"><?php echo _("Admin");?></span></a><?php } ?>
 <?php } ?>
 
 </td>
@@ -129,7 +129,7 @@
     
 	<div style='text-align:left;'>
 		<ul class="tabs">
-		<li class="changeMod"><?= _("Change Module");?>&nbsp;▼
+		<li class="changeMod"><?php echo _("Change Module");?>&nbsp;▼
 			<ul class="coraldropdown">
 				<?php if (file_exists($util->getCORALPath() . "index.php")) {?>
 				<li><a href="<?php echo $coralURL; ?>" target='_blank'><img src='images/change/coral-main.gif'></a></li>

From 86ebcb5fafcb7367aa247f0d9f37e77ab9326095 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 11:20:58 +0200
Subject: [PATCH 022/159] Translate updated

---
 admin.php                             |   1 +
 ajax_htmldata/getAdminUserDisplay.php |   2 +-
 js/index.js                           |  42 --------------------------
 js/plugins/translate.js               |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo  | Bin 35657 -> 35656 bytes
 locale/fr_FR/LC_MESSAGES/messages.po  |  40 +++++++++++++-----------
 6 files changed, 25 insertions(+), 62 deletions(-)

diff --git a/admin.php b/admin.php
index 7d002ea..fbf7b8a 100644
--- a/admin.php
+++ b/admin.php
@@ -71,6 +71,7 @@
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'><?php echo _("License Status");?></div></td></tr>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'><?php echo _("Note Type");?></div></td></tr>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'><?php echo _("Order Type");?></div></td></tr>
+
 				<?php
 
 				//For Organizations links
diff --git a/ajax_htmldata/getAdminUserDisplay.php b/ajax_htmldata/getAdminUserDisplay.php
index fd417be..73abdce 100644
--- a/ajax_htmldata/getAdminUserDisplay.php
+++ b/ajax_htmldata/getAdminUserDisplay.php
@@ -16,7 +16,7 @@
 
 		if (count($instanceArray) > 0){
 			?>
-			<div class="adminRightHeader">Users</div>
+			<div class="adminRightHeader"><?php echo _("Users");?></div>
 			<table class='linedDataTable' style='width:570px;margin-bottom:5px;'>
 				<tr>
 				<th><?php echo _("Login ID");?></td>
diff --git a/js/index.js b/js/index.js
index 24d8fd3..a463860 100644
--- a/js/index.js
+++ b/js/index.js
@@ -15,48 +15,6 @@
 **************************************************************************************************************************
 */
 
-function getCookie(clave){
-    var valCookie= ""; 
-    var buscar= clave + "="; 
-    if(document.cookie.length > 0) { 
-        pos=document.cookie.indexOf(buscar); 
-        if (pos != -1) {
-            pos += buscar.length; 
-            fin= document.cookie.indexOf(";", pos); 
-            if (fin == -1) 
-                fin= document.cookie.length; 
-            valCookie= unescape(document.cookie.substring(pos,fin)) 
-        }
-    } 
-    return valCookie; 
-} 
-
-function fLang() {
-    var langBrowser = '';
-    // Search the language according to the browser
-    if(getCookie('lang')=='' || getCookie('lang')==undefined){
-        if (navigator.languages==undefined) {
-            if (navigator.language==undefined) {
-                // Internet Explorer Compatibility
-                langBrowser= navigator.userLanguage.slice(0,2);
-            } else {
-                // Old navigator compatibility
-                langBrowser= navigator.language.slice(0,2);
-            }
-        } else { 
-            // Recent navigators
-            langBrowser= navigator.languages[0].slice(0,2);                                
-        }
-    }else{
-        langBrowser = getCookie('lang');
-    }
-    return langBrowser;
-}
-var gt = new Gettext({ 'domain' : 'messages' });
-function _(msgid) {
-    return gt.gettext(msgid);
-}
-
 $(document).ready(function(){
 
   updateSearch($('#searchPage').val());      
diff --git a/js/plugins/translate.js b/js/plugins/translate.js
index 9eed911..3f7baf4 100644
--- a/js/plugins/translate.js
+++ b/js/plugins/translate.js
@@ -35,7 +35,7 @@ function fLang() {
     }
     return langBrowser;
 }
-var gt = new Gettext({ 'domain' : 'messages' });//gt = new Gettext({ 'domain' : 'messages' });
+var gt = new Gettext({ 'domain' : 'messages' });
 function _(msgid) {
     return gt.gettext(msgid);
 }
\ No newline at end of file
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index ed4104b13ed431224e0a17bd5046e3756a20241e..0dcf7abfeaff564ed1490bb1f82757acb3d9b084 100644
GIT binary patch
delta 1363
zcmXxkPe@cz6vy$KQ_c8iGSk#D^=W02WzAHeR<<aD{(z)o1=6OPXb}oSy3u@D=HEre
zkR}RcfrJ<oBN%Nm2`nnx1rcQsK|vZtk*n(a>%A88x#!;Z?mg$cJ3j4=d(s<s_e++Y
zV2o*PG$s)*;}RS|KaSvHypLXd=*CmHlz19baK??lVJdN4lQC(Sj*5#g3wNRRtHEV>
zyvf*R5rcXrJlKdnv{5g1U^xzAF}}fTm~hURLcE1}_}q=>a655EvoS%eLhajzI;RVj
zK#x1$*K9ir157MrVaR=O*o{YVBlGt#7iX{m|KLt+;C&@FhDG=R)w$&J#;nC`R3~=3
z@liK!Ms*-+Gg!l57*)wL)WR$#p=oh4_G3I@8mconu0hnndvOCsFaxi<j$=OYOH?A?
z@d|n`7*l|DKLfRB0@eD*s7hbp3Y<k9=)K7I#4OCjAgYxI(1Vp&iifcRdr)`gJtpHP
zT#56psjdGyWt(CKs(6PpVJc7u9K(EUKqb(Rs^AXlGEKVc@6aM%aLKup`M8{T3+CWH
z)PAQ?`?R3WyNW5?KXcn%cz~*K8du>*)Gd!|;}26&6{Vx*b5I@Igi5powQ&uqbG5h{
zJ5UFYqV}CY3*So4H@_L^XO!FSY!pB}5JFX4kE*B(mEaB3!Q-e3Cr~Y(L4EtLs9%S-
z!#Q{}DzQDN%XtKKx58-a;E4M`E9#Q<q5dxnp%NH%eT3P>uTT~JK;0Ezr_+%_)Hg0g
z?HfWRehQU%6IvKWB{bGa|MlP$6WaJS>V;pZR{6V}gVv*7C`YyW5a!`ocfA)?`3UMC
z*(55lX;cAo7>}NAr!YV26J>ULodbih&z5hicbgRmlm$wn^P#-|<Cs-lTaaX`>gppW
h!d7+V!Lrz3<ITkA{&2GI%(}YB$w=6Wh1!35{sJl8&RhTh

delta 1365
zcmXZcPe@cz6vy$KS~_W(mE~mS8#5`)$efZUGFk{hMr001U@g*u78#Z%_-8c#Ym3rS
zOAIsu>5m0NQPD<=&_!jdAc!=GC<28Fq*dRa@2)=g-22`==bm?GCi^0$`XV0xN(sdp
zV_IsBiNmWHk3+ZuAK)^4fzdc_<0)K8JdKGsYvbRznmDS?m^GM;inB2V51{rd#Z_2V
zXF_HvgG)?AVm-!S6Y9k-%*Wff9Y5m$#?>3M1@EE{-`RK`_Y!*>jM<4n)V>|4JXcT!
z^w{~E4Iy`7h>0i`?$`%MZ9InA%!e@zXR#WW@ZLVGK^68Cv+x_LbBT?{Y{oQHCkkwQ
z+{TTl4%`Sa$Y3yvI>}qq!W`<8L^Qb-C!mLTEvhq))sISi5Vzq)T!+Kf=a^3X0aeH!
zyoR33#$;k>kbzn>folC5OvCr+#W_?$Pcz9e6_e4AYUN>!#A4ioC3pmTP<Q4lCg4w8
zkN>PmEsLEBnH>yt;(T|)97QEKiRoB_Dqs+Gf=8&!^xCe^phFzl>R!qWOd{Te8}Sfo
zzq6=)no;@sF_HUc?%9Qxs1r`(2K<h?<xy>X224VoC>b^HpgNX=Dl~xFxD?g7^SBAS
zP>IJ-`%a*PUnKdBX?K4{KJ*dhqJu%yiK|g3>P8hfj7t0rb;5B}i)T>ZejfGfi0N<>
z=b#EJKwZuf)ZIFbA^m<Y*auosmuvu+;|QvNht>&9CH{yy(O=YE@pQT!*^2tc0o1-h
zRN-e(h1a8l*HHyM>7@U9aFPja{0a5K0;*N<U2dW*)C>Djtu8`!s>-hSqfUMw^@sKf
z7cVjD0CVWUsBZUQ@u*Ma?T&U6=7xVbG5%=3lam+7+1<NP?6c#%uoFC&86PmmDyk|^
il{>+r!hjRLRXY+JQ&Cw~Ug?yT_ZGH!!zbE*M*asbAI>oV

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 44e9fcd..8d75217 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-04 17:16+0100\n"
-"PO-Revision-Date: 2015-05-04 17:17+0100\n"
+"POT-Creation-Date: 2015-05-05 11:18+0100\n"
+"PO-Revision-Date: 2015-05-05 11:18+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -20,7 +20,8 @@ msgstr ""
 msgid "Administration"
 msgstr "Administration"
 
-#: admin.php:51 ajax_htmldata/getAdminWorkflowDisplay.php:74
+#: admin.php:51 ajax_htmldata/getAdminUserDisplay.php:19
+#: ajax_htmldata/getAdminWorkflowDisplay.php:74
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -100,44 +101,44 @@ msgstr "Type de note"
 msgid "Order Type"
 msgstr "Type d'ordre"
 
-#: admin.php:80
+#: admin.php:81
 msgid "Organization Role"
 msgstr "Rôle dans l'organisation"
 
-#: admin.php:81
+#: admin.php:82
 msgid "Organizations"
 msgstr "Organisation"
 
-#: admin.php:85
+#: admin.php:86
 msgid "Purchasing Site"
 msgstr "Site d'achat"
 
-#: admin.php:86 ajax_htmldata/getAdminWorkflowDisplay.php:17 index.php:186
+#: admin.php:87 ajax_htmldata/getAdminWorkflowDisplay.php:17 index.php:186
 msgid "Resource Format"
 msgstr "Format de la ressource"
 
-#: admin.php:87 ajax_forms/getNewResourceForm.php:223
+#: admin.php:88 ajax_forms/getNewResourceForm.php:223
 #: ajax_htmldata/getAdminWorkflowDisplay.php:18 index.php:210
 msgid "Resource Type"
 msgstr "Type de ressource"
 
-#: admin.php:88
+#: admin.php:89
 msgid "Storage Location"
 msgstr "Lieu de stockage"
 
-#: admin.php:89 ajax_htmldata/getProductDetails.php:301
+#: admin.php:90 ajax_htmldata/getProductDetails.php:301
 msgid "Subjects"
 msgstr "Sujets"
 
-#: admin.php:90
+#: admin.php:91
 msgid "User Limit"
 msgstr "Limit d'utilisateurs"
 
-#: admin.php:95 queue.php:59
+#: admin.php:96 queue.php:59
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: admin.php:118
+#: admin.php:119
 msgid "You do not have permissions to access this screen."
 msgstr "Vous n'avez pas la permission d'accéder dans cette page."
 
@@ -1011,7 +1012,7 @@ msgstr "Pas des comptes disponibles"
 #: ajax_htmldata/getAcquisitionsDetails.php:100
 #: ajax_htmldata/getAcquisitionsDetails.php:159 resources/cataloging.php:106
 msgid "edit order information"
-msgstr "Modifier l'order de l'information"
+msgstr "Modifier l'information de l'ordre "
 
 #: ajax_htmldata/getAcquisitionsDetails.php:127
 msgid "catalog view"
@@ -1706,7 +1707,7 @@ msgstr "ID d'enregistrement"
 msgid "Starts with"
 msgstr "Commence avec"
 
-#: index.php:339 js/index.js:278
+#: index.php:339 js/index.js:236
 msgid "more options..."
 msgstr "plus des options..."
 
@@ -1752,7 +1753,7 @@ msgstr "Identifiant:"
 
 #: resources/cataloging.php:120
 msgid "Source URL:"
-msgstr "Source URL: "
+msgstr "Source URL:"
 
 #: resources/cataloging.php:121
 msgid "Visit Source URL"
@@ -1816,7 +1817,7 @@ msgstr "Identifiant"
 
 #: resources/cataloging_edit.php:42
 msgid "Source URL"
-msgstr "Source URL:"
+msgstr "Source URL"
 
 #: resources/cataloging_edit.php:68
 msgid "# Records Available"
@@ -2138,7 +2139,7 @@ msgstr ""
 "S'il vous plaît, cliquez sur le button Ajouter pour cette étape avant de "
 "valider ce workflow."
 
-#: js/index.js:154
+#: js/index.js:112
 msgid "Processing..."
 msgstr "En traitement..."
 
@@ -2374,6 +2375,9 @@ msgstr ""
 "Êtes-vous sûrs de marquer ce ressource comme complète? Cette action ne peut "
 "pas être annulée."
 
+#~ msgid "Administering Site: "
+#~ msgstr "Administration du site: "
+
 #~ msgid "Provider:  "
 #~ msgstr "Fournisseur:  "
 

From 29a912435ceab5193270dcdcecb4f38fbcf2b2f1 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 12:11:35 +0200
Subject: [PATCH 023/159] Translated missing line in resource.js to delete a
 resource

---
 js/resource.js                       |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 35656 -> 35799 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   8 ++++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index 4436845..f2cd263 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -440,7 +440,7 @@ function bind_removes(){
    });
    
     $(".removeResourceAndChildren").unbind('click').click(function () {
-	  if (confirm("Do you really want to delete this resource and all its children?") == true) {
+	  if (confirm(_("Do you really want to delete this resource and all its children?")) == true) {
 		  $.ajax({
 			 type:       "GET",
 			 url:        "ajax_processing.php",
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 0dcf7abfeaff564ed1490bb1f82757acb3d9b084..4993f0bc7dc7d85eab227e937dcdce6b55a3190b 100644
GIT binary patch
delta 11325
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
MK-|V!1H%*l2fp7K00000

delta 11259
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 8d75217..f4f5f55 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-05 11:18+0100\n"
-"PO-Revision-Date: 2015-05-05 11:18+0100\n"
+"POT-Creation-Date: 2015-05-05 12:01+0100\n"
+"PO-Revision-Date: 2015-05-05 12:01+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -2351,6 +2351,10 @@ msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
 msgid "Do you really want to delete this resource?"
 msgstr "Voulez-vous vraiment supprimer ce ressource?"
 
+#: js/resource.js:443
+msgid "Do you really want to delete this resource and all its children?"
+msgstr "Voulez-vous vraiment supprimer ce ressource et tous ses fils?"
+
 #: js/resource.js:464
 msgid "Do you really want to remove this Subject?"
 msgstr "Voulez-vous vraiment enlever ce sujet?"

From 590fb2dde9c0538a29df66b1c5ecf874f27a7196 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 13:55:30 +0200
Subject: [PATCH 024/159] Translated missing message in import.php

---
 import.php                           |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 35799 -> 35897 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |  10 +++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/import.php b/import.php
index b1fe71d..03cb76b 100644
--- a/import.php
+++ b/import.php
@@ -21,7 +21,7 @@
 //print header
 $pageTitle=_('Resources import');
 include 'templates/header.php';
-?><div id="importPage"><h1>CSV File import</h1><?php
+?><div id="importPage"><h1><?php echo _("CSV File import");?></h1><?php
 // CSV configuration
 $required_columns = array('titleText' => 0, 'resourceURL' => 0, 'resourceAltURL' => 0, 'parentResource' => 0, 'organization' => 0, 'role' => 0);
 if ($_POST['submit']) {
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 4993f0bc7dc7d85eab227e937dcdce6b55a3190b..232f09f624903471699f8ccd3e440399c52f5eb0 100644
GIT binary patch
delta 11480
zcmZwN37C#$-^cOGSZ0i2Y=beFd&U^XV32*^cOv_q7#hnM%h<V*-AF>A$Wo78G==Pn
zl*(375{0CCG%ATg@Ar3~f5-9m9`AMZpU=5n=XIX{YZ*Mxg_ncgT@mEJTrkISk0U(D
z^Ge{d{GNB5a#)O7J<nIc^NM2(7QlKKf*mj#yJHR<kA-oH^)JD8)K^*k2MnWr8#Vr+
z)9(dU<RUZ#qZUvOb%ExX8#`bf?19yADMsRl7=>4{C_X|>T%;14!6+<*iKvA&ME2%&
zL2V=%Lp(n#r;v+==@^W2Q7c_+?XQ{}Fc0lpuomt{Eg%auK2MTcNHL6~UKurSS1gEq
zFfWe8d^i=uxW1P`K`UE{TG<xVP7a_CkD@Mo6}9tUP&*E(>?ZP|`jb!#sf)UMtuQ|h
zwf4!V%+5nCU<vv)(OL>6aW85|=P^J2hQ%;@6?b9@%t^frYDb9}felb8?t+>)#hifL
zW^XQr;@hZ<97bjOgDT`-D>_9(cD!H%zecs+Ks^&#)*n{YEg(PY*(id#pbx__33&{>
zhN$^Qpe{HH^(;(4Ei?l)eqB}aUy#Bs8VcYs)P>L6fGenbmW8^f4^b(OeZuW133Xl_
zEQsw;nd^^QSQ_elKk9;uP`7F|DwCVlp?m!%>cVfME^yF1X<k63`Z{Xof1$?b;FVA+
z^P=hzs0EZl&68x-!@|^Cqi%ISREGRhDCorLs1xR6A$$on(H7JW_oFWKDQf%|sGVHK
z^7s=f^%2!wy(uPAPsOsh%6!lIf5Jvw-;1c>26jUYoQa)q3u@vA$aCnGt?BxEpi(y-
zwSYOOg};c}*=wi|)<M+6`z0#%zna;2cQw8MM(F)7MM3wd8kWW;Rv(N?^;oM<LuDqz
z+Sj5c-eUdx%nwob{yawG_o#<3XKi=kFjOWZ(Wm!6hJqfhCgu=Kpq_!{a5vV&E7%B2
z@Hwo6eNkV=41Scs6R5Z47Ag~=bzKI^VFl`qF&<M<<CddeD|yQX?88#jf52jxi>vD4
zj7B{yaj1J=4r8$jPQ)&#9iKwonr~3=`!!Ume?ev7Z`AdI>brVqee$n~3s^%0>VhRu
zsg1$HSOs-~7N`q!MO~mb>KPb}dUi&mF0cx<(DkVKwj#gNyq%~8WuneMQlI>5f{$rv
zgBMUMjcwpAn1C$WtA*NeI_ks~s0(dCZD6a_-^9<T@3HoU4c!73qsA?>`U)IGeYKy0
z9<rcD_Hdvc#z@o!%Azungvvle)c6jl*RzM2f?C)lRR3&L1{R|>xB|!G>!^i9Hg=ix
zm!zPE(q>sy1`<&dR7It*E@~l-Fa|rKZpCO+N++PcfU_}>A=E-Ppi;jbOX5!R6js#x
z|6dBxbQEvme%sZ-2<p8t21lVD#-$jC+pPaAmZSayDiisex(mi&QR<24!=|Wt2BAJ=
zb5QfIz+rm-cTgx!L-A&Ar`1tAt%KS@8`O@vpeE{%8b1S-fmcx(TaVdsGb(f2F$#C1
zHgFEL(VwwA=4sBY=K5X@3c9z=P!n`U-TUsC6Z@l{iDcA5##ntCYDXDXUt?}Vy*2w#
z^PWbHyNt@zZPYW7tp)klO7l|CPK%%}?897G4l7|2`mi4+pdUNnX4D1lp%xh2(k(Co
zHJ=alOq56U*T-ONi|X&(lKiWqFAYlhFw_Z?Q7e5Ower_cC+tFHV88hR7NLF?HP21d
z_`B8~(#qANQMaNB>N@RF*Xi4e{OiOt8ss!Ag&C*?Y{g(afFXDcbK<9{r~Wh4E&CQj
z@H#3Zw=fqzKrJ|XYd3E`)cA_14OQ_|(1~@iEH*=}Y&hznQNJF#6{v~!q3+#rtDm*{
zCDa9Pq86NmIq*-^MjoItledlQkH*~8{bea=;wq@uq8{o!eG0X(G}MA7T0H}`gXO3T
zu0-v4EtbbOu^e8+$(X&Zdu{#bqy9Q7!^e?ve(yR3?L2QgH*s~;g=?cO(8StXqjuIF
zwX?3MThYtvPopxGjFC7OpTc#Rh<DJ3zV@!aG3L_y-<yIy7|&oRPC}(@w$)!U*P(97
zHq`5N9F@Y0sD)fNe==`lUfS<s80O%WDT4*fni#J4zb^%)cm$Tf>8J&)#&q0)u^9KH
z%TP<yh1;TTSy#-5!^}yjw_?7z7L~C*s9SdctKt##^D**%w~ksJUFz$h{-o2~?1{SI
z2+V`yQMc$h)WS0`@S0lxF6%#t;q-ri8h0M^<BzC}{MC{CYd~-(*H9ESAP#k*>Zl7f
zM(wbT_4l;)q1HYIHQ`Lu4i}@Iou$^k3YCG4s9U|w+K+W2|60IV>-f$(?qdPkb3Nrw
zD2B>NWmG1bp;Fud^(-W#7BC5Q&*!4XEk`ZrHPrYGsD<rAjXUb6px5m*Y9Y5!58*@9
z1R<T>#060&M58iP5j9Z*)LYRUm7(@#AJk5Vp*Hdy7Q*GI%x<>2{~ZdN_#@N=7f=hi
zfj+!z?M1t|iQ-W^sfC5`Nz_|0(CSlA3w!}JZXN0&-HV#{l=WXmZi(N^qM(6yPz%V@
z)$Ob}Dg!a76BAJjtt*50n+#T<-o3kfpJ$<-l{KjE$wt&`dD{BFKxH-yQ}Hhh{QW<r
zhr7UN)I%~8b>dv~;Ud&)xdS!9$EXyZ$A)+nYhr9q_e-W1YWz5JDQdo*s15E$-SXp7
z@BcLl`t6jhm$M`WzJM6`0-`d}8kK?0sCz!Z`cqIDO2cPxI#$GMSP%>Jc7L&n!%Ea!
zq2?Wr{=yWdQP4xO6m`NIsFm)u`U%v%zKFW;FPMOLt>4$jW$Fpkx4jES;26|=^HJx&
ziaKv6YTU&>+<z7B)1Zf@SYJ0$g4xC#hSBtApeEdgCGjvSQ{SK#d;|3?{eh7f*3TJ_
z>ThKAC$TB@lz!x2@9lOP0`Dd29v?+b{0Zur_yV=Si`M=#>XUp2^?n!a@9uFF1|C{e
z1`^H2*qnNI)O@Q^&%}B^1>Mt4s1@!ukE3qQ=crrrBkH018%tpD)9#+fp`P|?s0H>x
zZD0iI{0XRqEJEFa4X6z6LCxzwNkIcHp(gkZm5J;F+)6`HI|@fFG!k`US+h1qQ*Vp9
z@G#UfG7fd#G}OZ9p>D}CRK|B8^Z32}6pGUDDQcqcQ7OvFqpS%+Q705ejf+7ow6@s>
zb*p-##t%Y`PsIv28K1ySsJG&hwTBK=-OsyAp*$VQfd;-@SfBbK)C3PO2@?jn*Q+PS
zQ$K)p@ERs!sbsg1HmD4BMx{C#b&DooX<Umjcnl-CzITIyo?36PyGKP)nMg$KxGide
zfv8)x5OsldR?oyz)IUPaa}#~|59%544RN=wy4e(~(%uRExhTw{pp-7eV0;zh@O9MA
zKSE{VJ}Q;*&${+r*p>PM^INP<y+#VZ7cdQL;Sp4Z?xQkYW~giLIF$TXqhUS`mGBUj
z!CM%Dg@(C*`ze7+S$mAak(dJ)nlGTnFGpo=4Nk{HsEjon?)tl8F!g@s;Nj$78A!E;
zbj(eCDrU#IsEHS1PF#li)UHCMdJ7iAqo{c<qTZ74%q*-y{UK`JY9pKtPz!10r;vw2
zM-0P0R!^~dI`VP!W}+5y1+}A_*a{zEBDPF*6OTbnJQcNp*;b#Ae^6h7%G}(MZk#`Z
zf(9-_b*w=C^Hy7X-Zb|R7BCY~7iett)~JVU0BVQhP#>D<<}%DneG_VfyHOc?A9*|c
z-X#i?Xvjh>WaucjkW^HCj5!{43nrs7F~iyyU_R>4V+CA|+Q>=N>vtN9<5koG9%49#
zj@JC#|Kb#?(@+X)Vi#<T8K{Tx6vpEn)Wa7w#{CVaCdN^J8Y|;$RR3<Qi|4Q)<{Rs7
zSq$paT@#bAi{$#=EDCyR-$t$Ub4<r9Yfq-49nD6qd;w}Ft5B)kh+6nNSQc-gG8Hk-
zJ(N+XOva)z7mwOd68g1+ZWMIlWK;?_pe8<pO6_IT1h-K4{#Vom?xPm;4{AZ-<DDf?
z-}(g9JWZ{=6BeP~4>fQ4c=E3l&7vU!Uq+p<9ktT^RzGI-bEpe_jrv62M5Qu*g8QRb
zH|$USCCra^u@DANbPJ8bQ0j@O>(-b^{xz^Q4cb{R)CHa~N19VmJDrbO;7ZgEHli-D
z8w=w}^9q)veg}14L7s43Fcynqb<}m+`ze&B&<~ZGndV9?Kz%1_g7;AG`8m`Ck5D@)
zGTCJ+2K50dkD9m&>XtRJ_7<q~+M{06WYoO=krWbCK%KDJ25d*|bPra-<EUrl4#r~S
z6!#6UhgwKF>O(dim6;6G`LCcBwi%V-omStAEY$BErl6gkaSh&8R7!tGr8Ib|tCzqi
z>XlIwwnL?~GwNX+jM~6()U%U@nr9+5z(uHye1a?RZ!D+xf7vwm%jF=JqvHzJ#Sr?c
zVl&jl<53ryj9S19YoBNB8K~FvMXSGT_0?FB_VpNzXOI`hyN&wyXK%=Kx3V`-_xN*E
z>bx251C$SyiE37FZS|3;49r5^nwK#K4_NzU)WiHMYQc|C_de%Lmzi+%D@CO#=)yIz
z0uDqyEH9XwFqZle)IzS|61<1;xZpXLp<Srdzk}N8A&kV!sO#KAJ>+4t-0y(Wv&g?z
zR*#14*c5AHOMDV%pdOmDsHgQSERH{#IcB>|MWZrN(dvz`81)XQg%3e3U;%0aYf#Tp
z=4|q>0jFv3;cuwdr_dbtL5jmt)a#%o?1`FaH0pwLP!I1)Yu}36;bAO+=TY<hjzO4X
zuG>&Bsy*CKK`Ha07LtIPxE(5W{joGoL|u3_YT{k!!&7D!Y9aaOxp`ty{moH39*p|J
zPDU+o35KA569w&X7b?YPQ1|{@EQj|{7mk_l7FHegaJE7{T-{I?9%%jPn49`M)OX=U
z)B;wUZ(&L5Cy;sl-uD#ru-r$bByxef$K_EIH%G0!J8I=4(1){7nR){?ZZB%$lc@1G
zQJH##+CbDoH$DlK=_VMX_dl6}2Fyk6{1wcDnW%*wM(yAV=Egf1ijPpYD0hatU}?-o
zeK$Y);ca3Fkxe(AqpibhhRYdKRfD;HU>Ad^@WJzv@q#)yK6M1%kSVl1VeM*;rW`@c
zwYIIawWT};)2&V85-C?B4iIlxyLR7!@KM+Gz3ckH@d7cA#*YFu_oF3Dv=jBuE)A`(
z8YWt~BmDzxOj&$LTqbtXpBI}EZHP5C{vXQEQ+`j^pH5{gl~1uekwSSCF_ZHDcYI^*
z@8cyRhC$niag-|&&r;4|DSv!^VcNS8M`-vJpTW0?4%yiMUlelC`1p8=!XB$Uz+dS5
z4D;g_8+V_2M;jAE+kYwZ8`<ka`5b<0;|^jID{FXPVi8e;HvJOX=cn*Cg)l6OJ+U{j
zkobzwtEpo?WgRaPgNa?l03wOd5$6c}e8S2tIH#MHXJR<@t~ikRkaBAxaR2r6dsKAr
z>)p#nd5qNqjr{0Agpk&Y*1iijS$Qdan}}o7PoX~Ddi8WnqU{SjL`<gqE=Cj62;R)V
z^(m4CItSsBK+SzzRQ#Cs5`>NqP_O7QLchy({76&}l=zI(Kbqk8jCT?X5qf2RAsSNF
zH(wvMiiD0?y8qkh_`gRQZP$p}MDPFA*@yBv+8W?_Otn6Jq8C%whey9Bblh}!V`=|@
za(k=K!bgODk-e||uO-?s=qG%HI?iDx(Sq_Sd_YVkvfGn=miAu6uf+GXHzk%5jfo0G
zO=3QMZxTl+pT^Je9`QBhQTR6z$p3x{<7xaEb#y1<DUZa0)|N>*mtFh{WgW5fZL|JH
z)E8M<eN6~`uItjK&vHp@Z~aO5kTwp#_borarr}BAIpTRD2W_P>FaCtXP{%5w4s{*b
ziTafP2-NsT3(BR4&#4c=BE<KUE8}Z~cA9|yJ_7sae?+GB5S{CA=)XsJuhae;(UQ<n
z4r{xj_YI!0c5CvkSUn3HS$PMYBOVXH^~8PpYUuhKZP4TX{?z$h;sxU{;v?cq>pYLO
zsOQ1oh`p3`d`B!NMo_<MZTwm0U&lMtY7r}mzpcl=-Uh3F*&4;Ow7*Hzr~F?Vlh52~
zerY~s&av}Pn0j1RTHgW6^@zqqH*2Hl_xw~g6DO(tiPLdAq2sC}@bhDScBg+hagcHx
zenIHy=?MJnO52}Se~WSz%HdXz$A5@2#2du#dMbh#^a_=uL|@8xusoroA9WpJY^4X~
z!Nfe*<n70ORu0luIYtvN+BvGH6U&HGv=t}vG48tc2UC7Y_dku$@iH-y*uj7s#8+yw
z!E-66Qf`Me2_035GPK>ozi=~NB8pO;L4;D)|E)7O<p#uE>eq<J#|qkXeeWd-H;EsK
z&eWISEuuB$)tFy{IO-5Hhyt|bAvzN}W@8szNF1g7jJ2z8Bhicc4g3M?5v?d+AU@Rf
zPtY)d${+anSZ#%-Sbzwn?>2GP#$;eV8xuwOY09rzJ@Dsj%EPT*7>hBc72&hCcPYDr
z{eNPWJfx}ut%r#<)^<;I%EyVRlyhNS{F%r}IRwWMFHruBm_X<_?g;!$=4T4+(}?Dj
z|3kD1^zcLZ59PxBF@ynI@C@-C<%&dQ%I{%L#;nD=gpS3;2Fi1Yi<Bd+J(BWB%3F!u
zl*e29f6VIUP+Ug%b2G7ySBV6oIgRhwAhmb0awp2c#6apB)WPvP<-NGT#_YlD#M8tb
z;&u9}U``F@_=I?cdX_4_j>D4&jLG~n@j$LTEmDRj`%*@vjT}8Tb4S&cu|d_UE^Xa4
z9x_LD?G{?Fb)aj&*p!i}zCmTvQ+<Oo5A<)7FMLdTTH5gUH;+h89XlXpbaH0?)DtED
E2aQZ6<NyEw

delta 11372
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index f4f5f55..dba7451 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-05 12:01+0100\n"
-"PO-Revision-Date: 2015-05-05 12:01+0100\n"
+"POT-Creation-Date: 2015-05-05 12:42+0100\n"
+"PO-Revision-Date: 2015-05-05 12:42+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -714,7 +714,7 @@ msgstr "Notes"
 
 #: ajax_forms/getNewResourceForm.php:278
 msgid "Include any additional information"
-msgstr "Inclure quelque information additional"
+msgstr "Inclure quelque information supplémentaire"
 
 #: ajax_forms/getNewResourceForm.php:294
 msgid "save"
@@ -1536,6 +1536,10 @@ msgstr ""
 msgid "Resources import"
 msgstr "Importer des ressources"
 
+#: import.php:24
+msgid "CSV File import"
+msgstr "Importation d'un fichier CSV"
+
 #: import.php:32
 msgid "The file has been successfully uploaded."
 msgstr "Le fichier a été téléchargé avec succès."

From 593bf3bb850e5cb68127d893b65f7c33126ad52d Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 15:56:33 +0200
Subject: [PATCH 025/159] Added basic footer, including module version number

---
 templates/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/footer.php b/templates/footer.php
index 8418ea9..ec34b58 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -28,6 +28,6 @@
 <div class="push">&nbsp;</div>
 </div>
 
-<div class="footer">&nbsp;</div>
+<div class="footer">Copyright &copy; 2015. Resources Module version 1.3<br/><a href="http://coral-erm.org/">CORAL Project Website</a> | <a href="https://github.com/ndlibersa/resources">GitHub Site</a></div>
 </body>
 </html>
\ No newline at end of file

From 39a85e2db5d30bcafd61116a2e6d2bb936d6c5a8 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 16:55:45 +0200
Subject: [PATCH 026/159] Translate updated

---
 ajax_htmldata/getProductDetails.php  |   2 +-
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 35897 -> 35899 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ajax_htmldata/getProductDetails.php b/ajax_htmldata/getProductDetails.php
index e1ca934..8dd3b1d 100644
--- a/ajax_htmldata/getProductDetails.php
+++ b/ajax_htmldata/getProductDetails.php
@@ -66,7 +66,7 @@
 			<th colspan='2' style='margin-top: 7px; margin-bottom: 5px;'>
 			<span style='float:left; vertical-align:top; max-width:400px; margin-left:3px;'><span style='font-weight:bold;font-size:120%;margin-right:8px;'><?php echo $resource->titleText; ?></span><span style='font-weight:normal;font-size:100%;'><?php echo $acquisitionType->shortName . " " . $resourceFormat->shortName . " " . $resourceType->shortName; ?></span></span>
 
-      <span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit resource");?>'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?php echo _("remove resource");?>' title='<?php echo _("remove resource");?>'></a> <a href='javascript:void(0);' class='removeResourceAndChildren' id='<?php echo $resourceID; ?>'><img src='images/deleteall.png' alt='<?php echo _("remove resource and its children");?>' title='<?php echo ("remove resource and its children");?>'></a><?php } ?></span>
+      <span style='float:right; vertical-align:top;'><?php if ($user->canEdit()){ ?><a href='ajax_forms.php?action=getUpdateProductForm&height=498&width=730&resourceID=<?php echo $resource->resourceID; ?>&modal=true' class='thickbox'><img src='images/edit.gif' alt='<?php echo _("edit");?>' title='<?php echo _("edit resource");?>'></a><?php } ?>  <?php if ($user->isAdmin){ ?><a href='javascript:void(0);' class='removeResource' id='<?php echo $resourceID; ?>'><img src='images/cross.gif' alt='<?php echo _("remove resource");?>' title='<?php echo _("remove resource");?>'></a> <a href='javascript:void(0);' class='removeResourceAndChildren' id='<?php echo $resourceID; ?>'><img src='images/deleteall.png' alt='<?php echo _("remove resource and its children");?>' title='<?php echo _("remove resource and its children");?>'></a><?php } ?></span>
 
 			</th>
 			</tr>
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 232f09f624903471699f8ccd3e440399c52f5eb0..d3e9d136cc177708d758cf504ddbc1c8ee46f70a 100644
GIT binary patch
delta 202
zcmdlvgK75+rVS+u^-2s33@u#@3_?J9Igl0v(z}4PERa3}q(y=BD<CZcq#3#y7=(e8
zERY7NHw4lk{VqUS5lE*)<vW42IFLUVNOJ?}tw35HNFM~!B0%~fkmdx^-?|yZ7`T88
zh8_k6Ng%}yq(K&{Zst_1F<~~dGM(HJstTevZwO5`V07Fp(pJF29$Z>bP?VXwxwC5n
FBLF+TCr$tW

delta 200
zcmdlzgK6gsrVS+u^$H9O3@u#@3_?J9DUcQf(mQ~(ERa40q(y=B3m`26r2heFVIVEt
z4N<QTq?LetCm^i|q*H-3NWL9Niv#J|K$;s!ZwAuxKzcur76H=tfix$O{?g4L#=r$+
z`~wO|0%^`3h=t0VITdS6n2oGVCU=CYg6Pc~LX!;`6E};r6|k_n=H;Z8ZSL;czz6`R
CXedSi

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index dba7451..f9fafad 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-05 12:42+0100\n"
-"PO-Revision-Date: 2015-05-05 12:42+0100\n"
+"POT-Creation-Date: 2015-05-05 16:52+0100\n"
+"PO-Revision-Date: 2015-05-05 16:52+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -946,7 +946,7 @@ msgstr "Notes additionales"
 #: ajax_htmldata/getProductDetails.php:430 resources/cataloging.php:212
 #: resources/cataloging.php:231
 msgid "add new note"
-msgstr "ajouter une note"
+msgstr "Ajouter une note"
 
 #: ajax_htmldata/getAccessDetails.php:170
 #: ajax_htmldata/getAcquisitionsDetails.php:367
@@ -1252,7 +1252,7 @@ msgstr "Supprimer la ressource"
 
 #: ajax_htmldata/getProductDetails.php:69
 msgid "remove resource and its children"
-msgstr "Enlever ce ressource et ses fils"
+msgstr "Supprimer ce ressource et ses fils"
 
 #: ajax_htmldata/getProductDetails.php:75 summary.php:206
 msgid "Record ID:"

From 0150a4e80e31f4c2832c6d73accb0f1bcbe446bb Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 5 May 2015 17:22:39 +0200
Subject: [PATCH 027/159] Translate updated to add new resource

---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 35899 -> 35897 bytes
 locale/fr_FR/LC_MESSAGES/messages.po |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index d3e9d136cc177708d758cf504ddbc1c8ee46f70a..649e6fcedd7e687b13930e6a2aa2e7ca4b68849d 100644
GIT binary patch
delta 3842
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

delta 3837
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index f9fafad..434efba 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-05 16:52+0100\n"
-"PO-Revision-Date: 2015-05-05 16:52+0100\n"
+"POT-Creation-Date: 2015-05-05 17:21+0100\n"
+"PO-Revision-Date: 2015-05-05 17:21+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -677,7 +677,7 @@ msgstr "Modifier ressource enregistré"
 
 #: ajax_forms/getNewResourceForm.php:84
 msgid "Add New Resource"
-msgstr "Ajouter une nouvelle ressource"
+msgstr "Ajouter un nouveau ressource"
 
 #: ajax_forms/getNewResourceForm.php:85
 msgid "required fields"

From 3f7d254a9ec84d1edcc8aa77c3535069d43ac3b4 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 13 May 2015 11:57:20 +0200
Subject: [PATCH 028/159] Fixed issues to add new languages and added updated
 charset in the database (latin1 to utf8)

---
 LangCodes.php                               |  18 ++++++
 directory.php                               |  18 ++----
 install/manual_upgrade_charset_utf8.txt     |   6 ++
 install/protected/update_latin1-to-utf8.sql |  56 +++++++++++++++++
 locale/fr_FR/LC_MESSAGES/messages.mo        | Bin 35897 -> 36122 bytes
 locale/fr_FR/LC_MESSAGES/messages.po        |  56 +++++++++++------
 templates/header.php                        |  66 +++++++++++++-------
 7 files changed, 163 insertions(+), 57 deletions(-)
 create mode 100644 LangCodes.php
 create mode 100644 install/manual_upgrade_charset_utf8.txt
 create mode 100644 install/protected/update_latin1-to-utf8.sql

diff --git a/LangCodes.php b/LangCodes.php
new file mode 100644
index 0000000..f3e1e64
--- /dev/null
+++ b/LangCodes.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @author: Cesar Hernandez
+ * getLanguage: This method return the name of the language according to the language code
+ */
+class LangCodes{
+    public function getLanguage($code){
+        $all_lang=array(
+        'fr_FR'=>_('French, FR'),
+        'en_US'=>_('English, US'),
+        'es_ES'=>_('Spanish, ES'),
+        'es_MX'=>_('Spanish, MX'),
+        'it_IT'=>_('Italian, IT')
+        );
+        return $all_lang[$code];
+    }
+}
+?>
\ No newline at end of file
diff --git a/directory.php b/directory.php
index 75812a9..6fd9068 100644
--- a/directory.php
+++ b/directory.php
@@ -180,24 +180,14 @@ function debug($value) {
 }
 
 // Verify the language of the browser
+global $http_lang;
 if(isset($_COOKIE["lang"])){
     $http_lang = $_COOKIE["lang"];
 }else{
-    $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+    $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5);
 }
-switch ($http_lang) {
-    case 'fr': 
-        $language = "fr_FR.utf8"; 
-    break;	
-    case 'en': 
-        $language = "en_US.utf8"; 
-    break;			
-    default: 
-        $language = "en_US.utf8"; 
-    break;
-}
-putenv("LC_ALL=$language");
-setlocale(LC_ALL, $language);
+putenv("LC_ALL=$http_lang");
+setlocale(LC_ALL, $http_lang.".utf8");
 bindtextdomain("messages", "./locale");
 textdomain("messages");
 
diff --git a/install/manual_upgrade_charset_utf8.txt b/install/manual_upgrade_charset_utf8.txt
new file mode 100644
index 0000000..c02f7f5
--- /dev/null
+++ b/install/manual_upgrade_charset_utf8.txt
@@ -0,0 +1,6 @@
+Manual how change charset in the database to utf8 from v1.3
+
+    -Open SQL file in /coral/resources/install/protected/update_latin1-to-utf8.sql and replace _DATABASE_NAME_ with your database schema name
+    -Run SQL file
+
+This script will change the charset in the database and convert all tables to utf8.
\ No newline at end of file
diff --git a/install/protected/update_latin1-to-utf8.sql b/install/protected/update_latin1-to-utf8.sql
new file mode 100644
index 0000000..5c69ebe
--- /dev/null
+++ b/install/protected/update_latin1-to-utf8.sql
@@ -0,0 +1,56 @@
+ALTER DATABASE `_DATABASE_NAME_` CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AccessMethod` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AcquisitionType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AdministeringSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AlertDaysInAdvance` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AlertEmailAddress` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Alias` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AliasType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Attachment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AttachmentType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AuthenticationType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`AuthorizedSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`CatalogingType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`CatalogingStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Contact` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ContactRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ContactRoleProfile` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Currency` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ExternalLogin` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ExternalLoginType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`IsbnOrIssn` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`LicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`NoteType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`OrderType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Organization` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`OrganizationRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Privilege` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`PurchaseSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`RelationshipType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Resource` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceAdministeringSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceAlert` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceAuthorizedSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceFormat` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceLicenseLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceLicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceNote` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceOrganizationLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourcePayment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourcePurchaseSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceRelationship` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceStep` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Status` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Step` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`StorageLocation` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`User` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`UserGroup` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`UserGroupLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`UserLimit` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`Workflow` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`GeneralSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`DetailedSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`GeneralDetailSubjectLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`ResourceSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `_DATABASE_NAME_`.`CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 649e6fcedd7e687b13930e6a2aa2e7ca4b68849d..2e805330b8047afd5e42c8d6beb13c3da6cd96fa 100644
GIT binary patch
delta 11365
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
HO=bTN3XN&=

delta 11136
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
G>Hh#4QX<I!

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 434efba..aadcd09 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-05 17:21+0100\n"
-"PO-Revision-Date: 2015-05-05 17:21+0100\n"
+"POT-Creation-Date: 2015-05-13 10:56+0100\n"
+"PO-Revision-Date: 2015-05-13 10:57+0100\n"
 "Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -16,6 +16,26 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
 
+#: LangCodes.php:9
+msgid "French, FR"
+msgstr "Français, FR"
+
+#: LangCodes.php:10
+msgid "English, US"
+msgstr "Anglais, US"
+
+#: LangCodes.php:11
+msgid "Spanish, ES"
+msgstr "Espagnol, ES"
+
+#: LangCodes.php:12
+msgid "Spanish, MX"
+msgstr "Espagnol, MX"
+
+#: LangCodes.php:13
+msgid "Italian, IT"
+msgstr "Italien, IT"
+
 #: admin.php:22 admin.php:40
 msgid "Administration"
 msgstr "Administration"
@@ -1669,7 +1689,7 @@ msgstr "(pipe)"
 msgid "Upload"
 msgstr "Télécharger"
 
-#: index.php:26 templates/header.php:113
+#: index.php:26 templates/header.php:114
 msgid "Home"
 msgstr "Accueil"
 
@@ -1731,7 +1751,7 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'achat"
 
-#: queue.php:22 queue.php:40 templates/header.php:115
+#: queue.php:22 queue.php:40 templates/header.php:116
 msgid "My Queue"
 msgstr "Ma liste"
 
@@ -1887,7 +1907,7 @@ msgstr "Notes additionales de connexion:"
 msgid "Additional Cataloging Notes"
 msgstr "Notes additionales du catalogue"
 
-#: templates/header.php:72
+#: templates/header.php:73
 msgid ""
 "JavaScript must be enabled in order for you to use CORAL. However, it seems "
 "JavaScript is either disabled or not supported by your browser. To use "
@@ -1898,45 +1918,41 @@ msgstr ""
 "utiliser CORAL, activez JavaScript en modifiant la configuration de votre "
 "navigateur, après "
 
-#: templates/header.php:72
+#: templates/header.php:73
 msgid "try again"
 msgstr "réessayez"
 
-#: templates/header.php:91
+#: templates/header.php:92
 msgid "Hello, "
 msgstr "Bonjour, "
 
-#: templates/header.php:102
+#: templates/header.php:103
 msgid "logout"
 msgstr "Se déconnecter"
 
-#: templates/header.php:104
+#: templates/header.php:105
 msgid "(Test)"
 msgstr "(Test)"
 
-#: templates/header.php:114
+#: templates/header.php:115
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
-#: templates/header.php:115
+#: templates/header.php:116
 msgid "Import"
 msgstr "Importer"
 
-#: templates/header.php:116
+#: templates/header.php:117
 msgid "Admin"
 msgstr "Administrateur"
 
-#: templates/header.php:132
+#: templates/header.php:133
 msgid "Change Module"
 msgstr "Changer le module"
 
-#: templates/header.php:162 templates/header.php:163
-msgid "French"
-msgstr "Français"
-
-#: templates/header.php:162 templates/header.php:163
-msgid "English"
-msgstr "Anglais"
+#: templates/header.php:176
+msgid "Invalid translation route!"
+msgstr "Le chemin aux traductions n'est pas valide!"
 
 #: user.php:101
 msgid ""
diff --git a/templates/header.php b/templates/header.php
index 070de52..bb9865d 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -23,6 +23,10 @@
 $util = new Utility();
 $config = new Configuration();
 
+// Include file of language codes
+include_once 'LangCodes.php';
+$lang_name = new LangCodes();
+
 //get the current page to determine which menu button should be depressed
 $currentPage = $_SERVER["SCRIPT_NAME"];
 $parts = Explode('/', $currentPage);
@@ -52,16 +56,13 @@
 <script type="text/javascript" src="js/plugins/jquery.autocomplete.js"></script>
 <script type="text/javascript" src="js/plugins/Gettext.js"></script>
 <?php
-   if(isset($_COOKIE["lang"])){
-        if($_COOKIE["lang"]=='fr'){
-            echo "<link rel='gettext' type='application/x-po' href='./locale/fr_FR/LC_MESSAGES/messages.po'>";
-        }
-    }else{
-        $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
-        if($defLang=='fr'){
-            echo "<link rel='gettext' type='application/x-po' href='./locale/fr_FR/LC_MESSAGES/messages.po'>";
+   // Add translation for the JavaScript files
+    global $http_lang;
+    if(isset($_COOKIE["lang"])){
+        if($_COOKIE["lang"]==$http_lang && $_COOKIE["lang"] != "en_US"){
+            echo "<link rel='gettext' type='application/x-po' href='./locale/".$http_lang."/LC_MESSAGES/messages.po' />";
         }
-    } 
+    }
 ?>
 <script type="text/javascript" src="js/plugins/translate.js"></script>
 <script type="text/javascript" src="js/plugins/date.js"></script>
@@ -118,7 +119,7 @@
 
 </td>
 
-<td style='width:248px;height:19px;' align='right'>
+<td style='width:288px;height:19px;' align='right'>
 <?php
 
 //only show the 'Change Module' if there are other modules installed or if there is an index to the main CORAL page
@@ -159,20 +160,39 @@
 		</ul>
 		<select name="lang" id="lang" class="dropDownLang">
            <?php
-            $fr="<option value='fr' selected='selected'>"._("French")."</option><option value='en'>"._("English")."</option>";
-            $en="<option value='fr'>"._("French")."</option><option value='en' selected='selected'>"._("English")."</option>";
-            if(isset($_COOKIE["lang"])){
-                if($_COOKIE["lang"]=='fr'){
-                    echo $fr;
-                }else{
-                    echo $en;
-                }
-            }else{
-                $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
-                if($defLang=='fr'){
-                    echo $fr;
+            // Get all translations on the 'locale' folder
+            $route='locale';
+            $lang[]="en_US"; // add default language
+            if (is_dir($route)) { 
+                if ($dh = opendir($route)) { 
+                    while (($file = readdir($dh)) !== false) {
+                        if (is_dir("$route/$file") && $file!="." && $file!=".."){
+                            $lang[]=$file;
+                        } 
+                    } 
+                    closedir($dh); 
+                } 
+            }else {
+                echo "<br>"._("Invalid translation route!"); 
+            }
+            // Get language of navigator
+            $defLang = str_replace('-','_',substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5));
+            
+            // Show an ordered list
+            sort($lang); 
+            for($i=0; $i<count($lang); $i++){
+                if(isset($_COOKIE["lang"])){
+                    if($_COOKIE["lang"]==$lang[$i]){
+                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getLanguage($lang[$i])."</option>";
+                    }else{
+                        echo "<option value='".$lang[$i]."'>".$lang_name->getLanguage($lang[$i])."</option>";
+                    }
                 }else{
-                    echo $en;
+                    if($defLang==$lang[$i]){
+                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getLanguage($lang[$i])."</option>";
+                    }else{
+                        echo "<option value='".$lang[$i]."'>".$lang_name->getLanguage($lang[$i])."</option>";
+                    }
                 }
             }
             ?>

From 10452481432e83244ce6ff976995362e42f0de86 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 13 May 2015 14:51:47 +0200
Subject: [PATCH 029/159] Corrected title in manual_upgrade_charset_utf8.sql

---
 install/manual_upgrade_charset_utf8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/manual_upgrade_charset_utf8.txt b/install/manual_upgrade_charset_utf8.txt
index c02f7f5..03293e6 100644
--- a/install/manual_upgrade_charset_utf8.txt
+++ b/install/manual_upgrade_charset_utf8.txt
@@ -1,4 +1,4 @@
-Manual how change charset in the database to utf8 from v1.3
+How to change the charset in the database to utf8 from v1.3
 
     -Open SQL file in /coral/resources/install/protected/update_latin1-to-utf8.sql and replace _DATABASE_NAME_ with your database schema name
     -Run SQL file

From 37fbb8442a42f6bae28d97ea67bf997372c43a05 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain@biblibre.com>
Date: Thu, 18 Jun 2015 18:36:01 +0200
Subject: [PATCH 030/159] Removing references to _DATABASE_NAME_ in the SQL

---
 install/protected/update_latin1-to-utf8.sql | 112 ++++++++++----------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/install/protected/update_latin1-to-utf8.sql b/install/protected/update_latin1-to-utf8.sql
index 5c69ebe..49d52c1 100644
--- a/install/protected/update_latin1-to-utf8.sql
+++ b/install/protected/update_latin1-to-utf8.sql
@@ -1,56 +1,56 @@
-ALTER DATABASE `_DATABASE_NAME_` CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AccessMethod` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AcquisitionType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AdministeringSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AlertDaysInAdvance` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AlertEmailAddress` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Alias` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AliasType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Attachment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AttachmentType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AuthenticationType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`AuthorizedSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`CatalogingType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`CatalogingStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Contact` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ContactRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ContactRoleProfile` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Currency` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ExternalLogin` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ExternalLoginType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`IsbnOrIssn` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`LicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`NoteType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`OrderType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Organization` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`OrganizationRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Privilege` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`PurchaseSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`RelationshipType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Resource` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceAdministeringSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceAlert` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceAuthorizedSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceFormat` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceLicenseLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceLicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceNote` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceOrganizationLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourcePayment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourcePurchaseSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceRelationship` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceStep` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Status` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Step` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`StorageLocation` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`User` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`UserGroup` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`UserGroupLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`UserLimit` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`Workflow` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`GeneralSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`DetailedSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`GeneralDetailSubjectLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`ResourceSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `_DATABASE_NAME_`.`CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file
+ALTER DATABASE CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AccessMethod` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AcquisitionType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AdministeringSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AlertDaysInAdvance` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AlertEmailAddress` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Alias` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AliasType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Attachment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AttachmentType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AuthenticationType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `AuthorizedSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `CatalogingType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `CatalogingStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Contact` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ContactRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ContactRoleProfile` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Currency` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ExternalLogin` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ExternalLoginType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `IsbnOrIssn` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `LicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `NoteType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `OrderType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Organization` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `OrganizationRole` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Privilege` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `PurchaseSite` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `RelationshipType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Resource` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceAdministeringSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceAlert` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceAuthorizedSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceFormat` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceLicenseLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceLicenseStatus` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceNote` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceOrganizationLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourcePayment` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourcePurchaseSiteLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceRelationship` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceStep` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Status` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Step` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `StorageLocation` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `User` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `UserGroup` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `UserGroupLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `UserLimit` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Workflow` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `GeneralSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `DetailedSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `GeneralDetailSubjectLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `ResourceSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;

From c3c00899ec4e756431578d1c6bfe40bb02e56f98 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 19 Jun 2015 11:01:59 +0200
Subject: [PATCH 031/159] Improving french translation

This patch only update the french translation files, by fixing mistakes (cesar is not french-native), and putting some consistency on the translation.
---
 locale/fr_FR/LC_MESSAGES/messages.mo | Bin 36122 -> 35024 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 561 +++++++++++++--------------
 2 files changed, 276 insertions(+), 285 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 2e805330b8047afd5e42c8d6beb13c3da6cd96fa..a5c5440b5b81985c2fdb5b385d51bd3c6a4c93e1 100644
GIT binary patch
literal 35024
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
U-qeHrtG+N&R}9GF$vV{k17*gg3jhEB

literal 36122
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

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index aadcd09..66ac52b 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -2,19 +2,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "POT-Creation-Date: 2015-05-13 10:56+0100\n"
-"PO-Revision-Date: 2015-05-13 10:57+0100\n"
-"Last-Translator: Cesar <hernandez.antonio.cesar19@gmail.com>\n"
+"PO-Revision-Date: 2015-06-19 10:57+0100\n"
+"Last-Translator: Paul Poulain <paul.poulain@biblibre.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Poedit-Basepath: /var/www/Coral/resources\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
+"X-Poedit-SearchPath-0: .\n"
 
 #: LangCodes.php:9
 msgid "French, FR"
@@ -55,7 +55,7 @@ msgstr "Mèthode d'accès"
 
 #: admin.php:54
 msgid "Account Type"
-msgstr "Type d'account"
+msgstr "Type de compte"
 
 #: admin.php:55 ajax_forms/getNewResourceForm.php:176
 #: ajax_htmldata/getAdminWorkflowDisplay.php:16
@@ -67,7 +67,7 @@ msgstr "Type d'acquisition"
 
 #: admin.php:56 index.php:466
 msgid "Administering Site"
-msgstr "Administration du site"
+msgstr "Site d'administration"
 
 #: admin.php:58 ajax_htmldata/getAdminAlertDisplay.php:10
 msgid "Alert Settings"
@@ -91,7 +91,7 @@ msgstr "Site autorisé"
 
 #: admin.php:64 index.php:526
 msgid "Cataloging Status"
-msgstr "Statut de catalogue "
+msgstr "Statut de catalogage"
 
 #: admin.php:65
 msgid "CatalogingType"
@@ -99,15 +99,15 @@ msgstr "Type de catalogage"
 
 #: admin.php:66
 msgid "Contact Role"
-msgstr "Contact Rôle"
+msgstr "Rôle"
 
 #: admin.php:68 ajax_forms/getCostForm.php:70
 msgid "Cost Details"
-msgstr "Détails de coût"
+msgstr "Détails du coût"
 
 #: admin.php:70 ajax_htmldata/getAdminCurrencyDisplay.php:8
 msgid "Currency"
-msgstr "Concurrence"
+msgstr "Devise"
 
 #: admin.php:71
 msgid "License Status"
@@ -119,7 +119,7 @@ msgstr "Type de note"
 
 #: admin.php:73
 msgid "Order Type"
-msgstr "Type d'ordre"
+msgstr "Type de commande"
 
 #: admin.php:81
 msgid "Organization Role"
@@ -127,11 +127,11 @@ msgstr "Rôle dans l'organisation"
 
 #: admin.php:82
 msgid "Organizations"
-msgstr "Organisation"
+msgstr "Organisations"
 
 #: admin.php:86
 msgid "Purchasing Site"
-msgstr "Site d'achat"
+msgstr "Site d'acquisition"
 
 #: admin.php:87 ajax_htmldata/getAdminWorkflowDisplay.php:17 index.php:186
 msgid "Resource Format"
@@ -152,7 +152,7 @@ msgstr "Sujets"
 
 #: admin.php:91
 msgid "User Limit"
-msgstr "Limit d'utilisateurs"
+msgstr "Limite utilisateurs"
 
 #: admin.php:96 queue.php:59
 msgid "Loading..."
@@ -160,7 +160,7 @@ msgstr "Chargement..."
 
 #: admin.php:119
 msgid "You do not have permissions to access this screen."
-msgstr "Vous n'avez pas la permission d'accéder dans cette page."
+msgstr "Vous n'avez pas la permission d'accéder à cette page."
 
 #: admin/classes/common/DBService.php:39
 msgid "There was a problem with the database: "
@@ -168,15 +168,15 @@ msgstr "Il y avait un problème avec la base de données: "
 
 #: admin/classes/common/LdapPerson.php:34
 msgid "Could not connect to "
-msgstr "Ne pouvait pas se connecter à "
+msgstr "N'a pas pu se connecter à "
 
 #: admin/classes/common/Object.php:63 admin/classes/common/Object.php:72
 msgid "Cannot set value for undefined key ("
-msgstr "Ne peut pas asigner une clé indefini ("
+msgstr "Ne peut pas assigner une clé indefinie ("
 
 #: admin/classes/common/Utility.php:121
 msgid "Error: unexpected fgets() fail"
-msgstr "Erreur: inattendu échoue fgets()"
+msgstr "Erreur: inattendu fgets() échoue"
 
 #: admin/classes/common/Utility.php:133
 msgid "Edit DDW facet/term selections at: "
@@ -192,7 +192,7 @@ msgstr "Action "
 
 #: ajax_forms.php:25 ajax_htmldata.php:27 ajax_processing.php:27
 msgid " not set up!"
-msgstr " ne pas etabli!"
+msgstr "Non défini!"
 
 #: ajax_forms/getAccessForm.php:59
 msgid "Edit Access"
@@ -200,7 +200,7 @@ msgstr "Modifier l'accès"
 
 #: ajax_forms/getAccessForm.php:68
 msgid "Access"
-msgstr "Acèss"
+msgstr "Accès"
 
 #: ajax_forms/getAccessForm.php:75 ajax_htmldata/getAccessDetails.php:57
 #: summary.php:633
@@ -214,7 +214,7 @@ msgstr "Nom d'utilisateur:"
 #: ajax_forms/getAccessForm.php:94 ajax_htmldata/getAccessDetails.php:102
 #: summary.php:670
 msgid "Access Method:"
-msgstr "Mèthode d'accès:"
+msgstr "Méthode d'accès:"
 
 #: ajax_forms/getAccessForm.php:109 ajax_forms/getAccountForm.php:65
 #: ajax_htmldata/getAccountDetails.php:80
@@ -229,11 +229,11 @@ msgstr "Lieu de stockage:"
 #: ajax_forms/getAccessForm.php:128 ajax_htmldata/getAccessDetails.php:72
 #: summary.php:647
 msgid "Simultaneous User Limit:"
-msgstr "Limite d'utilisateurs similtanées"
+msgstr "Limite d'utilisateurs similtanés:"
 
 #: ajax_forms/getAccessForm.php:145 ajax_htmldata/getAccessDetails.php:95
 msgid "Coverage:"
-msgstr "Coverture:"
+msgstr "Couverture:"
 
 #: ajax_forms/getAccessForm.php:163
 msgid "Authorized Site(s)"
@@ -241,7 +241,7 @@ msgstr "Site(s) autorisé(s)"
 
 #: ajax_forms/getAccessForm.php:208
 msgid "Administering Site(s)"
-msgstr "Administration du site(s)"
+msgstr "Administration site"
 
 #: ajax_forms/getAccessForm.php:251 ajax_forms/getAccountForm.php:86
 #: ajax_forms/getAdminAlertDaysForm.php:34
@@ -259,7 +259,7 @@ msgstr "Administration du site(s)"
 #: ajax_forms/getNoteForm.php:61 ajax_forms/getOrderForm.php:160
 #: ajax_forms/getUpdateProductForm.php:423 resources/cataloging_edit.php:102
 msgid "submit"
-msgstr "Confirmer"
+msgstr "soumettre"
 
 #: ajax_forms/getAccessForm.php:252 ajax_forms/getAccountForm.php:87
 #: ajax_forms/getAdminAlertDaysForm.php:35
@@ -278,15 +278,15 @@ msgstr "Confirmer"
 #: ajax_forms/getResourceSubjectForm.php:49
 #: ajax_forms/getUpdateProductForm.php:424 resources/cataloging_edit.php:103
 msgid "cancel"
-msgstr "Annuler"
+msgstr "annuler"
 
 #: ajax_forms/getAccountForm.php:17
 msgid "Edit Account"
-msgstr "Modifier la compte"
+msgstr "Modifier compte"
 
 #: ajax_forms/getAccountForm.php:17
 msgid "Add Account"
-msgstr "Ajouter une compte"
+msgstr "Ajouter compte"
 
 #: ajax_forms/getAccountForm.php:27
 msgid "Login Type:"
@@ -309,27 +309,27 @@ msgstr "Notes:"
 
 #: ajax_forms/getAdminAlertDaysForm.php:14
 msgid "Edit Alert Days In Advance"
-msgstr "Modifier l'alerte jours à l'avance"
+msgstr "Modifier l'alerte à l'avance"
 
 #: ajax_forms/getAdminAlertDaysForm.php:14
 msgid "Add Alert Days In Advance"
-msgstr "Ajouter alerte jours à l'avance"
+msgstr "Ajouter alerte à l'avance"
 
 #: ajax_forms/getAdminAlertEmailForm.php:14
 msgid "Edit Alert Email Address"
-msgstr "Modifier l'alerte d'adresse email"
+msgstr "Modifier l'adresse email d'alerte"
 
 #: ajax_forms/getAdminAlertEmailForm.php:14
 msgid "Add Alert Email Address"
-msgstr "Ajouter alerte d'adresse email"
+msgstr "Ajouter adresse email d'alerte"
 
 #: ajax_forms/getAdminCurrencyUpdateForm.php:14
 msgid "Edit Currency"
-msgstr "Modifier la Concurrence"
+msgstr "Modifier la devise"
 
 #: ajax_forms/getAdminCurrencyUpdateForm.php:14
 msgid "Add Currency"
-msgstr "Ajouter Concurrence"
+msgstr "Ajouter la devise"
 
 #: ajax_forms/getAdminCurrencyUpdateForm.php:24
 #: ajax_htmldata/getAdminCurrencyDisplay.php:14
@@ -358,7 +358,7 @@ msgstr "Ajouter"
 
 #: ajax_forms/getAdminUpdateForm.php:31
 msgid "Show stats button?"
-msgstr "Montrer les boutons de statistiques?"
+msgstr "Montrer le bouton de statistiques?"
 
 #: ajax_forms/getAdminUserGroupForm.php:17
 msgid "Edit User Group"
@@ -366,7 +366,7 @@ msgstr "Modifier le groupe d'utilisateur"
 
 #: ajax_forms/getAdminUserGroupForm.php:17
 msgid "Add User Group"
-msgstr "Ajouter une groupe d'utilisateur"
+msgstr "Ajouter un groupe d'utilisateur"
 
 #: ajax_forms/getAdminUserGroupForm.php:26
 msgid "User Group"
@@ -382,11 +382,11 @@ msgstr "Adresse email"
 
 #: ajax_forms/getAdminUserGroupForm.php:58
 msgid "Assigned Users"
-msgstr "Utilisateurs asignés"
+msgstr "Utilisateurs assignés"
 
 #: ajax_forms/getAdminUserGroupForm.php:82
 msgid "add user"
-msgstr "Ajouter un utilisateur"
+msgstr "Ajouter utilisateur"
 
 #: ajax_forms/getAdminUserGroupForm.php:121
 #: js/forms/generalDetailSubjectForm.js:135 js/forms/userGroupForm.js:117
@@ -395,11 +395,11 @@ msgstr "Supprimer un utilisateur du groupe"
 
 #: ajax_forms/getAdminUserUpdateForm.php:21
 msgid "Edit User"
-msgstr "Modifier l'utilisateur"
+msgstr "Modifier utilisateur"
 
 #: ajax_forms/getAdminUserUpdateForm.php:21
 msgid "Add New User"
-msgstr "Ajouter un nouveau utilisateur"
+msgstr "Ajouter utilisateur"
 
 #: ajax_forms/getAdminUserUpdateForm.php:32
 #: ajax_htmldata/getAdminUserDisplay.php:22
@@ -409,7 +409,7 @@ msgstr "Identifiant de connexion"
 #: ajax_forms/getAdminUserUpdateForm.php:33
 #: ajax_htmldata/getAdminUserDisplay.php:23
 msgid "First Name"
-msgstr "Prènom"
+msgstr "Prénom"
 
 #: ajax_forms/getAdminUserUpdateForm.php:34
 #: ajax_htmldata/getAdminUserDisplay.php:24
@@ -431,11 +431,11 @@ msgstr "Privilège"
 #: ajax_forms/getAdminUserUpdateForm.php:54
 #: ajax_htmldata/getAdminUserDisplay.php:26
 msgid "View Accounts"
-msgstr "Montrer les comptes"
+msgstr "Voir comptes"
 
 #: ajax_forms/getAdminWorkflowForm.php:42
 msgid "Edit Workflow"
-msgstr "Modifier le workflow"
+msgstr "Modifier workflow"
 
 #: ajax_forms/getAdminWorkflowForm.php:51
 msgid "Resource Entry Requirements"
@@ -469,24 +469,24 @@ msgstr "Nom:"
 
 #: ajax_forms/getAdminWorkflowForm.php:124
 msgid "Approval/Notification Group:"
-msgstr "Approbation/Notification de Groupe"
+msgstr "Approbation/Notification de groupe"
 
 #: ajax_forms/getAdminWorkflowForm.php:125
 msgid "Parent Step"
-msgstr "Parent étape"
+msgstr "Étape parent"
 
 #: ajax_forms/getAdminWorkflowForm.php:155
 msgid "add step"
-msgstr "Ajouter une étape"
+msgstr "Ajouter étape"
 
 #: ajax_forms/getAdminWorkflowForm.php:238 js/forms/workflowForm.js:201
 #: js/forms/workflowForm.js:202
 msgid "remove this step"
-msgstr "Effacer cet étape"
+msgstr "Effacer étape"
 
 #: ajax_forms/getAttachmentForm.php:16
 msgid "Edit Attachment"
-msgstr "Modifier la pièce jointe"
+msgstr "Modifier pièce jointe"
 
 #: ajax_forms/getAttachmentForm.php:16
 msgid "Add Attachment"
@@ -498,7 +498,7 @@ msgstr "Fichier:"
 
 #: ajax_forms/getAttachmentForm.php:61
 msgid "replace with new file"
-msgstr "remplacer avec un nouveau fichier"
+msgstr "remplacer par un nouveau fichier"
 
 #: ajax_forms/getAttachmentForm.php:76
 #: ajax_htmldata/getAttachmentDetails.php:55
@@ -507,11 +507,11 @@ msgstr "Détails:"
 
 #: ajax_forms/getContactForm.php:30
 msgid "Edit Contact"
-msgstr "Modifier le contact"
+msgstr "Modifier contact"
 
 #: ajax_forms/getContactForm.php:30
 msgid "Add Contact"
-msgstr "Ajouter un contact"
+msgstr "Ajouter contact"
 
 #: ajax_forms/getContactForm.php:50 ajax_htmldata/getContactDetails.php:100
 msgid "Title:"
@@ -544,16 +544,16 @@ msgstr "Archivé:"
 
 #: ajax_forms/getContactForm.php:102
 msgid "Role(s):"
-msgstr "Rôle(s)"
+msgstr "Rôle(s):"
 
 #: ajax_forms/getCostForm.php:48
 msgid "Edit Cost Information"
-msgstr "Modifier l'information de coût"
+msgstr "Modifier information de coût"
 
 #: ajax_forms/getCostForm.php:55 ajax_htmldata/getAcquisitionsDetails.php:169
 #: summary.php:485
 msgid "Cost History"
-msgstr "Historie de coût"
+msgstr "Historique de coût"
 
 #: ajax_forms/getCostForm.php:62 ajax_htmldata/getAcquisitionsDetails.php:178
 msgid "Year"
@@ -590,21 +590,21 @@ msgstr "Facture"
 
 #: ajax_forms/getCostForm.php:138
 msgid "add this payment"
-msgstr "Ajouter ce paiement"
+msgstr "Ajouter paiement"
 
 #: ajax_forms/getCostForm.php:138
 msgid "add payment"
-msgstr "Ajouter un paiement"
+msgstr "Ajouter paiement"
 
 #: ajax_forms/getCostForm.php:222 js/forms/acquisitionsForm.js:147
 #: js/forms/acquisitionsForm.js:148 js/forms/costForm.js:132
 #: js/forms/costForm.js:133
 msgid "remove this payment"
-msgstr "Effacer ce paiement"
+msgstr "Supprimer paiement"
 
 #: ajax_forms/getGeneralDetailSubjectForm.php:18
 msgid "Add / Edit Subject Relationships"
-msgstr "Ajouter / Modifier la relation des sujets"
+msgstr "Ajouter / Modifier liens sujets"
 
 #: ajax_forms/getGeneralDetailSubjectForm.php:27
 #: ajax_htmldata/getAdminSubjectDisplay.php:98 index.php:251
@@ -621,7 +621,7 @@ msgstr "Ajouter sujet détaillé"
 
 #: ajax_forms/getGeneralDetailSubjectForm.php:105
 msgid "remove detailed subject"
-msgstr "Supprimer le sujet détaillé"
+msgstr "Supprimer sujet détaillé"
 
 #: ajax_forms/getGeneralDetailSubjectForm.php:107
 #: ajax_htmldata/getAdminSubjectDisplay.php:30
@@ -631,19 +631,19 @@ msgstr "Sujet en utilisation"
 
 #: ajax_forms/getLicenseForm.php:50
 msgid "Edit Licenses"
-msgstr "Modifier les licences"
+msgstr "Modifier licences"
 
 #: ajax_forms/getLicenseForm.php:60
 msgid "License Records"
-msgstr "Licences entregistrées"
+msgstr "Fiches licence"
 
 #: ajax_forms/getLicenseForm.php:76
 msgid "add license"
-msgstr "Ajouter une licence"
+msgstr "Ajouter licence"
 
 #: ajax_forms/getLicenseForm.php:103
 msgid "remove license link"
-msgstr "Supprimer le lien de la licence"
+msgstr "Supprimer lien de la licence"
 
 #: ajax_forms/getLicenseForm.php:103 ajax_forms/getUpdateProductForm.php:300
 msgid "remove "
@@ -651,7 +651,7 @@ msgstr "Supprimer "
 
 #: ajax_forms/getLicenseForm.php:103
 msgid " license"
-msgstr " licence"
+msgstr "licence"
 
 #: ajax_forms/getLicenseForm.php:128
 msgid "Licensing Status"
@@ -665,7 +665,7 @@ msgstr "Statut:"
 
 #: ajax_forms/getLicenseForm.php:160
 msgid "History:"
-msgstr "Historie:"
+msgstr "Historique:"
 
 #: ajax_forms/getLicenseForm.php:166 ajax_htmldata/getAccessDetails.php:173
 #: ajax_htmldata/getAcquisitionsDetails.php:276
@@ -693,11 +693,11 @@ msgstr "L'information de statut de la licence n'est pas disponible."
 
 #: ajax_forms/getNewResourceForm.php:84
 msgid "Edit Saved Resource"
-msgstr "Modifier ressource enregistré"
+msgstr "Modifier ressource enregistrée"
 
 #: ajax_forms/getNewResourceForm.php:84
 msgid "Add New Resource"
-msgstr "Ajouter un nouveau ressource"
+msgstr "Ajouter ressource"
 
 #: ajax_forms/getNewResourceForm.php:85
 msgid "required fields"
@@ -734,19 +734,19 @@ msgstr "Notes"
 
 #: ajax_forms/getNewResourceForm.php:278
 msgid "Include any additional information"
-msgstr "Inclure quelque information supplémentaire"
+msgstr "Inclure information supplémentaire"
 
 #: ajax_forms/getNewResourceForm.php:294
 msgid "save"
-msgstr "Enregistrer"
+msgstr "enregistrer"
 
 #: ajax_forms/getNoteForm.php:18
 msgid "Edit Note"
-msgstr "Modifier une note"
+msgstr "Modifier note"
 
 #: ajax_forms/getNoteForm.php:18
 msgid "Add Note"
-msgstr "Ajouter une note"
+msgstr "Ajouter note"
 
 #: ajax_forms/getNoteForm.php:28
 msgid "Note Type:"
@@ -754,22 +754,22 @@ msgstr "Type de note:"
 
 #: ajax_forms/getOrderForm.php:33
 msgid "Edit Acquisitions Information"
-msgstr "Modifier l'information des acquisitions"
+msgstr "Modifier information d'acquisition"
 
 #: ajax_forms/getOrderForm.php:40 ajax_htmldata/getAcquisitionsDetails.php:98
 #: summary.php:422
 msgid "Order"
-msgstr "Ordre"
+msgstr "Commande"
 
 #: ajax_forms/getOrderForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:115
 #: summary.php:436
 msgid "Order Number:"
-msgstr "Numero d'ordre:"
+msgstr "Numéro de commande:"
 
 #: ajax_forms/getOrderForm.php:69 ajax_htmldata/getAcquisitionsDetails.php:122
 #: summary.php:443
 msgid "System Number:"
-msgstr "Nombre de système:"
+msgstr "Numéro système:"
 
 #: ajax_forms/getOrderForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:143
 #: summary.php:466
@@ -790,7 +790,7 @@ msgstr "Site d'achat(s)"
 
 #: ajax_forms/getResourceSubjectForm.php:7
 msgid "Add General / Detail Subject Link"
-msgstr "Ajouter général / détail lien du sujet"
+msgstr "Ajouter lien sujet général / détaillé"
 
 #: ajax_forms/getResourceSubjectForm.php:14
 msgid "General Subject Name"
@@ -821,7 +821,7 @@ msgstr "(non trouvé)"
 
 #: ajax_forms/getUpdateProductForm.php:72
 msgid "Edit Resource"
-msgstr "Modifier la ressource"
+msgstr "Modifier ressource"
 
 #: ajax_forms/getUpdateProductForm.php:118
 msgid "Parents:"
@@ -829,15 +829,15 @@ msgstr "Parents:"
 
 #: ajax_forms/getUpdateProductForm.php:124
 msgid "add Parent resource"
-msgstr "Ajouter un ressource père"
+msgstr "Ajouter ressource père"
 
 #: ajax_forms/getUpdateProductForm.php:124
 msgid "add Parent Resource"
-msgstr "Ajouter un ressource père"
+msgstr "Ajouter ressource père"
 
 #: ajax_forms/getUpdateProductForm.php:137 js/forms/resourceUpdateForm.js:286
 msgid "remove parent"
-msgstr "Enlever ce parent"
+msgstr "Enlever parent"
 
 #: ajax_forms/getUpdateProductForm.php:148
 #: ajax_htmldata/getProductDetails.php:197 summary.php:292
@@ -846,7 +846,7 @@ msgstr "ISSN / ISBN:"
 
 #: ajax_forms/getUpdateProductForm.php:152
 msgid "add Isbn"
-msgstr "Ajouter un ISBN"
+msgstr "Ajouter ISBN"
 
 #: ajax_forms/getUpdateProductForm.php:237
 msgid "Role:"
@@ -859,11 +859,11 @@ msgstr "Organisation:"
 
 #: ajax_forms/getUpdateProductForm.php:260
 msgid "add organization"
-msgstr "Ajouter une organisation"
+msgstr "Ajouter organisation"
 
 #: ajax_forms/getUpdateProductForm.php:300
 msgid "remove organization"
-msgstr "Supprimer une organisation"
+msgstr "Supprimer organisation"
 
 #: ajax_forms/getUpdateProductForm.php:300
 msgid "organization"
@@ -871,7 +871,7 @@ msgstr "organisation"
 
 #: ajax_forms/getUpdateProductForm.php:322
 msgid "Aliases"
-msgstr "Des alias:"
+msgstr "Alias"
 
 #: ajax_forms/getUpdateProductForm.php:331
 msgid "Alias:"
@@ -879,7 +879,7 @@ msgstr "Alias:"
 
 #: ajax_forms/getUpdateProductForm.php:353
 msgid "add this alias"
-msgstr "Ajouter cet alias"
+msgstr "Ajouter alias"
 
 #: ajax_forms/getUpdateProductForm.php:353
 msgid "add alias"
@@ -888,7 +888,7 @@ msgstr "Ajouter alias"
 #: ajax_forms/getUpdateProductForm.php:394 js/forms/resourceUpdateForm.js:232
 #: js/forms/resourceUpdateForm.js:233
 msgid "remove this alias"
-msgstr "Effacer cet alias"
+msgstr "Supprimer alias"
 
 #: ajax_htmldata.php:27
 msgid "Data action "
@@ -926,11 +926,11 @@ msgstr "Modifier"
 #: ajax_htmldata/getAcquisitionsDetails.php:264
 #: ajax_htmldata/getProductDetails.php:69
 msgid "edit resource"
-msgstr "Modifier la ressource"
+msgstr "Modifier ressource"
 
 #: ajax_htmldata/getAccessDetails.php:43 summary.php:626
 msgid "Administering Sites:"
-msgstr "Administration des sites:"
+msgstr "Administration sites:"
 
 #: ajax_htmldata/getAccessDetails.php:50 summary.php:458
 msgid "Authorized Sites:"
@@ -950,13 +950,13 @@ msgstr "Pas d'information d'accès disponible"
 
 #: ajax_htmldata/getAccessDetails.php:116
 msgid "edit access information"
-msgstr "Modifier l'accès à l'information"
+msgstr "Modifier information d'accès"
 
 #: ajax_htmldata/getAccessDetails.php:159
 #: ajax_htmldata/getAcquisitionsDetails.php:356
 #: ajax_htmldata/getProductDetails.php:408 resources/cataloging.php:209
 msgid "Additional Notes"
-msgstr "Notes additionales"
+msgstr "Notes additionnelles"
 
 #: ajax_htmldata/getAccessDetails.php:162
 #: ajax_htmldata/getAccessDetails.php:181
@@ -966,20 +966,20 @@ msgstr "Notes additionales"
 #: ajax_htmldata/getProductDetails.php:430 resources/cataloging.php:212
 #: resources/cataloging.php:231
 msgid "add new note"
-msgstr "Ajouter une note"
+msgstr "Ajouter note"
 
 #: ajax_htmldata/getAccessDetails.php:170
 #: ajax_htmldata/getAcquisitionsDetails.php:367
 #: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
 msgid "edit note"
-msgstr "Modifier une note"
+msgstr "Modifier note"
 
 #: ajax_htmldata/getAccessDetails.php:170
 #: ajax_htmldata/getAcquisitionsDetails.php:367
 #: ajax_htmldata/getContactDetails.php:69
 #: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
 msgid "remove note"
-msgstr "effacer une note"
+msgstr "Supprimer note"
 
 #: ajax_htmldata/getAccountDetails.php:14
 #: ajax_htmldata/getContactDetails.php:35
@@ -993,7 +993,7 @@ msgstr "Il n'y a pas une ressource spécifié par les comptes"
 #: ajax_htmldata/getAccountDetails.php:22
 #: ajax_htmldata/getAccountDetails.php:119
 msgid "add new account"
-msgstr "Ajouter une nouvelle compte"
+msgstr "Ajouter compte"
 
 #: ajax_htmldata/getAccountDetails.php:27
 #: ajax_htmldata/getContactDetails.php:48
@@ -1002,15 +1002,15 @@ msgstr "Hérité:"
 
 #: ajax_htmldata/getAccountDetails.php:44
 msgid "edit account"
-msgstr "Modifier la compte"
+msgstr "Modifier compte"
 
 #: ajax_htmldata/getAccountDetails.php:44
 msgid "remove account"
-msgstr "Supprimer une compte"
+msgstr "Supprimer compte"
 
 #: ajax_htmldata/getAccountDetails.php:57
 msgid "Visit Account in Organizations Module"
-msgstr "Visitez Comptes sur le module Organisations"
+msgstr "Visitez les comptes dans le module Organisations"
 
 #: ajax_htmldata/getAccountDetails.php:65
 msgid "Visit Login URL"
@@ -1027,20 +1027,20 @@ msgstr "Dernière mise à jour:"
 
 #: ajax_htmldata/getAccountDetails.php:114
 msgid "No accounts available"
-msgstr "Pas des comptes disponibles"
+msgstr "Pas de compte disponible"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:100
 #: ajax_htmldata/getAcquisitionsDetails.php:159 resources/cataloging.php:106
 msgid "edit order information"
-msgstr "Modifier l'information de l'ordre "
+msgstr "Modifier information de commande"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:127
 msgid "catalog view"
-msgstr "Vue du Catalogue"
+msgstr "Vue du catalogue"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:136
 msgid "Purchasing Sites:"
-msgstr "Site d'achats:"
+msgstr "Site d'acquisition:"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:152 summary.php:475
 msgid "Expiration Alert Enabled"
@@ -1049,7 +1049,7 @@ msgstr "Alerte d'expiration activé"
 #: ajax_htmldata/getAcquisitionsDetails.php:171
 #: ajax_htmldata/getAcquisitionsDetails.php:253
 msgid "edit cost history"
-msgstr "Modifier l'historie de coût"
+msgstr "Modifier historique de coût"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:189
 msgid "Details"
@@ -1057,7 +1057,7 @@ msgstr "Détails"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:247
 msgid "No payment information available"
-msgstr "L'information du paiement n'est pas disponible."
+msgstr "L'information du paiement n'est pas disponible"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:262 summary.php:511
 msgid "License"
@@ -1073,19 +1073,19 @@ msgstr "Licences:"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:295
 msgid "View License"
-msgstr "Regarder la licence"
+msgstr "Voir licence"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:298 summary.php:542
 msgid "No associated licenses available."
-msgstr "Pas des licences associées disponibles."
+msgstr "Pas de licence associée."
 
 #: ajax_htmldata/getAcquisitionsDetails.php:312
 msgid "edit license and status"
-msgstr "Modifier la licence et le statut"
+msgstr "Modifier licence et statut"
 
 #: ajax_htmldata/getAcquisitionsDetails.php:314
 msgid "edit license status"
-msgstr "Modifier le statut de la licence"
+msgstr "Modifier statut de licence"
 
 #: ajax_htmldata/getAdminAlertDisplay.php:26
 #: ajax_htmldata/getAdminAlertDisplay.php:56
@@ -1098,15 +1098,15 @@ msgstr "Modifier le statut de la licence"
 #: ajax_htmldata/getAdminWorkflowDisplay.php:91
 #: ajax_htmldata/getGeneralSubjectDisplay.php:26
 msgid "remove"
-msgstr "Supprimer"
+msgstr "supprimer"
 
 #: ajax_htmldata/getAdminAlertDisplay.php:38
 msgid "add email address"
-msgstr "Ajouter une nouvelle adresse email"
+msgstr "Ajouter adresse email"
 
 #: ajax_htmldata/getAdminAlertDisplay.php:46
 msgid "Days in advance of expiration"
-msgstr "Jours à l'avance de expiration"
+msgstr "Jours avant expiration"
 
 #: ajax_htmldata/getAdminAlertDisplay.php:71
 msgid "add days"
@@ -1114,7 +1114,7 @@ msgstr "Ajouter jours"
 
 #: ajax_htmldata/getAdminCurrencyDisplay.php:38
 msgid "add new currency"
-msgstr "Ajouter une nouvelle concurrence"
+msgstr "Ajouter devise"
 
 #: ajax_htmldata/getAdminDisplay.php:16
 #: ajax_htmldata/getAdminSubjectDisplay.php:57
@@ -1127,7 +1127,7 @@ msgstr "Valeur"
 #: ajax_htmldata/getAdminSubjectDisplay.php:84
 #: ajax_htmldata/getGeneralSubjectDisplay.php:38
 msgid "add new "
-msgstr "Ajouter un nouveau  "
+msgstr "Ajouter  "
 
 #: ajax_htmldata/getAdminSubjectDisplay.php:51
 #: ajax_htmldata/getAdminSubjectDisplay.php:99 index.php:282
@@ -1140,12 +1140,12 @@ msgstr "Relation des sujets"
 
 #: ajax_htmldata/getAdminUserDisplay.php:47
 msgid "edit user"
-msgstr "Modifier l'utilisateur"
+msgstr "Modifier utilisateur"
 
 #: ajax_htmldata/getAdminUserDisplay.php:54
 #: ajax_htmldata/getAdminUserDisplay.php:58
 msgid "add new user"
-msgstr "Ajouter un nouveau utilisateur"
+msgstr "Ajouter utilisateur"
 
 #: ajax_htmldata/getAdminWorkflowDisplay.php:10
 msgid "Workflow Setup"
@@ -1157,9 +1157,7 @@ msgstr "Ajouter workflow"
 
 #: ajax_htmldata/getAdminWorkflowDisplay.php:56
 msgid "You must set up at least one user group before you can add workflows"
-msgstr ""
-"Vous devez configurer au moins une groupe, après vous pouvez ajouter "
-"workflows"
+msgstr "Vous devez configurer au moins un groupe avant d'ajouter des workflows"
 
 #: ajax_htmldata/getAdminWorkflowDisplay.php:66
 msgid "User Group Setup"
@@ -1183,41 +1181,41 @@ msgstr "Modifier la pièce jointe"
 
 #: ajax_htmldata/getAttachmentDetails.php:35
 msgid "remove this attachment"
-msgstr "Supprimer cette pièce jointe"
+msgstr "Supprimer pièce jointe"
 
 #: ajax_htmldata/getAttachmentDetails.php:67
 msgid "No attachments available"
-msgstr "Pas des pièces jointes disponibles."
+msgstr "Pas de pièce jointe disponible."
 
 #: ajax_htmldata/getAttachmentDetails.php:72
 msgid "add new attachment"
-msgstr "Ajouter une nouvelle pièce jointe"
+msgstr "Ajouter pièce jointe"
 
 #: ajax_htmldata/getContactDetails.php:23
 msgid "The following are archived contacts:"
-msgstr "Les suivantes contacts sont archivées: "
+msgstr "Les contacts suivants sont archivés: "
 
 #: ajax_htmldata/getContactDetails.php:39
 msgid "No Resource Specific Contacts"
-msgstr "Il n'y a pas une ressource spécifique par les contacts"
+msgstr "Pas de ressource spécifique  pour ce contact"
 
 #: ajax_htmldata/getContactDetails.php:43
 #: ajax_htmldata/getContactDetails.php:187
 #: ajax_htmldata/getContactDetails.php:197
 msgid "add contact"
-msgstr "Ajouter un contact"
+msgstr "Ajouter contact"
 
 #: ajax_htmldata/getContactDetails.php:68
 msgid "edit contact"
-msgstr "Modifier le contact"
+msgstr "Modifier contact"
 
 #: ajax_htmldata/getContactDetails.php:69
 msgid "remove contact"
-msgstr "Supprimer le contact"
+msgstr "Supprimer contact"
 
 #: ajax_htmldata/getContactDetails.php:84
 msgid "Visit Contact in Organizations Module"
-msgstr "Visitez contact dans le module Organisations"
+msgstr "Voir contact dans le module Organisations"
 
 #: ajax_htmldata/getContactDetails.php:92
 msgid "No longer valid:"
@@ -1225,31 +1223,31 @@ msgstr "N'est plus valide:"
 
 #: ajax_htmldata/getContactDetails.php:116
 msgid "Location:"
-msgstr "Emplacement:"
+msgstr "Localisation:"
 
 #: ajax_htmldata/getContactDetails.php:195
 msgid "No contacts available"
-msgstr "Pas de contacts disponibles"
+msgstr "Pas de contact disponible"
 
 #: ajax_htmldata/getContactDetails.php:205
 msgid " archived contact(s) available."
-msgstr " contact(s) archivée(s) disponible(s)."
+msgstr " contact(s) archivé(s) disponible(s)."
 
 #: ajax_htmldata/getContactDetails.php:205
 msgid "show archived contacts"
-msgstr "Montrer les contacts archivées"
+msgstr "montrer les contacts archivés"
 
 #: ajax_htmldata/getContactDetails.php:209
 msgid "hide archived contacts"
-msgstr "Cacher les contacts archivées"
+msgstr "Cacher les contacts archivés"
 
 #: ajax_htmldata/getOutstandingQueue.php:7 queue.php:51
 msgid "Outstanding Tasks"
-msgstr "Tâches en suspens"
+msgstr "Tâches en attente"
 
 #: ajax_htmldata/getOutstandingQueue.php:12
 msgid "No outstanding requests"
-msgstr "Pas des requêtes en suspens"
+msgstr "Pas de requête en attente"
 
 #: ajax_htmldata/getOutstandingQueue.php:19 ajax_htmldata/getSavedQueue.php:17
 #: ajax_htmldata/getSearchResources.php:112
@@ -1259,7 +1257,7 @@ msgstr "Identifiant"
 
 #: ajax_htmldata/getOutstandingQueue.php:22 index.php:553
 msgid "Routing Step"
-msgstr "Etape de routage"
+msgstr "Étape de routage"
 
 #: ajax_htmldata/getOutstandingQueue.php:23
 #: ajax_htmldata/getRoutingDetails.php:23
@@ -1268,15 +1266,15 @@ msgstr "Date de début"
 
 #: ajax_htmldata/getProductDetails.php:69
 msgid "remove resource"
-msgstr "Supprimer la ressource"
+msgstr "Supprimer ressource"
 
 #: ajax_htmldata/getProductDetails.php:69
 msgid "remove resource and its children"
-msgstr "Supprimer ce ressource et ses fils"
+msgstr "Supprimer ressource et ses fils"
 
 #: ajax_htmldata/getProductDetails.php:75 summary.php:206
 msgid "Record ID:"
-msgstr "ID d'enregistrement:"
+msgstr "Identifiant:"
 
 #: ajax_htmldata/getProductDetails.php:115 summary.php:218
 msgid "Created:"
@@ -1288,22 +1286,22 @@ msgstr "Dernière mise à jour:"
 
 #: ajax_htmldata/getProductDetails.php:165 summary.php:269
 msgid "Related Products:"
-msgstr "Produits liées:"
+msgstr "Produits liés:"
 
 #: ajax_htmldata/getProductDetails.php:173
 #: ajax_htmldata/getProductDetails.php:181
 msgid "view resource"
-msgstr "Regarder la ressource"
+msgstr "voir ressource"
 
 #: ajax_htmldata/getProductDetails.php:173
 #: ajax_htmldata/getProductDetails.php:181
 #: ajax_htmldata/getProductDetails.php:235
 msgid "View "
-msgstr "Regarder "
+msgstr "Voir "
 
 #: ajax_htmldata/getProductDetails.php:211 summary.php:301
 msgid "Aliases:"
-msgstr "Aliases:"
+msgstr "Alias:"
 
 #: ajax_htmldata/getProductDetails.php:228 summary.php:318
 msgid "Organizations:"
@@ -1311,11 +1309,11 @@ msgstr "Organisations:"
 
 #: ajax_htmldata/getProductDetails.php:249 summary.php:339
 msgid "Resource URL:"
-msgstr "Ressource URL: "
+msgstr "URL de la Ressource: "
 
 #: ajax_htmldata/getProductDetails.php:250
 msgid "Visit Resource URL"
-msgstr "Ressource URL de visite"
+msgstr "Visiter la ressource"
 
 #: ajax_htmldata/getProductDetails.php:258
 msgid "Visit Secondary Resource URL"
@@ -1323,66 +1321,66 @@ msgstr "Ressource URL secondaire de visite"
 
 #: ajax_htmldata/getProductDetails.php:273
 msgid "edit product details"
-msgstr "Modifier les détails du produit"
+msgstr "Modifier détails"
 
 #: ajax_htmldata/getProductDetails.php:340
 msgid "remove subject"
-msgstr "Supprimer le sujet"
+msgstr "Supprimer sujet"
 
 #: ajax_htmldata/getProductDetails.php:361
 msgid "add new subject"
-msgstr "Ajouter nouveau sujet"
+msgstr "Ajouter sujet"
 
 #: ajax_htmldata/getRightPanel.php:40
 msgid "Print View"
-msgstr "Vue d'Impresion"
+msgstr "Imprimer vue"
 
 #: ajax_htmldata/getRightPanel.php:42
 msgid "Catalog View"
-msgstr "Vue du Catalogue"
+msgstr "Vue catalogue"
 
 #: ajax_htmldata/getRightPanel.php:50
 msgid "Parent Record(s)"
-msgstr "Registre(s) du parent"
+msgstr "Fiche parent"
 
 #: ajax_htmldata/getRightPanel.php:58
 msgid "Child Record(s)"
-msgstr "Registre(s) enfant(s)"
+msgstr "Fiche enfant"
 
 #: ajax_htmldata/getRightPanel.php:77
 msgid "Organizations Module"
-msgstr "Module d'organisations"
+msgstr "Module organisation"
 
 #: ajax_htmldata/getRightPanel.php:93
 msgid "Licensing Module"
-msgstr "Module des licences"
+msgstr "Module licence"
 
 #: ajax_htmldata/getRightPanel.php:111
 msgid "Usage Statistics Module"
-msgstr "Module des statistiques d'utilisation"
+msgstr "Module statistiques"
 
 #: ajax_htmldata/getRightPanel.php:117
 msgid "Get Statistics"
-msgstr "Obtenir les statistiques"
+msgstr "Obtenir statistiques"
 
 #: ajax_htmldata/getRoutingDetails.php:13
 msgid ""
 "No workflow steps have been set up for this resource's combination of "
 "Acquisition Type and Resource Format."
 msgstr ""
-"Pas d'étapes de workflow ont été mis en place pour la combinaison de Type "
-"d'Acquisition et le Format de Ressource."
+"Pas d'étape de workflow mis en place pour cette combinaison de type "
+"d'acquisition et de format de ressource."
 
 #: ajax_htmldata/getRoutingDetails.php:13
 msgid ""
 "If you think this is in error, please contact your workflow administrator."
 msgstr ""
-"Si vous pensez qui cet un erreur, s'il vous plaît contactez à "
-"l'administrateur de workflow"
+"Si vous pensez qu'il s'agit d'une erreur, contactez à l'administrateur des "
+"workflow"
 
 #: ajax_htmldata/getRoutingDetails.php:15
 msgid "Not entered into workflow."
-msgstr "N'a pas entré dans le workflow"
+msgstr "Non saisi dans le workflow"
 
 #: ajax_htmldata/getRoutingDetails.php:21
 msgid "Step"
@@ -1403,7 +1401,7 @@ msgstr "Marquer comme complète"
 #: ajax_htmldata/getRoutingDetails.php:77
 #: ajax_htmldata/getRoutingDetails.php:79
 msgid "Workflow completed on "
-msgstr "Workflow completé le "
+msgstr "Workflow complété le "
 
 #: ajax_htmldata/getRoutingDetails.php:83
 #: ajax_htmldata/getRoutingDetails.php:85
@@ -1412,19 +1410,19 @@ msgstr "Workflow redémarré le "
 
 #: ajax_htmldata/getRoutingDetails.php:95
 msgid "restart workflow"
-msgstr "Redémarrer le workflow"
+msgstr "Redémarrer workflow"
 
 #: ajax_htmldata/getRoutingDetails.php:96
 msgid "mark entire workflow complete"
-msgstr "Marquer tout le workflow comme complète"
+msgstr "Marquer workflow comme complet"
 
 #: ajax_htmldata/getSavedQueue.php:6 queue.php:52
 msgid "Saved Requests"
-msgstr "Rêquetes enregistrées"
+msgstr "Requêtes enregistrées"
 
 #: ajax_htmldata/getSavedQueue.php:11
 msgid "No saved requests"
-msgstr "Pas des requêtes enregistrées"
+msgstr "Pas de requête enregistrée"
 
 #: ajax_htmldata/getSavedQueue.php:19 ajax_htmldata/getSearchResources.php:115
 #: ajax_htmldata/getSubmittedQueue.php:16
@@ -1438,19 +1436,19 @@ msgstr "Statut"
 
 #: ajax_htmldata/getSavedQueue.php:49
 msgid "edit request"
-msgstr "Modifier la requête"
+msgstr "Modifier requête"
 
 #: ajax_htmldata/getSavedQueue.php:50
 msgid "remove request"
-msgstr "Supprimer la requête"
+msgstr "Supprimer requête"
 
 #: ajax_htmldata/getSearchResources.php:38
 msgid "Sorry, no requests fit your query"
-msgstr "Désolé, il n'y a pas des résultats par votre requête"
+msgstr "Désolé, il n'y a pas de résultat à  votre requête"
 
 #: ajax_htmldata/getSearchResources.php:52
 msgid "Displaying "
-msgstr "En montrant "
+msgstr "Affichage de "
 
 #: ajax_htmldata/getSearchResources.php:52
 msgid " to "
@@ -1462,7 +1460,7 @@ msgstr " de "
 
 #: ajax_htmldata/getSearchResources.php:52
 msgid " Resource Records"
-msgstr " ressources enregistrées"
+msgstr " fiches ressources"
 
 #: ajax_htmldata/getSearchResources.php:64
 #: ajax_htmldata/getSearchResources.php:161
@@ -1480,7 +1478,7 @@ msgstr "Créateur"
 
 #: ajax_htmldata/getSearchResources.php:212
 msgid "records per page"
-msgstr "resultats par page"
+msgstr "résultats par page"
 
 #: ajax_htmldata/getSubmittedQueue.php:5 queue.php:53
 msgid "Submitted Requests"
@@ -1488,11 +1486,11 @@ msgstr "Requêtes soumises"
 
 #: ajax_htmldata/getSubmittedQueue.php:8
 msgid "No submitted requests"
-msgstr "Pas des requêtes soumises"
+msgstr "Pas de requête soumise"
 
 #: ajax_processing.php:27
 msgid "Processing action "
-msgstr "Processing Action "
+msgstr ""
 
 #: ajax_processing/deleteDetailedSubject.php:12
 #: ajax_processing/deleteGeneralSubject.php:12
@@ -1501,37 +1499,37 @@ msgid ""
 "Unable to delete.  Please make sure no resources are set up with this "
 "information."
 msgstr ""
-"N'est pas possible supprimer. S'il vous plaît, assurez-vous qu'aucune "
-"ressource est configurée avec cet information."
+"Impossible de supprimer. Vérifiez qu'i ln'y a pas de ressource ayant cette "
+"information."
 
 #: ajax_processing/deleteInstance.php:12
 msgid "Unable to delete  - this "
-msgstr "N'est pas possible supprimer - "
+msgstr "Impossible de supprimer - "
 
 #: ajax_processing/deleteInstance.php:12
 msgid ""
 " is in use.  Please make sure no resources are set up with this information."
 msgstr ""
-" est en utilisation. S'il vous plaît, assurez-vous  qu'aucune ressource est "
-"configurée avec cet information."
+" est utilisé. Assurez-vous  qu'aucune ressource n'est configurée avec cet "
+"information."
 
 #: ajax_processing/deleteResource.php:7
 #: ajax_processing/deleteResourceAndChildren.php:8
 msgid "Resource successfully deleted."
-msgstr "La ressource a été supprimé avec succès"
+msgstr "Ressource supprimée"
 
 #: ajax_processing/deleteResourceNote.php:7
 msgid "Note successfully deleted."
-msgstr "La note a été supprimé avec succès."
+msgstr "Note supprimée."
 
 #: ajax_processing/removeResourceSubjectRelationship.php:10
 msgid "Subject successfully removed."
-msgstr "Sujet enlevé avec succès."
+msgstr "Sujet enlevé."
 
 #: ajax_processing/updateDetailedSubject.php:22
 #: ajax_processing/updateGeneralSubject.php:21
 msgid "A duplicate "
-msgstr "Il y a un doublon "
+msgstr "Doublon "
 
 #: ajax_processing/updateDetailedSubject.php:22
 #: ajax_processing/updateGeneralSubject.php:21
@@ -1540,41 +1538,41 @@ msgstr " existant."
 
 #: ajax_processing/updateUserData.php:26
 msgid "User successfully saved."
-msgstr "Utilisateur enregistré avec succès"
+msgstr "Utilisateur enregistré."
 
 #: ajax_processing/uploadAttachment.php:29
 msgid "There was a problem saving your file to "
-msgstr "Il y avait un problème pour enregistrer votre fichier sur "
+msgstr "Il y a eu un problème pour enregistrer votre fichier sur "
 
 #: ajax_processing/uploadAttachment.php:29
 msgid ".  Please ensure your attachments directory is writable."
 msgstr ""
-". S'il vous plaît assurez-vous que votre dossier des piecès jointes est "
+". S'il vous plaît assurez-vous que votre dossier des pièces jointes est "
 "accessible en écriture."
 
 #: import.php:22
 msgid "Resources import"
-msgstr "Importer des ressources"
+msgstr "Import de ressources"
 
 #: import.php:24
 msgid "CSV File import"
-msgstr "Importation d'un fichier CSV"
+msgstr "Import d'un fichier CSV"
 
 #: import.php:32
 msgid "The file has been successfully uploaded."
-msgstr "Le fichier a été téléchargé avec succès."
+msgstr "Le fichier a été téléchargé."
 
 #: import.php:42
 msgid "Unable to get columns headers from the file"
-msgstr "N'est pas possible d'obtenir les noms des colonnes du fichier"
+msgstr "Impossible d'obtenir les noms des colonnes du fichier"
 
 #: import.php:45
 msgid "Unable to open the uploaded file"
-msgstr "N'est pas possible de télécharger le fichier"
+msgstr "Impossible d'ouvrir le fichier téléchargé"
 
 #: import.php:48
 msgid "Unable to upload the file"
-msgstr "N'est pas possible télécharger le fichier"
+msgstr "Impossible de télécharger le fichier"
 
 #: import.php:51
 msgid "Error: "
@@ -1582,7 +1580,7 @@ msgstr "Erreur: "
 
 #: import.php:53
 msgid "Please choose columns from your CSV file:"
-msgstr "S'il vous plaît, choisissez les colonnes de votre fichier CSV:"
+msgstr "Choisissez les colonnes de votre fichier CSV:"
 
 #: import.php:86
 msgid "Settings"
@@ -1591,7 +1589,7 @@ msgstr "Configuration"
 #: import.php:87
 msgid "Importing and deduping isbnOrISSN on the following columns: "
 msgstr ""
-"Importation et dédoublonnage d'isbnOrISSN dans les suivantes colonnes: "
+"Importation et dédoublonnage d'isbnOrISSN dans les colonnes suivantes: "
 
 #: import.php:143
 msgid "Organization "
@@ -1603,23 +1601,23 @@ msgstr " ne pu pas être ajouté."
 
 #: import.php:152 import.php:195
 msgid "Error: more than one organization is called "
-msgstr "Erreur: Plus d'une organisation a été appelé "
+msgstr "Erreur: Plus d'une organisation a été appelée"
 
 #: import.php:152
 msgid ". Please consider deduping."
-msgstr ". S'il vous plaît considérez dédoublonner."
+msgstr ". Considérez un dédoublonnage."
 
 #: import.php:174
 msgid "Unable to associate organization "
-msgstr "N'est pas possible d'associer l'organisation "
+msgstr "Impossible d'associer l'organisation "
 
 #: import.php:174
 msgid " with its role."
-msgstr " avec ce rôle"
+msgstr " avec le rôle."
 
 #: import.php:195
 msgid " Please consider deduping."
-msgstr " S'il vous plaît considérez dédoublonner."
+msgstr "Considérez un dédoublonnage."
 
 #: import.php:253
 msgid "Results"
@@ -1627,11 +1625,11 @@ msgstr "Résultats"
 
 #: import.php:254
 msgid " rows have been processed. "
-msgstr " rangs ont été traitées. "
+msgstr " lignes ont été traitées. "
 
 #: import.php:254
 msgid " rows have been inserted."
-msgstr " rangs ont été insérés."
+msgstr " lignes ont été insérées."
 
 #: import.php:255
 msgid " parents have been created. "
@@ -1639,15 +1637,15 @@ msgstr " parents ont été créés. "
 
 #: import.php:255
 msgid " resources have been attached to an existing parent."
-msgstr " ressources ont été ajoutés dans un parent existant."
+msgstr " ressources ont été ajoutées dans un parent existant."
 
 #: import.php:256
 msgid " organizations have been created"
-msgstr " organisations ont été créés"
+msgstr " organisations ont été créées"
 
 #: import.php:258
 msgid " resources have been attached to an existing organization."
-msgstr " ressources ont été ajoutés dans une organisation existante."
+msgstr " ressources ont été ajoutées dans une organisation existante."
 
 #: import.php:263
 msgid ""
@@ -1699,16 +1697,16 @@ msgstr "Recherche"
 
 #: index.php:59
 msgid "new search"
-msgstr "Nouvelle recherche"
+msgstr "Nouvelle"
 
 #: index.php:68
 msgid "Name (contains)"
-msgstr "Nom (contains)"
+msgstr "Nom (contient)"
 
 #: index.php:72 index.php:83 index.php:93 index.php:246 index.php:378
 #: index.php:395
 msgid "go!"
-msgstr "Valider!"
+msgstr "valider!"
 
 #: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
 #: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
@@ -1725,19 +1723,19 @@ msgstr "(aucun)"
 
 #: index.php:242
 msgid "Record ID"
-msgstr "ID d'enregistrement"
+msgstr "ID de la fiche"
 
 #: index.php:313
 msgid "Starts with"
-msgstr "Commence avec"
+msgstr "Commence par"
 
 #: index.php:339 js/index.js:236
 msgid "more options..."
-msgstr "plus des options..."
+msgstr "plus d'options..."
 
 #: index.php:374
 msgid "Note (contains)"
-msgstr "Note (contains)"
+msgstr "Note (contient)"
 
 #: index.php:386
 msgid "Date Created Between"
@@ -1749,11 +1747,11 @@ msgstr "et"
 
 #: index.php:402
 msgid "Purchase Site"
-msgstr "Site d'achat"
+msgstr "Site d'acquisition"
 
 #: queue.php:22 queue.php:40 templates/header.php:116
 msgid "My Queue"
-msgstr "Ma liste"
+msgstr "Ma queue"
 
 #: resource.php:54
 msgid "Success!"
@@ -1761,11 +1759,11 @@ msgstr "Fait!"
 
 #: resource.php:54
 msgid "New resource added"
-msgstr "Nouvelle ressource ajouté"
+msgstr "Ressource ajoutée"
 
 #: resource.php:236
 msgid "Send feedback on this resource"
-msgstr "Envoyer une évaluation dans ce ressource"
+msgstr "Evaluer cette ressource"
 
 #: resources/cataloging.php:103 summary.php:731
 msgid "Cataloging"
@@ -1793,19 +1791,19 @@ msgstr "Statut de catalogage:"
 
 #: resources/cataloging.php:141
 msgid "Number of Records Available"
-msgstr "Nombre des enregistrements disponibles"
+msgstr "Nombre d'enregistrements disponibles"
 
 #: resources/cataloging.php:142 summary.php:765
 msgid "# Records Available:"
-msgstr "# Enregistrements disponibles"
+msgstr "# fiches disponibles"
 
 #: resources/cataloging.php:147
 msgid "Number of Records Loaded"
-msgstr "Nombre des enregistrements chargées"
+msgstr "Nombre de fiches chargées"
 
 #: resources/cataloging.php:148 summary.php:771
 msgid "# Records Loaded:"
-msgstr "# Enregistrements chargées"
+msgstr "# Fiches chargées"
 
 #: resources/cataloging.php:153 summary.php:777
 msgid "OCLC Holdings:"
@@ -1821,15 +1819,15 @@ msgstr "Non"
 
 #: resources/cataloging.php:159 summary.php:784
 msgid "No cataloging information available."
-msgstr "Le catalogue d'information n'est pas disponible."
+msgstr "Information de catalogage non disponible."
 
 #: resources/cataloging.php:165
 msgid "edit cataloging details"
-msgstr "Modifier les détails du catalogage"
+msgstr "Modifier détails de catalogage"
 
 #: resources/cataloging_edit.php:15
 msgid "Edit Cataloging"
-msgstr "Modifier le catalogage"
+msgstr "Modifier catalogage"
 
 #: resources/cataloging_edit.php:24
 msgid "Record Set"
@@ -1845,11 +1843,11 @@ msgstr "Source URL"
 
 #: resources/cataloging_edit.php:68
 msgid "# Records Available"
-msgstr "# Enregistrements disponibles"
+msgstr "# Fiches disponibles"
 
 #: resources/cataloging_edit.php:75
 msgid "# Records Loaded"
-msgstr "# Enregistrements chargées"
+msgstr "# Fiches chargées"
 
 #: resources/cataloging_edit.php:82
 msgid "OCLC Holdings"
@@ -1857,11 +1855,11 @@ msgstr "OCLC Holdings"
 
 #: sendAlerts.php:76
 msgid "No Resources found fitting alert day criteria"
-msgstr "Pas des ressources trouvées selon les critères d'alerte du jour"
+msgstr "Aucune ressource ne répond aux critères d'alerte du jour"
 
 #: sendAlerts.php:81
 msgid "Alerts not enabled in configuration.ini file"
-msgstr "Les Alertes ne sont pas activées dans le fichier configuration.ini"
+msgstr "Les alertes ne sont pas activées dans le fichier configuration.ini"
 
 #: setuser.php:44
 msgid ""
@@ -1881,11 +1879,11 @@ msgstr "(Parent)"
 
 #: summary.php:402
 msgid "Additional Product Notes"
-msgstr "Notes additionales du produit"
+msgstr "Notes additionnelles du produit"
 
 #: summary.php:451
 msgid "Purchasing Site:"
-msgstr "Site d'achat:"
+msgstr "Site d'acquisition:"
 
 #: summary.php:501
 msgid "No payment information available."
@@ -1893,7 +1891,7 @@ msgstr "L'information du paiement n'est pas disponible."
 
 #: summary.php:590
 msgid "Additional Acquisitions Notes"
-msgstr "Notes additionales d'acquisition"
+msgstr "Notes additionnelles d'acquisition"
 
 #: summary.php:620
 msgid "No access information available."
@@ -1901,11 +1899,11 @@ msgstr "Pas d'information d'accès disponible."
 
 #: summary.php:715
 msgid "Additional Access Notes"
-msgstr "Notes additionales de connexion:"
+msgstr "Notes additionnelles de connexion:"
 
 #: summary.php:828
 msgid "Additional Cataloging Notes"
-msgstr "Notes additionales du catalogue"
+msgstr "Notes additionnelles du catalogue"
 
 #: templates/header.php:73
 msgid ""
@@ -1913,10 +1911,9 @@ msgid ""
 "JavaScript is either disabled or not supported by your browser. To use "
 "CORAL, enable JavaScript by changing your browser options, then "
 msgstr ""
-"JavaScript doit être activé pour utiliser CORAL. Cependant, on semble qui "
-"JavaScript est desactivé ou n'est pas supporté par votre navigateur. Pour "
-"utiliser CORAL, activez JavaScript en modifiant la configuration de votre "
-"navigateur, après "
+"JavaScript doit être activé pour utiliser CORAL. JavaScript est désactivé ou "
+"n'est pas supporté par votre navigateur. Pour utiliser CORAL, activez "
+"JavaScript en modifiant la configuration de votre navigateur, puis"
 
 #: templates/header.php:73
 msgid "try again"
@@ -1944,7 +1941,7 @@ msgstr "Importer"
 
 #: templates/header.php:117
 msgid "Admin"
-msgstr "Administrateur"
+msgstr "Administrer"
 
 #: templates/header.php:133
 msgid "Change Module"
@@ -1952,15 +1949,15 @@ msgstr "Changer le module"
 
 #: templates/header.php:176
 msgid "Invalid translation route!"
-msgstr "Le chemin aux traductions n'est pas valide!"
+msgstr "Le chemin des traductions n'est pas valide!"
 
 #: user.php:101
 msgid ""
 "Login is not working.  Check the .htaccess file and the "
 "remoteAuthVariableName specified in /admin/configuration.ini"
 msgstr ""
-"La connexion ne marche pas. Vérifiez le fichier .htaccess et "
-"remoteAuthVariableName specifié en /admin/configuration.ini"
+"La connexion ne fonctionne pas. Vérifiez le fichier .htaccess et la valeur "
+"de remoteAuthVariableName specifiée dans /admin/configuration.ini"
 
 #: js/admin.js:301
 msgid "Number of days must be a number"
@@ -1968,7 +1965,7 @@ msgstr "Le nombre de jours doit être un nombre"
 
 #: js/admin.js:304
 msgid "Number of days should be between 1 and 365"
-msgstr "Le nombre de jours doit être entre 1 et 365"
+msgstr "Le nombre de jours doit être compris entre 1 et 365"
 
 #: js/admin.js:325
 msgid "Do you really want to delete this data?"
@@ -1992,7 +1989,7 @@ msgstr "Voulez-vous vraiment supprimer cette devise?"
 
 #: js/common.js:73
 msgid "No match!"
-msgstr "Pas des coincidences!"
+msgstr "Aucune concordance!"
 
 #: js/common.js:73
 msgid "Selected: "
@@ -2000,25 +1997,25 @@ msgstr "Sélectionné: "
 
 #: js/forms/acquisitionsForm.js:123 js/forms/costForm.js:108
 msgid "Error - Either amount or fund is required"
-msgstr "Erreur, les deux cantitées ou fonds sont réquises"
+msgstr "Erreur, fond ou quantité est obligataoire"
 
 #: js/forms/acquisitionsForm.js:126 js/forms/costForm.js:111
 #: js/forms/costForm.js:289
 msgid "Error - order type is a required field"
-msgstr "Erreur - le type d'ordre est un champ réquise"
+msgstr "Erreur - le type de commande est obligatoire"
 
 #: js/forms/acquisitionsForm.js:129 js/forms/costForm.js:114
 #: js/forms/costForm.js:295
 msgid "Error - price is not numeric"
-msgstr "Erreur: le price n'est pas numérique"
+msgstr "Erreur: le prix n'est pas numérique"
 
 #: js/forms/acquisitionsForm.js:227
 msgid "Error - acquisition type is a required field"
-msgstr "Erreur - le type d'acquisition est un champ réquise"
+msgstr "Erreur - le type d'acquisition est obligatoire"
 
 #: js/forms/attachmentForm.js:94
 msgid "File name is already being used..."
-msgstr "Le nom du fichier est en use..."
+msgstr "Le nom du fichier est utilisé..."
 
 #: js/forms/attachmentForm.js:98
 msgid ""
@@ -2026,11 +2023,11 @@ msgid ""
 "double quote or less than/greater than characters"
 msgstr ""
 "Le nom du fichier ne peut pas contenir des caractères spéciaux -  "
-"esperluètte, apostrophe, guillemet ou moins que / plus que."
+"esperluette, apostrophe, guillemet ou moins que / plus que."
 
 #: js/forms/attachmentForm.js:102
 msgid "The attachments directory is not writable."
-msgstr "Le dossier des pièces jointes n'a pas des droits d'écriture."
+msgstr "Le dossier des pièces jointes n'a pas les droits d'écriture."
 
 #: js/forms/attachmentForm.js:124 js/forms/attachmentForm.js:146
 msgid " successfully uploaded."
@@ -2050,15 +2047,15 @@ msgstr "Le fichier doit être téléchargé"
 
 #: js/forms/contactForm.js:179
 msgid "Please choose at least one role."
-msgstr "S'il vous plaît, choisissez au moins un rôle."
+msgstr "Choisissez au moins un rôle."
 
 #: js/forms/costForm.js:283
 msgid "Error - Either price or fund is required"
-msgstr "Erreur, les deux prices ou fonds sont réquises"
+msgstr "Erreur, fond ou quantité est obligatoire"
 
 #: js/forms/detailedSubjectForm.js:60 js/forms/generalSubjectForm.js:59
 msgid "Error - Please enter a value"
-msgstr "Erreur - S'il vous plaît, tappez un valeur"
+msgstr "Erreur - Saisissez une valeur"
 
 #: js/forms/generalDetailSubjectForm.js:87
 msgid "Error - Detailed Subject is required"
@@ -2071,23 +2068,23 @@ msgstr "Erreur - Le sujet détaillé est déjà ajouté"
 
 #: js/forms/generalDetailSubjectForm.js:136 js/forms/userGroupForm.js:118
 msgid "remove from group"
-msgstr "Supprimer du groupe"
+msgstr "Enlever du groupe"
 
 #: js/forms/generalDetailSubjectForm.js:181
 msgid "Short Name must be entered to continue."
-msgstr "Un petit nom doit être tappé pour continuer."
+msgstr "Un petit nom doit être saisi pour continuer."
 
 #: js/forms/licenseForm.js:140 js/forms/licenseForm.js:256
 msgid "Error - Please choose a valid license"
-msgstr "Erreur - S'il vous plaît, choisissez une licence valide"
+msgstr "Erreur - Choisissez une licence valide"
 
 #: js/forms/licenseForm.js:155 js/forms/licenseForm.js:156
 msgid "remove this license"
-msgstr "Effacer cette licence"
+msgstr "Supprimer cette licence"
 
 #: js/forms/resourceNewForm.js:99
 msgid "Warning: this name already exists."
-msgstr "Attention: le nom est déjà existant."
+msgstr "Attention: le nom existe déjà."
 
 #: js/forms/resourceNewForm.js:227
 msgid "A title must be entered to continue."
@@ -2095,69 +2092,63 @@ msgstr "Un titre doit être écrit avant de continuer."
 
 #: js/forms/resourceNewForm.js:232
 msgid "The resource format is required."
-msgstr "Le format de resource est requis."
+msgstr "Le format de ressource est obligatoire."
 
 #: js/forms/resourceNewForm.js:237
 msgid "The resource type is required."
-msgstr "Le type de ressource est un nécessaire."
+msgstr "Le type de ressource est obligatoire."
 
 #: js/forms/resourceNoteForm.js:34
 msgid "Note must be entered to continue."
-msgstr "Le nom de la note doit être écrit avant de continuer."
+msgstr "La note doit être saisie avant de continuer."
 
 #: js/forms/resourceUpdateForm.js:90
 msgid "Error - Parent cannot be the same as the child"
-msgstr "Erreur - Le père ne peut pas être pareil comme l'enfant"
+msgstr "Erreur - Le père ne peut pas être aussi l'enfant"
 
 #: js/forms/resourceUpdateForm.js:217 js/forms/resourceUpdateForm.js:302
 #: js/forms/resourceUpdateForm.js:392 js/forms/resourceUpdateForm.js:403
 msgid "Error - Both fields are required"
-msgstr "Erreur, Les deux champs sont exigés"
+msgstr "Erreur, Les deux champs sont obligatoires"
 
 #: js/forms/resourceUpdateForm.js:277
 msgid "Error - Parent is not found.  Please use the Autocomplete."
-msgstr ""
-"Erreur - Le parent n'est pas trouvé. S'il vous plaît utilisez l'autocomplete."
+msgstr "Erreur - Le parent n'est pas trouvé. Utilisez l’auto complétion"
 
 #: js/forms/resourceUpdateForm.js:304
 msgid "Error - Organization is not found.  Please use the Autocomplete."
-msgstr ""
-"Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
-"l'autocomplete."
+msgstr "Erreur - L'organisation n'est pas trouvée. Utilisez l’auto complétion."
 
 #: js/forms/resourceUpdateForm.js:321 js/forms/resourceUpdateForm.js:322
 msgid "remove this organization"
-msgstr "Supprimer cette organisation"
+msgstr "Supprimer organisation"
 
 #: js/forms/resourceUpdateForm.js:394
 msgid "Error - Organization is not found.  Please use Autocomplete."
-msgstr ""
-"Erreur - L'organisation n'est pas trouvé. S'il vous plaît, utilisez "
-"l'autocomplete."
+msgstr "Erreur - L'organisation n'est pas trouvée. Utilisez l'auto complétion."
 
 #: js/forms/userGroupForm.js:101
 msgid "Error - User is required"
-msgstr "Erreur, un utilisateur est nécessaire pour cette action"
+msgstr "Erreur, un utilisateur est obligatoire"
 
 #: js/forms/userGroupForm.js:163
 msgid "Group name must be entered to continue."
-msgstr "Le nom du groupe doit être écrit avant de continuer."
+msgstr "Le nom du groupe doit être saisi avant de continuer."
 
 #: js/forms/workflowForm.js:185
 msgid "Error - Step name is required"
-msgstr "Erreur, Le nom de l'étape est nécessaire"
+msgstr "Erreur, Le nom de l'étape est obligatoire"
 
 #: js/forms/workflowForm.js:373
 msgid "Please add at least one step to this workflow."
-msgstr "S'il vous plaît, ajoutez au moins une étape à ce workflow."
+msgstr "AZjoutez au moins une étape à ce workflow."
 
 #: js/forms/workflowForm.js:379
 msgid ""
 "Please click the Add button to the first step before submitting this "
 "workflow."
 msgstr ""
-"S'il vous plaît, cliquez sur le button Ajouter pour cette étape avant de "
-"valider ce workflow."
+"Cliquez sur le bouton Ajouter pour cette étape avant de valider ce workflow."
 
 #: js/index.js:112
 msgid "Processing..."
@@ -2333,7 +2324,7 @@ msgstr "Fermer"
 
 #: js/plugins/jquery.datePicker.js:1134
 msgid "Choose date"
-msgstr "Choissir la date"
+msgstr "Choisir la date"
 
 #: js/queue.js:55 js/queue.js:89 js/queue.js:123 js/queue.js:155
 msgid "Refreshing..."
@@ -2341,15 +2332,15 @@ msgstr "Rechargement..."
 
 #: js/queue.js:153
 msgid "Do you really want to delete this request?"
-msgstr "Voulez-vous vraiment supprimer cete rêquete?"
+msgstr "Voulez-vous vraiment supprimer cette requête?"
 
 #: js/queue.js:193 js/queue.js:214 js/queue.js:235 js/resource.js:275
 msgid " record)"
-msgstr " registre)"
+msgstr " fiche)"
 
 #: js/queue.js:195 js/queue.js:216 js/queue.js:237 js/resource.js:277
 msgid " records)"
-msgstr " registres)"
+msgstr " fiches)"
 
 #: js/resource.js:209 js/resource.js:323
 msgid "Refreshing Contents..."
@@ -2357,11 +2348,11 @@ msgstr "Rechargements des contenus..."
 
 #: js/resource.js:369
 msgid "Do you really want to delete this contact?"
-msgstr "Voulez-vous vraiment supprimer cette contact?"
+msgstr "Voulez-vous vraiment supprimer ce contact?"
 
 #: js/resource.js:387
 msgid "Do you really want to delete this account?"
-msgstr "Voulez-vous vraiment supprimer cette compte?"
+msgstr "Voulez-vous vraiment supprimer ce compte?"
 
 #: js/resource.js:405
 msgid "Do you really want to delete this attachment?"
@@ -2369,11 +2360,11 @@ msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
 
 #: js/resource.js:425
 msgid "Do you really want to delete this resource?"
-msgstr "Voulez-vous vraiment supprimer ce ressource?"
+msgstr "Voulez-vous vraiment supprimer cette ressource?"
 
 #: js/resource.js:443
 msgid "Do you really want to delete this resource and all its children?"
-msgstr "Voulez-vous vraiment supprimer ce ressource et tous ses fils?"
+msgstr "Voulez-vous vraiment supprimer cette ressource et tous ses fils?"
 
 #: js/resource.js:464
 msgid "Do you really want to remove this Subject?"
@@ -2389,15 +2380,15 @@ msgid ""
 "completed.  Are you sure you wish to continue?"
 msgstr ""
 "Attention! Vous êtes sur le point d'effacer quelques étapes qui ont été "
-"commencés et complétés. Etes-vous sûrs que vous voulez continuer?"
+"commencées et complétées. Êtes-vous sûrs que vous voulez continuer?"
 
 #: js/resource.js:542
 msgid ""
 "Do you really want to mark this resource complete?  This action cannot be "
 "undone."
 msgstr ""
-"Êtes-vous sûrs de marquer ce ressource comme complète? Cette action ne peut "
-"pas être annulée."
+"Êtes-vous sûrs de marquer cette ressource comme complète? Cette action ne "
+"peut pas être annulée."
 
 #~ msgid "Administering Site: "
 #~ msgstr "Administration du site: "

From fdf83d38a9c54d33baac0f8c7630739403c1910c Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 13 May 2015 16:11:24 +0200
Subject: [PATCH 032/159] Fixed issue in the translation when there isn't the
 cookie with the language code

---
 directory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directory.php b/directory.php
index 6fd9068..e0dc18d 100644
--- a/directory.php
+++ b/directory.php
@@ -184,7 +184,7 @@ function debug($value) {
 if(isset($_COOKIE["lang"])){
     $http_lang = $_COOKIE["lang"];
 }else{
-    $http_lang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5);
+    $http_lang = str_replace('-','_',substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5));
 }
 putenv("LC_ALL=$http_lang");
 setlocale(LC_ALL, $http_lang.".utf8");

From f1002679f4f0aef948097e49135decbae1bd593f Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 19 May 2015 10:27:31 +0200
Subject: [PATCH 033/159] Fixed error 'Unexpected token )' to add a new ISBN in
 'Edit resource'

---
 ajax_forms/getUpdateProductForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax_forms/getUpdateProductForm.php b/ajax_forms/getUpdateProductForm.php
index 1a5776e..6d11300 100644
--- a/ajax_forms/getUpdateProductForm.php
+++ b/ajax_forms/getUpdateProductForm.php
@@ -149,7 +149,7 @@
 <td>
           <span id="newIsbn">
            <input type='text' class='isbnOrISSN isbnOrISSN_new' name='isbnOrISSN' value = "" style='width:97px;' class='changeInput'  /><span id='span_errors_isbnOrISSN' class='smallDarkRedText'></span>
-           <a href='javascript:void();'><img src='images/add.gif' class='addIsbn' alt='<?php echo _("add Isbn");?>' title='<?php echo _("add Isbn");?>'></a><br />
+           <a href='javascript:void(0);'><img src='images/add.gif' class='addIsbn' alt='<?php echo _("add Isbn");?>' title='<?php echo _("add Isbn");?>'></a><br />
            <hr /><br />
            </span>
            <span id="existingIsbn">

From 4e73aa180857696122a8d8a17e8146b9f33f8a5a Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Fri, 15 May 2015 15:54:48 +0200
Subject: [PATCH 034/159] Fixed compatibility to detect the language of
 navigator in differents navigators, erased unnecessary methods JavaScript and
 cookie time increased to 30 days to avoid choose the language every day

fixed conflicts:
	locale/fr_FR/LC_MESSAGES/messages.mo
	locale/fr_FR/LC_MESSAGES/messages.po
---
 LangCodes.php                        | 17 ++++++---
 directory.php                        |  9 ++++-
 js/plugins/translate.js              | 40 ++-----------------
 locale/fr_FR/LC_MESSAGES/messages.po | 57 +++++++++++++---------------
 templates/header.php                 | 27 ++++++-------
 5 files changed, 63 insertions(+), 87 deletions(-)

diff --git a/LangCodes.php b/LangCodes.php
index f3e1e64..2d58bc7 100644
--- a/LangCodes.php
+++ b/LangCodes.php
@@ -1,18 +1,23 @@
 <?php
 /**
  * @author: Cesar Hernandez
- * getLanguage: This method return the name of the language according to the language code
+ * getLanguage: This method return the language code
+ * getNameLang: This method return the name of the language
  */
 class LangCodes{
     public function getLanguage($code){
         $all_lang=array(
-        'fr_FR'=>_('French, FR'),
-        'en_US'=>_('English, US'),
-        'es_ES'=>_('Spanish, ES'),
-        'es_MX'=>_('Spanish, MX'),
-        'it_IT'=>_('Italian, IT')
+            'fr'=>'fr_FR',
+            'en'=>'en_US'
         );
         return $all_lang[$code];
     }
+    public function getNameLang($code_lang){
+        $name_lang=array(
+            'fr'=>_('French'),
+            'en'=>_('English')
+        );
+        return $name_lang[$code_lang];
+    }
 }
 ?>
\ No newline at end of file
diff --git a/directory.php b/directory.php
index e0dc18d..f77e59c 100644
--- a/directory.php
+++ b/directory.php
@@ -179,12 +179,17 @@ function debug($value) {
   echo '<pre>'.print_r($value, true).'</pre>';
 }
 
+// Include file of language codes
+include_once 'LangCodes.php';
+$lang_name = new LangCodes();
+
 // Verify the language of the browser
 global $http_lang;
 if(isset($_COOKIE["lang"])){
     $http_lang = $_COOKIE["lang"];
-}else{
-    $http_lang = str_replace('-','_',substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5));
+}else{        
+    $codeL = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+    $http_lang = $lang_name->getLanguage($codeL);
 }
 putenv("LC_ALL=$http_lang");
 setlocale(LC_ALL, $http_lang.".utf8");
diff --git a/js/plugins/translate.js b/js/plugins/translate.js
index 3f7baf4..7668cce 100644
--- a/js/plugins/translate.js
+++ b/js/plugins/translate.js
@@ -1,40 +1,8 @@
-function getCookie(keyCo){
-    var valCookie= ""; 
-    var search= keyCo + "="; 
-    if(document.cookie.length > 0) { 
-        pos=document.cookie.indexOf(search); 
-        if (pos != -1) {
-            pos += search.length; 
-            end= document.cookie.indexOf(";", pos); 
-            if (end == -1) 
-                end= document.cookie.length; 
-            valCookie= unescape(document.cookie.substring(pos,end)) 
-        }
-    } 
-    return valCookie; 
-} 
+/*
+ * gt : Object to translate JavaScript strings
+ * function _() : Syntax of gettext
+ */
 
-function fLang() {
-    var langBrowser = '';
-    // Search the language according to the browser
-    if(getCookie('lang')=='' || getCookie('lang')==undefined){
-        if (navigator.languages==undefined) {
-            if (navigator.language==undefined) {
-                // Internet Explorer Compatibility
-                langBrowser= navigator.userLanguage.slice(0,2);
-            } else {
-                // Old navigator compatibility
-                langBrowser= navigator.language.slice(0,2);
-            }
-        } else { 
-            // Recent navigators
-            langBrowser= navigator.languages[0].slice(0,2);                                
-        }
-    }else{
-        langBrowser = getCookie('lang');
-    }
-    return langBrowser;
-}
 var gt = new Gettext({ 'domain' : 'messages' });
 function _(msgid) {
     return gt.gettext(msgid);
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 66ac52b..44fc0a4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -16,25 +16,13 @@ msgstr ""
 "X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: LangCodes.php:9
-msgid "French, FR"
-msgstr "Français, FR"
+#: LangCodes.php:17
+msgid "French"
+msgstr "Français"
 
-#: LangCodes.php:10
-msgid "English, US"
-msgstr "Anglais, US"
-
-#: LangCodes.php:11
-msgid "Spanish, ES"
-msgstr "Espagnol, ES"
-
-#: LangCodes.php:12
-msgid "Spanish, MX"
-msgstr "Espagnol, MX"
-
-#: LangCodes.php:13
-msgid "Italian, IT"
-msgstr "Italien, IT"
+#: LangCodes.php:18
+msgid "English"
+msgstr "Anglais"
 
 #: admin.php:22 admin.php:40
 msgid "Administration"
@@ -1687,7 +1675,7 @@ msgstr "(pipe)"
 msgid "Upload"
 msgstr "Télécharger"
 
-#: index.php:26 templates/header.php:114
+#: index.php:26 templates/header.php:115
 msgid "Home"
 msgstr "Accueil"
 
@@ -1749,7 +1737,7 @@ msgstr "et"
 msgid "Purchase Site"
 msgstr "Site d'acquisition"
 
-#: queue.php:22 queue.php:40 templates/header.php:116
+#: queue.php:22 queue.php:40 templates/header.php:117
 msgid "My Queue"
 msgstr "Ma queue"
 
@@ -1905,7 +1893,7 @@ msgstr "Notes additionnelles de connexion:"
 msgid "Additional Cataloging Notes"
 msgstr "Notes additionnelles du catalogue"
 
-#: templates/header.php:73
+#: templates/header.php:74
 msgid ""
 "JavaScript must be enabled in order for you to use CORAL. However, it seems "
 "JavaScript is either disabled or not supported by your browser. To use "
@@ -1915,39 +1903,39 @@ msgstr ""
 "n'est pas supporté par votre navigateur. Pour utiliser CORAL, activez "
 "JavaScript en modifiant la configuration de votre navigateur, puis"
 
-#: templates/header.php:73
+#: templates/header.php:74
 msgid "try again"
 msgstr "réessayez"
 
-#: templates/header.php:92
+#: templates/header.php:93
 msgid "Hello, "
 msgstr "Bonjour, "
 
-#: templates/header.php:103
+#: templates/header.php:104
 msgid "logout"
 msgstr "Se déconnecter"
 
-#: templates/header.php:105
+#: templates/header.php:106
 msgid "(Test)"
 msgstr "(Test)"
 
-#: templates/header.php:115
+#: templates/header.php:116
 msgid "New Resource"
 msgstr "Nouvelle ressource"
 
-#: templates/header.php:116
+#: templates/header.php:117
 msgid "Import"
 msgstr "Importer"
 
-#: templates/header.php:117
+#: templates/header.php:118
 msgid "Admin"
 msgstr "Administrer"
 
-#: templates/header.php:133
+#: templates/header.php:134
 msgid "Change Module"
 msgstr "Changer le module"
 
-#: templates/header.php:176
+#: templates/header.php:177
 msgid "Invalid translation route!"
 msgstr "Le chemin des traductions n'est pas valide!"
 
@@ -2390,6 +2378,15 @@ msgstr ""
 "Êtes-vous sûrs de marquer cette ressource comme complète? Cette action ne "
 "peut pas être annulée."
 
+#~ msgid "Spanish, ES"
+#~ msgstr "Espagnol, ES"
+
+#~ msgid "Spanish, MX"
+#~ msgstr "Espagnol, MX"
+
+#~ msgid "Italian, IT"
+#~ msgstr "Italien, IT"
+
 #~ msgid "Administering Site: "
 #~ msgstr "Administration du site: "
 
diff --git a/templates/header.php b/templates/header.php
index bb9865d..631f8bd 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -23,10 +23,6 @@
 $util = new Utility();
 $config = new Configuration();
 
-// Include file of language codes
-include_once 'LangCodes.php';
-$lang_name = new LangCodes();
-
 //get the current page to determine which menu button should be depressed
 $currentPage = $_SERVER["SCRIPT_NAME"];
 $parts = Explode('/', $currentPage);
@@ -56,12 +52,17 @@
 <script type="text/javascript" src="js/plugins/jquery.autocomplete.js"></script>
 <script type="text/javascript" src="js/plugins/Gettext.js"></script>
 <?php
-   // Add translation for the JavaScript files
+    // Add translation for the JavaScript files
     global $http_lang;
+    $str = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+    $default_l = $lang_name->getLanguage($str);
+    if($default_l==null || empty($default_l)){$default_l=$str;}
     if(isset($_COOKIE["lang"])){
         if($_COOKIE["lang"]==$http_lang && $_COOKIE["lang"] != "en_US"){
             echo "<link rel='gettext' type='application/x-po' href='./locale/".$http_lang."/LC_MESSAGES/messages.po' />";
         }
+    }else if($default_l==$http_lang && $default_l != "en_US"){
+            echo "<link rel='gettext' type='application/x-po' href='./locale/".$http_lang."/LC_MESSAGES/messages.po' />";
     }
 ?>
 <script type="text/javascript" src="js/plugins/translate.js"></script>
@@ -119,7 +120,7 @@
 
 </td>
 
-<td style='width:288px;height:19px;' align='right'>
+<td style='width:235px;height:19px;' align='right'>
 <?php
 
 //only show the 'Change Module' if there are other modules installed or if there is an index to the main CORAL page
@@ -176,22 +177,22 @@
                 echo "<br>"._("Invalid translation route!"); 
             }
             // Get language of navigator
-            $defLang = str_replace('-','_',substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5));
+            $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
             
             // Show an ordered list
             sort($lang); 
             for($i=0; $i<count($lang); $i++){
                 if(isset($_COOKIE["lang"])){
                     if($_COOKIE["lang"]==$lang[$i]){
-                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getLanguage($lang[$i])."</option>";
+                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getNameLang(substr($lang[$i],0,2))."</option>";
                     }else{
-                        echo "<option value='".$lang[$i]."'>".$lang_name->getLanguage($lang[$i])."</option>";
+                        echo "<option value='".$lang[$i]."'>".$lang_name->getNameLang(substr($lang[$i],0,2))."</option>";
                     }
                 }else{
-                    if($defLang==$lang[$i]){
-                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getLanguage($lang[$i])."</option>";
+                    if($defLang==substr($lang[$i],0,2)){
+                        echo "<option value='".$lang[$i]."' selected='selected'>".$lang_name->getNameLang(substr($lang[$i],0,2))."</option>";
                     }else{
-                        echo "<option value='".$lang[$i]."'>".$lang_name->getLanguage($lang[$i])."</option>";
+                        echo "<option value='".$lang[$i]."'>".$lang_name->getNameLang(substr($lang[$i],0,2))."</option>";
                     }
                 }
             }
@@ -207,7 +208,7 @@
         
         function setLanguage(lang) {
 			var wl = window.location, now = new Date(), time = now.getTime();
-            var cookievalid=86400000; // 1 day (1000*60*60*24)
+            var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
 			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;

From 436f6fd7be11c84a382589e1acee21ff853b39bd Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Tue, 26 May 2015 11:12:26 +0200
Subject: [PATCH 035/159] Added missed message in getOrderForm.php and deleted
 alert JavaScript

Fixed conflicts:
	locale/fr_FR/LC_MESSAGES/messages.mo
	locale/fr_FR/LC_MESSAGES/messages.po
---
 ajax_forms/getOrderForm.php  | 2 +-
 js/forms/acquisitionsForm.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ajax_forms/getOrderForm.php b/ajax_forms/getOrderForm.php
index 0798825..5b0b7b1 100644
--- a/ajax_forms/getOrderForm.php
+++ b/ajax_forms/getOrderForm.php
@@ -76,7 +76,7 @@
 				</tr>
 
 				<tr>
-				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentEndDate'><?php _("Current Sub End:");?></label></td>
+				<td style='vertical-align:top;text-align:left;font-weight:bold'><label for='currentEndDate'><?php echo _("Current Sub End:");?></label></td>
 				<td><input class='date-pick' id='currentEndDate' name='currentEndDate' value = '<?php echo $endDate; ?>' style='width:75px;' />
 				</td>
 				</tr>
diff --git a/js/forms/acquisitionsForm.js b/js/forms/acquisitionsForm.js
index 0f9a486..5b5e49d 100644
--- a/js/forms/acquisitionsForm.js
+++ b/js/forms/acquisitionsForm.js
@@ -226,7 +226,6 @@ function submitOrderForm(){
 	if((typeID == '') || (typeID == null)){
 		$('#span_errors').html(_("Error - acquisition type is a required field"));
 		myReturn="1";
-		alert("Fail 2");
 	}
  	if (myReturn == "1"){
 		return false; 	

From 387cb21ed71e222391b5502f74f767047f14bf45 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 19 Jun 2015 11:43:31 +0200
Subject: [PATCH 036/159] Fixing some translation problems

After merging 4 last patches from Cesar, the .po & .mo had to be re-created/updated.
This patch do that
---
 locale/fr_FR/LC_MESSAGES/messages.mo |  Bin 35024 -> 26948 bytes
 locale/fr_FR/LC_MESSAGES/messages.po | 3569 +++++++++++++-------------
 2 files changed, 1732 insertions(+), 1837 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index a5c5440b5b81985c2fdb5b385d51bd3c6a4c93e1..fcb4a9ff561c241271e409752bde30a16beb951c 100644
GIT binary patch
delta 9679
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
MrC<0zT2{*SKX~zmtN;K2

literal 35024
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
U-qeHrtG+N&R}9GF$vV{k17*gg3jhEB

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 44fc0a4..1675616 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"POT-Creation-Date: 2015-05-13 10:56+0100\n"
-"PO-Revision-Date: 2015-06-19 10:57+0100\n"
+"POT-Creation-Date: 2015-06-19 11:41+0100\n"
+"PO-Revision-Date: 2015-06-19 11:41+0100\n"
 "Last-Translator: Paul Poulain <paul.poulain@biblibre.com>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -10,771 +10,1046 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Basepath: /var/www/Coral/resources\n"
+"X-Poedit-Basepath: /var/lib/lxc/coral_testpatch/rootfs/home/coral/www/"
+"resources\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPathExcluded-0: /var/www/Coral/resources/plugins\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: LangCodes.php:17
-msgid "French"
-msgstr "Français"
-
-#: LangCodes.php:18
-msgid "English"
-msgstr "Anglais"
-
-#: admin.php:22 admin.php:40
-msgid "Administration"
-msgstr "Administration"
-
-#: admin.php:51 ajax_htmldata/getAdminUserDisplay.php:19
-#: ajax_htmldata/getAdminWorkflowDisplay.php:74
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: admin.php:52
-msgid "Workflow / User Group"
-msgstr "Workflow / Groupe d'utilisateur"
-
-#: admin.php:53
-msgid "Access Method"
-msgstr "Mèthode d'accès"
-
-#: admin.php:54
-msgid "Account Type"
-msgstr "Type de compte"
-
-#: admin.php:55 ajax_forms/getNewResourceForm.php:176
-#: ajax_htmldata/getAdminWorkflowDisplay.php:16
-#: ajax_htmldata/getOutstandingQueue.php:21 ajax_htmldata/getSavedQueue.php:20
-#: ajax_htmldata/getSearchResources.php:116
-#: ajax_htmldata/getSubmittedQueue.php:17 index.php:100
-msgid "Acquisition Type"
-msgstr "Type d'acquisition"
+#: summary.php:34
+msgid " Summary"
+msgstr " Resumé"
 
-#: admin.php:56 index.php:466
-msgid "Administering Site"
-msgstr "Site d'administration"
+#: summary.php:206 ajax_htmldata/getProductDetails.php:75
+msgid "Record ID:"
+msgstr "Identifiant:"
 
-#: admin.php:58 ajax_htmldata/getAdminAlertDisplay.php:10
-msgid "Alert Settings"
-msgstr "Configuration des alertes"
+#: summary.php:212 summary.php:516 ajax_forms/getLicenseForm.php:136
+#: ajax_htmldata/getAcquisitionsDetails.php:270
+#: ajax_htmldata/getProductDetails.php:80
+msgid "Status:"
+msgstr "Statut:"
 
-#: admin.php:60
-msgid "Alias Type"
-msgstr "Type d'alias"
+#: summary.php:218 ajax_htmldata/getProductDetails.php:115
+msgid "Created:"
+msgstr "Créé:"
 
-#: admin.php:61
-msgid "Attachment Type"
-msgstr "Type de pièce jointe"
+#: summary.php:226 summary.php:252 summary.php:407 summary.php:522
+#: summary.php:598 summary.php:720 summary.php:833
+#: resources/cataloging.php:223 ajax_forms/getLicenseForm.php:166
+#: ajax_htmldata/getRoutingDetails.php:48
+#: ajax_htmldata/getRoutingDetails.php:50
+#: ajax_htmldata/getRoutingDetails.php:77
+#: ajax_htmldata/getRoutingDetails.php:79
+#: ajax_htmldata/getAcquisitionsDetails.php:276
+#: ajax_htmldata/getAcquisitionsDetails.php:370
+#: ajax_htmldata/getAccessDetails.php:173
+#: ajax_htmldata/getProductDetails.php:99
+#: ajax_htmldata/getProductDetails.php:101
+#: ajax_htmldata/getProductDetails.php:124
+#: ajax_htmldata/getProductDetails.php:126
+#: ajax_htmldata/getProductDetails.php:148
+#: ajax_htmldata/getProductDetails.php:150
+#: ajax_htmldata/getProductDetails.php:422
+msgid " by "
+msgstr " par "
 
-#: admin.php:62 index.php:496
-msgid "Authentication Type"
-msgstr "Type d'accès"
+#: summary.php:244 ajax_htmldata/getProductDetails.php:140
+msgid "Last Update:"
+msgstr "Dernière mise à jour:"
 
-#: admin.php:63 index.php:434
-msgid "Authorized Site"
-msgstr "Site autorisé"
+#: summary.php:269 ajax_htmldata/getProductDetails.php:165
+msgid "Related Products:"
+msgstr "Produits liés:"
 
-#: admin.php:64 index.php:526
-msgid "Cataloging Status"
-msgstr "Statut de catalogage"
+#: summary.php:275
+msgid "(Parent)"
+msgstr "(Parent)"
 
-#: admin.php:65
-msgid "CatalogingType"
-msgstr "Type de catalogage"
+#: summary.php:292 ajax_forms/getUpdateProductForm.php:148
+#: ajax_htmldata/getProductDetails.php:197
+msgid "ISSN / ISBN:"
+msgstr "ISSN / ISBN:"
 
-#: admin.php:66
-msgid "Contact Role"
-msgstr "Rôle"
+#: summary.php:301 ajax_htmldata/getProductDetails.php:211
+msgid "Aliases:"
+msgstr "Alias:"
 
-#: admin.php:68 ajax_forms/getCostForm.php:70
-msgid "Cost Details"
-msgstr "Détails du coût"
+#: summary.php:318 ajax_htmldata/getProductDetails.php:228
+msgid "Organizations:"
+msgstr "Organisations:"
 
-#: admin.php:70 ajax_htmldata/getAdminCurrencyDisplay.php:8
-msgid "Currency"
-msgstr "Devise"
+#: summary.php:339 ajax_htmldata/getProductDetails.php:249
+msgid "Resource URL:"
+msgstr "URL de la Ressource: "
 
-#: admin.php:71
-msgid "License Status"
-msgstr "Statut de la licence"
+#: summary.php:347 ajax_forms/getNewResourceForm.php:120
+#: ajax_forms/getUpdateProductForm.php:106
+#: ajax_htmldata/getProductDetails.php:257
+msgid "Alt URL:"
+msgstr "URL Alt:"
 
-#: admin.php:72 index.php:344
-msgid "Note Type"
-msgstr "Type de note"
+#: summary.php:355 ajax_forms/getNewResourceForm.php:105
+#: ajax_forms/getUpdateProductForm.php:96
+#: ajax_htmldata/getProductDetails.php:265
+msgid "Description:"
+msgstr "Description:"
 
-#: admin.php:73
-msgid "Order Type"
-msgstr "Type de commande"
+#: summary.php:402
+msgid "Additional Product Notes"
+msgstr "Notes additionnelles du produit"
 
-#: admin.php:81
-msgid "Organization Role"
-msgstr "Rôle dans l'organisation"
+#: summary.php:422 ajax_forms/getOrderForm.php:40
+#: ajax_htmldata/getAcquisitionsDetails.php:98
+msgid "Order"
+msgstr "Commande"
 
-#: admin.php:82
-msgid "Organizations"
-msgstr "Organisations"
+#: summary.php:429 ajax_forms/getAdminWorkflowForm.php:58
+#: ajax_forms/getOrderForm.php:46 ajax_htmldata/getAcquisitionsDetails.php:108
+msgid "Acquisition Type:"
+msgstr "Type d'acquisition:"
 
-#: admin.php:86
-msgid "Purchasing Site"
-msgstr "Site d'acquisition"
+#: summary.php:436 ajax_forms/getOrderForm.php:64
+#: ajax_htmldata/getAcquisitionsDetails.php:115
+msgid "Order Number:"
+msgstr "Numéro de commande:"
 
-#: admin.php:87 ajax_htmldata/getAdminWorkflowDisplay.php:17 index.php:186
-msgid "Resource Format"
-msgstr "Format de la ressource"
+#: summary.php:443 ajax_forms/getOrderForm.php:69
+#: ajax_htmldata/getAcquisitionsDetails.php:122
+msgid "System Number:"
+msgstr "Numéro système:"
 
-#: admin.php:88 ajax_forms/getNewResourceForm.php:223
-#: ajax_htmldata/getAdminWorkflowDisplay.php:18 index.php:210
-msgid "Resource Type"
-msgstr "Type de ressource"
+#: summary.php:451
+msgid "Purchasing Site:"
+msgstr "Site d'acquisition:"
 
-#: admin.php:89
-msgid "Storage Location"
-msgstr "Lieu de stockage"
+#: summary.php:458 ajax_htmldata/getAccessDetails.php:50
+msgid "Authorized Sites:"
+msgstr "Sites autorisés:"
 
-#: admin.php:90 ajax_htmldata/getProductDetails.php:301
-msgid "Subjects"
-msgstr "Sujets"
+#: summary.php:466 ajax_forms/getOrderForm.php:74
+#: ajax_htmldata/getAcquisitionsDetails.php:143
+msgid "Sub Start:"
+msgstr "Début d'abonnement:"
 
-#: admin.php:91
-msgid "User Limit"
-msgstr "Limite utilisateurs"
+#: summary.php:473 ajax_forms/getOrderForm.php:79
+msgid "Current Sub End:"
+msgstr "Fin d'abonnement courant:"
 
-#: admin.php:96 queue.php:59
-msgid "Loading..."
-msgstr "Chargement..."
+#: summary.php:475 ajax_htmldata/getAcquisitionsDetails.php:152
+msgid "Expiration Alert Enabled"
+msgstr "Alerte d'expiration activé"
 
-#: admin.php:119
-msgid "You do not have permissions to access this screen."
-msgstr "Vous n'avez pas la permission d'accéder à cette page."
+#: summary.php:485 ajax_forms/getCostForm.php:55
+#: ajax_htmldata/getAcquisitionsDetails.php:169
+msgid "Cost History"
+msgstr "Historique de coût"
 
-#: admin/classes/common/DBService.php:39
-msgid "There was a problem with the database: "
-msgstr "Il y avait un problème avec la base de données: "
+#: summary.php:501
+msgid "No payment information available."
+msgstr "L'information du paiement n'est pas disponible."
 
-#: admin/classes/common/LdapPerson.php:34
-msgid "Could not connect to "
-msgstr "N'a pas pu se connecter à "
+#: summary.php:511 ajax_htmldata/getAcquisitionsDetails.php:262
+msgid "License"
+msgstr "Licence"
 
-#: admin/classes/common/Object.php:63 admin/classes/common/Object.php:72
-msgid "Cannot set value for undefined key ("
-msgstr "Ne peut pas assigner une clé indefinie ("
+#: summary.php:522 ajax_htmldata/getAcquisitionsDetails.php:276
+msgid " on "
+msgstr " sur "
 
-#: admin/classes/common/Utility.php:121
-msgid "Error: unexpected fgets() fail"
-msgstr "Erreur: inattendu fgets() échoue"
+#: summary.php:525 ajax_forms/getLicenseForm.php:169
+#: ajax_htmldata/getAcquisitionsDetails.php:279
+msgid "No license status information available."
+msgstr "L'information de statut de la licence n'est pas disponible."
 
-#: admin/classes/common/Utility.php:133
-msgid "Edit DDW facet/term selections at: "
-msgstr "Modifier selections DDW facet/term à: "
+#: summary.php:533 ajax_htmldata/getAcquisitionsDetails.php:289
+msgid "Licenses:"
+msgstr "Licences:"
 
-#: admin/classes/common/Utility.php:148
-msgid "Email template file not found: "
-msgstr "Le fichier template pour l'email est introuvable: "
+#: summary.php:542 ajax_htmldata/getAcquisitionsDetails.php:298
+msgid "No associated licenses available."
+msgstr "Pas de licence associée."
 
-#: ajax_forms.php:25
-msgid "Form action "
-msgstr "Action "
+#: summary.php:590
+msgid "Additional Acquisitions Notes"
+msgstr "Notes additionnelles d'acquisition"
 
-#: ajax_forms.php:25 ajax_htmldata.php:27 ajax_processing.php:27
-msgid " not set up!"
-msgstr "Non défini!"
+#: summary.php:612 ajax_htmldata/getAccessDetails.php:31
+msgid "Access Information"
+msgstr "Information d'accès"
 
-#: ajax_forms/getAccessForm.php:59
-msgid "Edit Access"
-msgstr "Modifier l'accès"
+#: summary.php:620
+msgid "No access information available."
+msgstr "Pas d'information d'accès disponible."
 
-#: ajax_forms/getAccessForm.php:68
-msgid "Access"
-msgstr "Accès"
+#: summary.php:626 ajax_htmldata/getAccessDetails.php:43
+msgid "Administering Sites:"
+msgstr "Administration sites:"
 
-#: ajax_forms/getAccessForm.php:75 ajax_htmldata/getAccessDetails.php:57
-#: summary.php:633
+#: summary.php:633 ajax_forms/getAccessForm.php:75
+#: ajax_htmldata/getAccessDetails.php:57
 msgid "Authentication Type:"
 msgstr "Type d'accès:"
 
-#: ajax_forms/getAccessForm.php:90 ajax_forms/getAccountForm.php:58
-msgid "Username:"
-msgstr "Nom d'utilisateur:"
+#: summary.php:640 ajax_htmldata/getAccessDetails.php:65
+msgid "Username / Password:"
+msgstr "Nom d'utilisateur / Mot de passe:"
 
-#: ajax_forms/getAccessForm.php:94 ajax_htmldata/getAccessDetails.php:102
-#: summary.php:670
-msgid "Access Method:"
-msgstr "Méthode d'accès:"
+#: summary.php:647 ajax_forms/getAccessForm.php:128
+#: ajax_htmldata/getAccessDetails.php:72
+msgid "Simultaneous User Limit:"
+msgstr "Limite d'utilisateurs similtanés:"
 
-#: ajax_forms/getAccessForm.php:109 ajax_forms/getAccountForm.php:65
-#: ajax_htmldata/getAccountDetails.php:80
-msgid "Password:"
-msgstr "Mot de passe:"
+#: summary.php:655 ajax_htmldata/getAccessDetails.php:80
+msgid "Registered IP Address:"
+msgstr "Adresse IP enregistré:"
 
-#: ajax_forms/getAccessForm.php:113 ajax_htmldata/getAccessDetails.php:88
-#: summary.php:663
+#: summary.php:663 ajax_forms/getAccessForm.php:113
+#: ajax_htmldata/getAccessDetails.php:88
 msgid "Storage Location:"
 msgstr "Lieu de stockage:"
 
-#: ajax_forms/getAccessForm.php:128 ajax_htmldata/getAccessDetails.php:72
-#: summary.php:647
-msgid "Simultaneous User Limit:"
-msgstr "Limite d'utilisateurs similtanés:"
+#: summary.php:670 ajax_forms/getAccessForm.php:94
+#: ajax_htmldata/getAccessDetails.php:102
+msgid "Access Method:"
+msgstr "Méthode d'accès:"
 
-#: ajax_forms/getAccessForm.php:145 ajax_htmldata/getAccessDetails.php:95
-msgid "Coverage:"
-msgstr "Couverture:"
+#: summary.php:715
+msgid "Additional Access Notes"
+msgstr "Notes additionnelles de connexion:"
 
-#: ajax_forms/getAccessForm.php:163
-msgid "Authorized Site(s)"
-msgstr "Site(s) autorisé(s)"
+#: summary.php:731 resources/cataloging.php:103
+msgid "Cataloging"
+msgstr "Catalogage"
 
-#: ajax_forms/getAccessForm.php:208
-msgid "Administering Site(s)"
-msgstr "Administration site"
+#: summary.php:737 resources/cataloging.php:114
+msgid "Identifier:"
+msgstr "Identifiant:"
 
-#: ajax_forms/getAccessForm.php:251 ajax_forms/getAccountForm.php:86
-#: ajax_forms/getAdminAlertDaysForm.php:34
-#: ajax_forms/getAdminAlertEmailForm.php:34
-#: ajax_forms/getAdminCurrencyUpdateForm.php:38
-#: ajax_forms/getAdminUpdateForm.php:44
-#: ajax_forms/getAdminUserGroupForm.php:147
-#: ajax_forms/getAdminUserUpdateForm.php:66
-#: ajax_forms/getAdminWorkflowForm.php:266 ajax_forms/getAttachmentForm.php:89
-#: ajax_forms/getContactForm.php:161 ajax_forms/getCostForm.php:252
-#: ajax_forms/getDetailSubjectUpdateForm.php:38
-#: ajax_forms/getGeneralDetailSubjectForm.php:128
-#: ajax_forms/getGeneralSubjectUpdateForm.php:38
-#: ajax_forms/getLicenseForm.php:191 ajax_forms/getNewResourceForm.php:295
-#: ajax_forms/getNoteForm.php:61 ajax_forms/getOrderForm.php:160
-#: ajax_forms/getUpdateProductForm.php:423 resources/cataloging_edit.php:102
-msgid "submit"
-msgstr "soumettre"
+#: summary.php:743 ajax_forms/getAccountForm.php:44
+#: ajax_forms/getNewResourceForm.php:115
+#: ajax_forms/getUpdateProductForm.php:101
+msgid "URL:"
+msgstr "URL:"
 
-#: ajax_forms/getAccessForm.php:252 ajax_forms/getAccountForm.php:87
-#: ajax_forms/getAdminAlertDaysForm.php:35
-#: ajax_forms/getAdminAlertEmailForm.php:35
-#: ajax_forms/getAdminCurrencyUpdateForm.php:39
-#: ajax_forms/getAdminUpdateForm.php:45
-#: ajax_forms/getAdminUserGroupForm.php:148
-#: ajax_forms/getAdminUserUpdateForm.php:67
-#: ajax_forms/getAdminWorkflowForm.php:267 ajax_forms/getAttachmentForm.php:90
-#: ajax_forms/getContactForm.php:162 ajax_forms/getCostForm.php:253
-#: ajax_forms/getDetailSubjectUpdateForm.php:39
-#: ajax_forms/getGeneralDetailSubjectForm.php:129
-#: ajax_forms/getGeneralSubjectUpdateForm.php:39
-#: ajax_forms/getLicenseForm.php:192 ajax_forms/getNewResourceForm.php:296
-#: ajax_forms/getNoteForm.php:62 ajax_forms/getOrderForm.php:161
-#: ajax_forms/getResourceSubjectForm.php:49
-#: ajax_forms/getUpdateProductForm.php:424 resources/cataloging_edit.php:103
-msgid "cancel"
-msgstr "annuler"
+#: summary.php:751 resources/cataloging.php:128
+msgid "Cataloging Type:"
+msgstr "Type de catalogage:"
 
-#: ajax_forms/getAccountForm.php:17
-msgid "Edit Account"
-msgstr "Modifier compte"
+#: summary.php:759 resources/cataloging.php:136
+msgid "Cataloging Status:"
+msgstr "Statut de catalogage:"
 
-#: ajax_forms/getAccountForm.php:17
-msgid "Add Account"
-msgstr "Ajouter compte"
+#: summary.php:765 resources/cataloging.php:142
+msgid "# Records Available:"
+msgstr "# fiches disponibles"
 
-#: ajax_forms/getAccountForm.php:27
-msgid "Login Type:"
-msgstr "Type de connexion:"
+#: summary.php:771 resources/cataloging.php:148
+msgid "# Records Loaded:"
+msgstr "# Fiches chargées"
 
-#: ajax_forms/getAccountForm.php:44 ajax_forms/getNewResourceForm.php:115
-#: ajax_forms/getUpdateProductForm.php:101 summary.php:743
-msgid "URL:"
-msgstr "URL:"
+#: summary.php:777 resources/cataloging.php:153
+msgid "OCLC Holdings:"
+msgstr "OCLC Holdings:"
 
-#: ajax_forms/getAccountForm.php:51 ajax_htmldata/getAccountDetails.php:96
-msgid "Registered Email:"
-msgstr "Email enregistré:"
+#: summary.php:778 resources/cataloging.php:154
+msgid "Yes"
+msgstr "Oui"
 
-#: ajax_forms/getAccountForm.php:72 ajax_forms/getContactForm.php:138
-#: ajax_forms/getNoteForm.php:48 ajax_htmldata/getAccountDetails.php:104
-#: ajax_htmldata/getContactDetails.php:165
-msgid "Notes:"
-msgstr "Notes:"
+#: summary.php:778 resources/cataloging.php:154
+msgid "No"
+msgstr "Non"
 
-#: ajax_forms/getAdminAlertDaysForm.php:14
-msgid "Edit Alert Days In Advance"
-msgstr "Modifier l'alerte à l'avance"
+#: summary.php:784 resources/cataloging.php:159
+msgid "No cataloging information available."
+msgstr "Information de catalogage non disponible."
 
-#: ajax_forms/getAdminAlertDaysForm.php:14
-msgid "Add Alert Days In Advance"
-msgstr "Ajouter alerte à l'avance"
+#: summary.php:828
+msgid "Additional Cataloging Notes"
+msgstr "Notes additionnelles du catalogue"
 
-#: ajax_forms/getAdminAlertEmailForm.php:14
-msgid "Edit Alert Email Address"
-msgstr "Modifier l'adresse email d'alerte"
+#: queue.php:22 queue.php:40 templates/header.php:117
+msgid "My Queue"
+msgstr "Ma queue"
 
-#: ajax_forms/getAdminAlertEmailForm.php:14
-msgid "Add Alert Email Address"
-msgstr "Ajouter adresse email d'alerte"
+#: queue.php:51 ajax_htmldata/getOutstandingQueue.php:7
+msgid "Outstanding Tasks"
+msgstr "Tâches en attente"
 
-#: ajax_forms/getAdminCurrencyUpdateForm.php:14
-msgid "Edit Currency"
-msgstr "Modifier la devise"
+#: queue.php:52 ajax_htmldata/getSavedQueue.php:6
+msgid "Saved Requests"
+msgstr "Requêtes enregistrées"
 
-#: ajax_forms/getAdminCurrencyUpdateForm.php:14
-msgid "Add Currency"
-msgstr "Ajouter la devise"
+#: queue.php:53 ajax_htmldata/getSubmittedQueue.php:5
+msgid "Submitted Requests"
+msgstr "Requêtes soumises"
 
-#: ajax_forms/getAdminCurrencyUpdateForm.php:24
-#: ajax_htmldata/getAdminCurrencyDisplay.php:14
-msgid "Code"
-msgstr "Code"
+#: queue.php:59 admin.php:96
+msgid "Loading..."
+msgstr "Chargement..."
 
-#: ajax_forms/getAdminCurrencyUpdateForm.php:27
-#: ajax_htmldata/getAdminCurrencyDisplay.php:15
-#: ajax_htmldata/getOutstandingQueue.php:20 ajax_htmldata/getSavedQueue.php:18
-#: ajax_htmldata/getSearchResources.php:113
-#: ajax_htmldata/getSubmittedQueue.php:15
-msgid "Name"
-msgstr "Nom"
+#: user.php:101
+msgid ""
+"Login is not working.  Check the .htaccess file and the "
+"remoteAuthVariableName specified in /admin/configuration.ini"
+msgstr ""
+"La connexion ne fonctionne pas. Vérifiez le fichier .htaccess et la valeur "
+"de remoteAuthVariableName specifiée dans /admin/configuration.ini"
 
-#: ajax_forms/getAdminUpdateForm.php:16
-#: ajax_forms/getDetailSubjectUpdateForm.php:16
-#: ajax_forms/getGeneralSubjectUpdateForm.php:16
-msgid "Edit "
-msgstr "Modifier"
+#: LangCodes.php:17
+msgid "French"
+msgstr "Français"
 
-#: ajax_forms/getAdminUpdateForm.php:16
-#: ajax_forms/getDetailSubjectUpdateForm.php:16
-#: ajax_forms/getGeneralSubjectUpdateForm.php:16
-msgid "Add "
-msgstr "Ajouter"
+#: LangCodes.php:18
+msgid "English"
+msgstr "Anglais"
 
-#: ajax_forms/getAdminUpdateForm.php:31
-msgid "Show stats button?"
-msgstr "Montrer le bouton de statistiques?"
+#: resource.php:54
+msgid "Success!"
+msgstr "Fait!"
 
-#: ajax_forms/getAdminUserGroupForm.php:17
-msgid "Edit User Group"
-msgstr "Modifier le groupe d'utilisateur"
+#: resource.php:54
+msgid "New resource added"
+msgstr "Ressource ajoutée"
 
-#: ajax_forms/getAdminUserGroupForm.php:17
-msgid "Add User Group"
-msgstr "Ajouter un groupe d'utilisateur"
+#: resource.php:236
+msgid "Send feedback on this resource"
+msgstr "Evaluer cette ressource"
 
-#: ajax_forms/getAdminUserGroupForm.php:26
-msgid "User Group"
-msgstr "Groupe d'utilisateur"
+#: index.php:26 templates/header.php:115
+msgid "Home"
+msgstr "Accueil"
 
-#: ajax_forms/getAdminUserGroupForm.php:34
-msgid "Group Name:"
-msgstr "Nom du groupe"
+#: index.php:58
+msgid "Search"
+msgstr "Recherche"
 
-#: ajax_forms/getAdminUserGroupForm.php:41
-msgid "Email Address:"
-msgstr "Adresse email"
+#: index.php:59
+msgid "new search"
+msgstr "Nouvelle"
 
-#: ajax_forms/getAdminUserGroupForm.php:58
-msgid "Assigned Users"
-msgstr "Utilisateurs assignés"
+#: index.php:68
+msgid "Name (contains)"
+msgstr "Nom (contient)"
 
-#: ajax_forms/getAdminUserGroupForm.php:82
-msgid "add user"
-msgstr "Ajouter utilisateur"
+#: index.php:72 index.php:83 index.php:93 index.php:246 index.php:378
+#: index.php:395
+msgid "go!"
+msgstr "valider!"
 
-#: ajax_forms/getAdminUserGroupForm.php:121
-#: js/forms/generalDetailSubjectForm.js:135 js/forms/userGroupForm.js:117
-msgid "remove user from group"
-msgstr "Supprimer un utilisateur du groupe"
+#: index.php:90 ajax_forms/getCostForm.php:66
+#: ajax_htmldata/getAcquisitionsDetails.php:182
+msgid "Fund"
+msgstr "Fonds"
 
-#: ajax_forms/getAdminUserUpdateForm.php:21
-msgid "Edit User"
-msgstr "Modifier utilisateur"
+#: index.php:100 admin.php:55 ajax_forms/getNewResourceForm.php:176
+#: ajax_htmldata/getOutstandingQueue.php:21
+#: ajax_htmldata/getAdminWorkflowDisplay.php:16
+#: ajax_htmldata/getSavedQueue.php:20 ajax_htmldata/getSubmittedQueue.php:17
+#: ajax_htmldata/getSearchResources.php:116
+msgid "Acquisition Type"
+msgstr "Type d'acquisition"
 
-#: ajax_forms/getAdminUserUpdateForm.php:21
-msgid "Add New User"
-msgstr "Ajouter utilisateur"
+#: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
+#: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
+#: index.php:469 index.php:499 index.php:529 index.php:556
+msgid "All"
+msgstr "Tous"
 
-#: ajax_forms/getAdminUserUpdateForm.php:32
-#: ajax_htmldata/getAdminUserDisplay.php:22
-msgid "Login ID"
-msgstr "Identifiant de connexion"
+#: index.php:123 ajax_htmldata/getSavedQueue.php:21
+#: ajax_htmldata/getSubmittedQueue.php:18
+#: ajax_htmldata/getSearchResources.php:117
+msgid "Status"
+msgstr "Statut"
 
-#: ajax_forms/getAdminUserUpdateForm.php:33
-#: ajax_htmldata/getAdminUserDisplay.php:23
-msgid "First Name"
-msgstr "Prénom"
+#: index.php:154 ajax_htmldata/getSearchResources.php:114
+msgid "Creator"
+msgstr "Créateur"
 
-#: ajax_forms/getAdminUserUpdateForm.php:34
-#: ajax_htmldata/getAdminUserDisplay.php:24
-msgid "Last Name"
-msgstr "Nom"
+#: index.php:186 admin.php:87 ajax_htmldata/getAdminWorkflowDisplay.php:17
+msgid "Resource Format"
+msgstr "Format de la ressource"
 
-#: ajax_forms/getAdminUserUpdateForm.php:35
-#: ajax_htmldata/getAdminAlertDisplay.php:16
-#: ajax_htmldata/getAdminUserDisplay.php:27
-#: ajax_htmldata/getAdminWorkflowDisplay.php:73
-msgid "Email Address"
-msgstr "Adresse email"
+#: index.php:210 admin.php:88 ajax_forms/getNewResourceForm.php:223
+#: ajax_htmldata/getAdminWorkflowDisplay.php:18
+msgid "Resource Type"
+msgstr "Type de ressource"
 
-#: ajax_forms/getAdminUserUpdateForm.php:36
-#: ajax_htmldata/getAdminUserDisplay.php:25
-msgid "Privilege"
-msgstr "Privilège"
+#: index.php:218 index.php:220 index.php:259 index.php:261 index.php:290
+#: index.php:292 index.php:351 index.php:353 index.php:409 index.php:411
+#: index.php:441 index.php:443 index.php:473 index.php:475 index.php:503
+#: index.php:505 index.php:532 index.php:534
+msgid "(none)"
+msgstr "(aucun)"
 
-#: ajax_forms/getAdminUserUpdateForm.php:54
-#: ajax_htmldata/getAdminUserDisplay.php:26
-msgid "View Accounts"
-msgstr "Voir comptes"
+#: index.php:242
+msgid "Record ID"
+msgstr "ID de la fiche"
 
-#: ajax_forms/getAdminWorkflowForm.php:42
-msgid "Edit Workflow"
-msgstr "Modifier workflow"
+#: index.php:251 ajax_forms/getGeneralDetailSubjectForm.php:27
+#: ajax_htmldata/getAdminSubjectDisplay.php:98
+msgid "General Subject"
+msgstr "Sujet général"
 
-#: ajax_forms/getAdminWorkflowForm.php:51
-msgid "Resource Entry Requirements"
-msgstr "Conditions d'entrée des ressources"
+#: index.php:282 ajax_htmldata/getAdminSubjectDisplay.php:51
+#: ajax_htmldata/getAdminSubjectDisplay.php:99
+msgid "Detailed Subject"
+msgstr "Sujet détaillé"
 
-#: ajax_forms/getAdminWorkflowForm.php:58 ajax_forms/getOrderForm.php:46
-#: ajax_htmldata/getAcquisitionsDetails.php:108 summary.php:429
-msgid "Acquisition Type:"
-msgstr "Type d'acquisition:"
+#: index.php:313
+msgid "Starts with"
+msgstr "Commence par"
 
-#: ajax_forms/getAdminWorkflowForm.php:74
-#: ajax_forms/getUpdateProductForm.php:170
-msgid "Format:"
-msgstr "Format:"
+#: index.php:339
+msgid "more options..."
+msgstr "plus d'options..."
 
-#: ajax_forms/getAdminWorkflowForm.php:89 ajax_forms/getAttachmentForm.php:35
-#: ajax_forms/getUpdateProductForm.php:330
-#: ajax_htmldata/getAttachmentDetails.php:47
-msgid "Type:"
-msgstr "Type:"
+#: index.php:344 admin.php:72
+msgid "Note Type"
+msgstr "Type de note"
 
-#: ajax_forms/getAdminWorkflowForm.php:114
-msgid "Workflow Steps"
-msgstr "Étapes du Workflow"
+#: index.php:374
+msgid "Note (contains)"
+msgstr "Note (contient)"
 
-#: ajax_forms/getAdminWorkflowForm.php:123 ajax_forms/getAttachmentForm.php:27
-#: ajax_forms/getContactForm.php:43 ajax_forms/getNewResourceForm.php:100
-#: ajax_forms/getUpdateProductForm.php:91
-msgid "Name:"
-msgstr "Nom:"
+#: index.php:386
+msgid "Date Created Between"
+msgstr "Date de création entre"
 
-#: ajax_forms/getAdminWorkflowForm.php:124
-msgid "Approval/Notification Group:"
-msgstr "Approbation/Notification de groupe"
+#: index.php:388
+msgid "and"
+msgstr "et"
 
-#: ajax_forms/getAdminWorkflowForm.php:125
-msgid "Parent Step"
-msgstr "Étape parent"
+#: index.php:402
+msgid "Purchase Site"
+msgstr "Site d'acquisition"
 
-#: ajax_forms/getAdminWorkflowForm.php:155
-msgid "add step"
-msgstr "Ajouter étape"
+#: index.php:434 admin.php:63
+msgid "Authorized Site"
+msgstr "Site autorisé"
 
-#: ajax_forms/getAdminWorkflowForm.php:238 js/forms/workflowForm.js:201
-#: js/forms/workflowForm.js:202
-msgid "remove this step"
-msgstr "Effacer étape"
+#: index.php:466 admin.php:56
+msgid "Administering Site"
+msgstr "Site d'administration"
 
-#: ajax_forms/getAttachmentForm.php:16
-msgid "Edit Attachment"
-msgstr "Modifier pièce jointe"
+#: index.php:496 admin.php:62
+msgid "Authentication Type"
+msgstr "Type d'accès"
 
-#: ajax_forms/getAttachmentForm.php:16
-msgid "Add Attachment"
-msgstr "Ajouter pièce jointe"
+#: index.php:526 admin.php:64
+msgid "Cataloging Status"
+msgstr "Statut de catalogage"
 
-#: ajax_forms/getAttachmentForm.php:55
-msgid "File:"
-msgstr "Fichier:"
+#: index.php:553 ajax_htmldata/getOutstandingQueue.php:22
+msgid "Routing Step"
+msgstr "Étape de routage"
 
-#: ajax_forms/getAttachmentForm.php:61
-msgid "replace with new file"
-msgstr "remplacer par un nouveau fichier"
+#: ajax_forms.php:25
+msgid "Form action "
+msgstr "Action "
 
-#: ajax_forms/getAttachmentForm.php:76
-#: ajax_htmldata/getAttachmentDetails.php:55
-msgid "Details:"
-msgstr "Détails:"
+#: ajax_forms.php:25 ajax_htmldata.php:27 ajax_processing.php:27
+msgid " not set up!"
+msgstr "Non défini!"
 
-#: ajax_forms/getContactForm.php:30
-msgid "Edit Contact"
-msgstr "Modifier contact"
+#: import.php:22
+msgid "Resources import"
+msgstr "Import de ressources"
 
-#: ajax_forms/getContactForm.php:30
-msgid "Add Contact"
-msgstr "Ajouter contact"
+#: import.php:24
+msgid "CSV File import"
+msgstr "Import d'un fichier CSV"
 
-#: ajax_forms/getContactForm.php:50 ajax_htmldata/getContactDetails.php:100
-msgid "Title:"
-msgstr "Titre:"
+#: import.php:32
+msgid "The file has been successfully uploaded."
+msgstr "Le fichier a été téléchargé."
 
-#: ajax_forms/getContactForm.php:57 ajax_htmldata/getContactDetails.php:133
-msgid "Phone:"
-msgstr "Téléphone:"
+#: import.php:42
+msgid "Unable to get columns headers from the file"
+msgstr "Impossible d'obtenir les noms des colonnes du fichier"
 
-#: ajax_forms/getContactForm.php:64 ajax_htmldata/getContactDetails.php:141
-msgid "Alt Phone:"
-msgstr "Téléphone Alt:"
+#: import.php:45
+msgid "Unable to open the uploaded file"
+msgstr "Impossible d'ouvrir le fichier téléchargé"
 
-#: ajax_forms/getContactForm.php:71 ajax_htmldata/getContactDetails.php:149
-msgid "Fax:"
-msgstr "Fax:"
+#: import.php:48
+msgid "Unable to upload the file"
+msgstr "Impossible de télécharger le fichier"
 
-#: ajax_forms/getContactForm.php:78 ajax_htmldata/getContactDetails.php:157
-msgid "Email:"
-msgstr "Email:"
+#: import.php:51
+msgid "Error: "
+msgstr "Erreur: "
 
-#: ajax_forms/getContactForm.php:85 ajax_htmldata/getContactDetails.php:108
-msgid "Address:"
-msgstr "Adresse:"
+#: import.php:53
+msgid "Please choose columns from your CSV file:"
+msgstr "Choisissez les colonnes de votre fichier CSV:"
 
-#: ajax_forms/getContactForm.php:92 ajax_forms/getUpdateProductForm.php:208
-#: ajax_htmldata/getProductDetails.php:90
-msgid "Archived:"
-msgstr "Archivé:"
+#: import.php:86
+msgid "Settings"
+msgstr "Configuration"
 
-#: ajax_forms/getContactForm.php:102
-msgid "Role(s):"
-msgstr "Rôle(s):"
+#: import.php:87
+msgid "Importing and deduping isbnOrISSN on the following columns: "
+msgstr ""
+"Importation et dédoublonnage d'isbnOrISSN dans les colonnes suivantes: "
 
-#: ajax_forms/getCostForm.php:48
-msgid "Edit Cost Information"
-msgstr "Modifier information de coût"
+#: import.php:143
+msgid "Organization "
+msgstr "Organisation"
 
-#: ajax_forms/getCostForm.php:55 ajax_htmldata/getAcquisitionsDetails.php:169
-#: summary.php:485
-msgid "Cost History"
-msgstr "Historique de coût"
+#: import.php:143
+msgid " could not be added."
+msgstr " ne pu pas être ajouté."
 
-#: ajax_forms/getCostForm.php:62 ajax_htmldata/getAcquisitionsDetails.php:178
-msgid "Year"
-msgstr "Année"
+#: import.php:152 import.php:195
+msgid "Error: more than one organization is called "
+msgstr "Erreur: Plus d'une organisation a été appelée"
 
-#: ajax_forms/getCostForm.php:63 ajax_htmldata/getAcquisitionsDetails.php:179
-msgid "Sub Start"
-msgstr "Début d'abonnement"
+#: import.php:152
+msgid ". Please consider deduping."
+msgstr ". Considérez un dédoublonnage."
 
-#: ajax_forms/getCostForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:180
-msgid "Sub End"
-msgstr "Fin d'abonnement"
+#: import.php:174
+msgid "Unable to associate organization "
+msgstr "Impossible d'associer l'organisation "
 
-#: ajax_forms/getCostForm.php:66 ajax_htmldata/getAcquisitionsDetails.php:182
-#: index.php:90
-msgid "Fund"
-msgstr "Fonds"
+#: import.php:174
+msgid " with its role."
+msgstr " avec le rôle."
 
-#: ajax_forms/getCostForm.php:67 ajax_htmldata/getAcquisitionsDetails.php:183
-msgid "Payment"
-msgstr "Paiement"
+#: import.php:195
+msgid " Please consider deduping."
+msgstr "Considérez un dédoublonnage."
 
-#: ajax_forms/getCostForm.php:68 ajax_htmldata/getAcquisitionsDetails.php:187
-msgid "Type"
-msgstr "Type"
+#: import.php:253
+msgid "Results"
+msgstr "Résultats"
 
-#: ajax_forms/getCostForm.php:72
-msgid "Note"
-msgstr "Note"
+#: import.php:254
+msgid " rows have been processed. "
+msgstr " lignes ont été traitées. "
 
-#: ajax_forms/getCostForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:193
-msgid "Invoice"
-msgstr "Facture"
+#: import.php:254
+msgid " rows have been inserted."
+msgstr " lignes ont été insérées."
 
-#: ajax_forms/getCostForm.php:138
-msgid "add this payment"
-msgstr "Ajouter paiement"
+#: import.php:255
+msgid " parents have been created. "
+msgstr " parents ont été créés. "
 
-#: ajax_forms/getCostForm.php:138
-msgid "add payment"
-msgstr "Ajouter paiement"
+#: import.php:255
+msgid " resources have been attached to an existing parent."
+msgstr " ressources ont été ajoutées dans un parent existant."
 
-#: ajax_forms/getCostForm.php:222 js/forms/acquisitionsForm.js:147
-#: js/forms/acquisitionsForm.js:148 js/forms/costForm.js:132
-#: js/forms/costForm.js:133
-msgid "remove this payment"
-msgstr "Supprimer paiement"
+#: import.php:256
+msgid " organizations have been created"
+msgstr " organisations ont été créées"
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:18
-msgid "Add / Edit Subject Relationships"
-msgstr "Ajouter / Modifier liens sujets"
+#: import.php:258
+msgid " resources have been attached to an existing organization."
+msgstr " ressources ont été ajoutées dans une organisation existante."
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:27
-#: ajax_htmldata/getAdminSubjectDisplay.php:98 index.php:251
-msgid "General Subject"
-msgstr "Sujet général"
+#: import.php:263
+msgid ""
+"The first line of the CSV file must contain column names, and not data. "
+"These names will be used during the import process."
+msgstr ""
+"La première ligne du fichier CSV doit contenir le noms des colonnes, et pas "
+"des données. Ces noms seront utilisés pendant le processus d'importation."
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:53
-msgid "Detailed Subjects"
-msgstr "Sujet détaillé"
+#: import.php:266
+msgid "File selection"
+msgstr "Sélection du fichier"
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:75
-msgid "add detail subject"
-msgstr "Ajouter sujet détaillé"
+#: import.php:267
+msgid "CSV File"
+msgstr "Fichier CSV"
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:105
-msgid "remove detailed subject"
-msgstr "Supprimer sujet détaillé"
+#: import.php:271
+msgid "Import options"
+msgstr "Options d'importation"
 
-#: ajax_forms/getGeneralDetailSubjectForm.php:107
-#: ajax_htmldata/getAdminSubjectDisplay.php:30
-#: ajax_htmldata/getAdminSubjectDisplay.php:71
-msgid "subject in use"
-msgstr "Sujet en utilisation"
+#: import.php:272
+msgid "CSV delimiter"
+msgstr "Délimiteur CSV"
 
-#: ajax_forms/getLicenseForm.php:50
-msgid "Edit Licenses"
-msgstr "Modifier licences"
+#: import.php:274
+msgid "(comma)"
+msgstr "(virgule)"
 
-#: ajax_forms/getLicenseForm.php:60
-msgid "License Records"
-msgstr "Fiches licence"
+#: import.php:275
+msgid "(semicolon)"
+msgstr "(point-virgule)"
 
-#: ajax_forms/getLicenseForm.php:76
-msgid "add license"
-msgstr "Ajouter licence"
+#: import.php:276
+msgid "(pipe)"
+msgstr "(pipe)"
 
-#: ajax_forms/getLicenseForm.php:103
-msgid "remove license link"
-msgstr "Supprimer lien de la licence"
+#: import.php:279
+msgid "Upload"
+msgstr "Télécharger"
 
-#: ajax_forms/getLicenseForm.php:103 ajax_forms/getUpdateProductForm.php:300
-msgid "remove "
-msgstr "Supprimer "
+#: ajax_htmldata.php:27
+msgid "Data action "
+msgstr "Data Action "
 
-#: ajax_forms/getLicenseForm.php:103
-msgid " license"
-msgstr "licence"
+#: setuser.php:44
+msgid ""
+"LDAP Connection is not working or has timed out.  Please check configuration."
+"ini to verify settings."
+msgstr ""
+"La connexion LDAP ne marche pas ou a expiré. S'il vous plaît vérifiez la "
+"configuration du configuration.ini."
 
-#: ajax_forms/getLicenseForm.php:128
-msgid "Licensing Status"
-msgstr "Statut des licences"
+#: ajax_processing.php:27
+msgid "Processing action "
+msgstr ""
 
-#: ajax_forms/getLicenseForm.php:136
-#: ajax_htmldata/getAcquisitionsDetails.php:270
-#: ajax_htmldata/getProductDetails.php:80 summary.php:212 summary.php:516
-msgid "Status:"
-msgstr "Statut:"
+#: sendAlerts.php:76
+msgid "No Resources found fitting alert day criteria"
+msgstr "Aucune ressource ne répond aux critères d'alerte du jour"
 
-#: ajax_forms/getLicenseForm.php:160
-msgid "History:"
-msgstr "Historique:"
+#: sendAlerts.php:81
+msgid "Alerts not enabled in configuration.ini file"
+msgstr "Les alertes ne sont pas activées dans le fichier configuration.ini"
 
-#: ajax_forms/getLicenseForm.php:166 ajax_htmldata/getAccessDetails.php:173
-#: ajax_htmldata/getAcquisitionsDetails.php:276
-#: ajax_htmldata/getAcquisitionsDetails.php:370
-#: ajax_htmldata/getProductDetails.php:99
-#: ajax_htmldata/getProductDetails.php:101
-#: ajax_htmldata/getProductDetails.php:124
-#: ajax_htmldata/getProductDetails.php:126
-#: ajax_htmldata/getProductDetails.php:148
-#: ajax_htmldata/getProductDetails.php:150
-#: ajax_htmldata/getProductDetails.php:422
-#: ajax_htmldata/getRoutingDetails.php:48
-#: ajax_htmldata/getRoutingDetails.php:50
-#: ajax_htmldata/getRoutingDetails.php:77
-#: ajax_htmldata/getRoutingDetails.php:79 resources/cataloging.php:223
-#: summary.php:226 summary.php:252 summary.php:407 summary.php:522
-#: summary.php:598 summary.php:720 summary.php:833
-msgid " by "
-msgstr " par "
+#: admin.php:22 admin.php:40
+msgid "Administration"
+msgstr "Administration"
 
-#: ajax_forms/getLicenseForm.php:169
-#: ajax_htmldata/getAcquisitionsDetails.php:279 summary.php:525
-msgid "No license status information available."
-msgstr "L'information de statut de la licence n'est pas disponible."
+#: admin.php:51 ajax_htmldata/getAdminWorkflowDisplay.php:74
+#: ajax_htmldata/getAdminUserDisplay.php:19
+msgid "Users"
+msgstr "Utilisateurs"
 
-#: ajax_forms/getNewResourceForm.php:84
-msgid "Edit Saved Resource"
-msgstr "Modifier ressource enregistrée"
+#: admin.php:52
+msgid "Workflow / User Group"
+msgstr "Workflow / Groupe d'utilisateur"
 
-#: ajax_forms/getNewResourceForm.php:84
-msgid "Add New Resource"
-msgstr "Ajouter ressource"
+#: admin.php:53
+msgid "Access Method"
+msgstr "Mèthode d'accès"
 
-#: ajax_forms/getNewResourceForm.php:85
-msgid "required fields"
-msgstr "champs obligatoires"
+#: admin.php:54
+msgid "Account Type"
+msgstr "Type de compte"
 
-#: ajax_forms/getNewResourceForm.php:91 ajax_forms/getUpdateProductForm.php:81
-msgid "Product"
-msgstr "Produit"
+#: admin.php:58 ajax_htmldata/getAdminAlertDisplay.php:10
+msgid "Alert Settings"
+msgstr "Configuration des alertes"
 
-#: ajax_forms/getNewResourceForm.php:105
-#: ajax_forms/getUpdateProductForm.php:96
-#: ajax_htmldata/getProductDetails.php:265 summary.php:355
-msgid "Description:"
-msgstr "Description:"
+#: admin.php:60
+msgid "Alias Type"
+msgstr "Type d'alias"
 
-#: ajax_forms/getNewResourceForm.php:110
-msgid "Provider:"
-msgstr "Fournisseur:"
+#: admin.php:61
+msgid "Attachment Type"
+msgstr "Type de pièce jointe"
 
-#: ajax_forms/getNewResourceForm.php:120
-#: ajax_forms/getUpdateProductForm.php:106
-#: ajax_htmldata/getProductDetails.php:257 summary.php:347
-msgid "Alt URL:"
-msgstr "URL Alt:"
+#: admin.php:65
+msgid "CatalogingType"
+msgstr "Type de catalogage"
 
-#: ajax_forms/getNewResourceForm.php:131
-msgid "Format"
-msgstr "Format"
+#: admin.php:66
+msgid "Contact Role"
+msgstr "Rôle"
 
-#: ajax_forms/getNewResourceForm.php:269
-#: ajax_htmldata/getAcquisitionsDetails.php:191
-msgid "Notes"
-msgstr "Notes"
+#: admin.php:68 ajax_forms/getCostForm.php:70
+msgid "Cost Details"
+msgstr "Détails du coût"
 
-#: ajax_forms/getNewResourceForm.php:278
-msgid "Include any additional information"
-msgstr "Inclure information supplémentaire"
+#: admin.php:70 ajax_htmldata/getAdminCurrencyDisplay.php:8
+msgid "Currency"
+msgstr "Devise"
 
-#: ajax_forms/getNewResourceForm.php:294
-msgid "save"
-msgstr "enregistrer"
+#: admin.php:71
+msgid "License Status"
+msgstr "Statut de la licence"
 
-#: ajax_forms/getNoteForm.php:18
-msgid "Edit Note"
-msgstr "Modifier note"
+#: admin.php:73
+msgid "Order Type"
+msgstr "Type de commande"
 
-#: ajax_forms/getNoteForm.php:18
-msgid "Add Note"
+#: admin.php:81
+msgid "Organization Role"
+msgstr "Rôle dans l'organisation"
+
+#: admin.php:82
+msgid "Organizations"
+msgstr "Organisations"
+
+#: admin.php:86
+msgid "Purchasing Site"
+msgstr "Site d'acquisition"
+
+#: admin.php:89
+msgid "Storage Location"
+msgstr "Lieu de stockage"
+
+#: admin.php:90 ajax_htmldata/getProductDetails.php:301
+msgid "Subjects"
+msgstr "Sujets"
+
+#: admin.php:91
+msgid "User Limit"
+msgstr "Limite utilisateurs"
+
+#: admin.php:119
+msgid "You do not have permissions to access this screen."
+msgstr "Vous n'avez pas la permission d'accéder à cette page."
+
+#: resources/cataloging_edit.php:15
+msgid "Edit Cataloging"
+msgstr "Modifier catalogage"
+
+#: resources/cataloging_edit.php:24
+msgid "Record Set"
+msgstr "Jeu d'enregistrement"
+
+#: resources/cataloging_edit.php:36
+msgid "Identifier"
+msgstr "Identifiant"
+
+#: resources/cataloging_edit.php:42
+msgid "Source URL"
+msgstr "Source URL"
+
+#: resources/cataloging_edit.php:68
+msgid "# Records Available"
+msgstr "# Fiches disponibles"
+
+#: resources/cataloging_edit.php:75
+msgid "# Records Loaded"
+msgstr "# Fiches chargées"
+
+#: resources/cataloging_edit.php:82
+msgid "OCLC Holdings"
+msgstr "OCLC Holdings"
+
+#: resources/cataloging_edit.php:102 ajax_forms/getAccountForm.php:86
+#: ajax_forms/getAdminCurrencyUpdateForm.php:38
+#: ajax_forms/getAttachmentForm.php:89
+#: ajax_forms/getGeneralSubjectUpdateForm.php:38
+#: ajax_forms/getAdminUserGroupForm.php:147 ajax_forms/getCostForm.php:252
+#: ajax_forms/getGeneralDetailSubjectForm.php:128
+#: ajax_forms/getNoteForm.php:61 ajax_forms/getLicenseForm.php:191
+#: ajax_forms/getDetailSubjectUpdateForm.php:38
+#: ajax_forms/getNewResourceForm.php:295 ajax_forms/getContactForm.php:161
+#: ajax_forms/getAdminUserUpdateForm.php:66
+#: ajax_forms/getUpdateProductForm.php:423
+#: ajax_forms/getAdminAlertEmailForm.php:34
+#: ajax_forms/getAdminUpdateForm.php:44 ajax_forms/getAccessForm.php:251
+#: ajax_forms/getAdminWorkflowForm.php:266
+#: ajax_forms/getAdminAlertDaysForm.php:34 ajax_forms/getOrderForm.php:160
+msgid "submit"
+msgstr "soumettre"
+
+#: resources/cataloging_edit.php:103 ajax_forms/getAccountForm.php:87
+#: ajax_forms/getAdminCurrencyUpdateForm.php:39
+#: ajax_forms/getAttachmentForm.php:90
+#: ajax_forms/getGeneralSubjectUpdateForm.php:39
+#: ajax_forms/getAdminUserGroupForm.php:148
+#: ajax_forms/getResourceSubjectForm.php:49 ajax_forms/getCostForm.php:253
+#: ajax_forms/getGeneralDetailSubjectForm.php:129
+#: ajax_forms/getNoteForm.php:62 ajax_forms/getLicenseForm.php:192
+#: ajax_forms/getDetailSubjectUpdateForm.php:39
+#: ajax_forms/getNewResourceForm.php:296 ajax_forms/getContactForm.php:162
+#: ajax_forms/getAdminUserUpdateForm.php:67
+#: ajax_forms/getUpdateProductForm.php:424
+#: ajax_forms/getAdminAlertEmailForm.php:35
+#: ajax_forms/getAdminUpdateForm.php:45 ajax_forms/getAccessForm.php:252
+#: ajax_forms/getAdminWorkflowForm.php:267
+#: ajax_forms/getAdminAlertDaysForm.php:35 ajax_forms/getOrderForm.php:161
+msgid "cancel"
+msgstr "annuler"
+
+#: resources/cataloging.php:106 ajax_htmldata/getAcquisitionsDetails.php:100
+#: ajax_htmldata/getAcquisitionsDetails.php:159
+msgid "edit order information"
+msgstr "Modifier information de commande"
+
+#: resources/cataloging.php:120
+msgid "Source URL:"
+msgstr "Source URL:"
+
+#: resources/cataloging.php:121
+msgid "Visit Source URL"
+msgstr "Source URL de visite"
+
+#: resources/cataloging.php:141
+msgid "Number of Records Available"
+msgstr "Nombre d'enregistrements disponibles"
+
+#: resources/cataloging.php:147
+msgid "Number of Records Loaded"
+msgstr "Nombre de fiches chargées"
+
+#: resources/cataloging.php:165
+msgid "edit cataloging details"
+msgstr "Modifier détails de catalogage"
+
+#: resources/cataloging.php:209 ajax_htmldata/getAcquisitionsDetails.php:356
+#: ajax_htmldata/getAccessDetails.php:159
+#: ajax_htmldata/getProductDetails.php:408
+msgid "Additional Notes"
+msgstr "Notes additionnelles"
+
+#: resources/cataloging.php:212 resources/cataloging.php:231
+#: ajax_htmldata/getAcquisitionsDetails.php:359
+#: ajax_htmldata/getAcquisitionsDetails.php:378
+#: ajax_htmldata/getAccessDetails.php:162
+#: ajax_htmldata/getAccessDetails.php:181
+#: ajax_htmldata/getProductDetails.php:411
+#: ajax_htmldata/getProductDetails.php:430
+msgid "add new note"
 msgstr "Ajouter note"
 
-#: ajax_forms/getNoteForm.php:28
-msgid "Note Type:"
-msgstr "Type de note:"
+#: resources/cataloging.php:220 ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getProductDetails.php:419
+msgid "edit note"
+msgstr "Modifier note"
 
-#: ajax_forms/getOrderForm.php:33
-msgid "Edit Acquisitions Information"
-msgstr "Modifier information d'acquisition"
+#: resources/cataloging.php:220 ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getContactDetails.php:69
+#: ajax_htmldata/getProductDetails.php:419
+msgid "remove note"
+msgstr "Supprimer note"
+
+#: ajax_processing/removeResourceSubjectRelationship.php:10
+msgid "Subject successfully removed."
+msgstr "Sujet enlevé."
+
+#: ajax_processing/deleteDetailedSubject.php:12
+#: ajax_processing/deleteInstance.php:18
+#: ajax_processing/deleteGeneralSubject.php:12
+msgid ""
+"Unable to delete.  Please make sure no resources are set up with this "
+"information."
+msgstr ""
+"Impossible de supprimer. Vérifiez qu'i ln'y a pas de ressource ayant cette "
+"information."
+
+#: ajax_processing/updateUserData.php:26
+msgid "User successfully saved."
+msgstr "Utilisateur enregistré."
+
+#: ajax_processing/uploadAttachment.php:29
+msgid "There was a problem saving your file to "
+msgstr "Il y a eu un problème pour enregistrer votre fichier sur "
+
+#: ajax_processing/uploadAttachment.php:29
+msgid ".  Please ensure your attachments directory is writable."
+msgstr ""
+". S'il vous plaît assurez-vous que votre dossier des pièces jointes est "
+"accessible en écriture."
+
+#: ajax_processing/updateGeneralSubject.php:21
+#: ajax_processing/updateDetailedSubject.php:22
+msgid "A duplicate "
+msgstr "Doublon "
+
+#: ajax_processing/updateGeneralSubject.php:21
+#: ajax_processing/updateDetailedSubject.php:22
+msgid " exists."
+msgstr " existant."
+
+#: ajax_processing/deleteResourceNote.php:7
+msgid "Note successfully deleted."
+msgstr "Note supprimée."
+
+#: ajax_processing/deleteResourceAndChildren.php:8
+#: ajax_processing/deleteResource.php:7
+msgid "Resource successfully deleted."
+msgstr "Ressource supprimée"
+
+#: ajax_processing/deleteInstance.php:12
+msgid "Unable to delete  - this "
+msgstr "Impossible de supprimer - "
+
+#: ajax_processing/deleteInstance.php:12
+msgid ""
+" is in use.  Please make sure no resources are set up with this information."
+msgstr ""
+" est utilisé. Assurez-vous  qu'aucune ressource n'est configurée avec cet "
+"information."
+
+#: templates/header.php:74
+msgid ""
+"JavaScript must be enabled in order for you to use CORAL. However, it seems "
+"JavaScript is either disabled or not supported by your browser. To use "
+"CORAL, enable JavaScript by changing your browser options, then "
+msgstr ""
+"JavaScript doit être activé pour utiliser CORAL. JavaScript est désactivé ou "
+"n'est pas supporté par votre navigateur. Pour utiliser CORAL, activez "
+"JavaScript en modifiant la configuration de votre navigateur, puis"
+
+#: templates/header.php:74
+msgid "try again"
+msgstr "réessayez"
+
+#: templates/header.php:93
+msgid "Hello, "
+msgstr "Bonjour, "
+
+#: templates/header.php:104
+msgid "logout"
+msgstr "Se déconnecter"
+
+#: templates/header.php:106
+msgid "(Test)"
+msgstr "(Test)"
+
+#: templates/header.php:116
+msgid "New Resource"
+msgstr "Nouvelle ressource"
+
+#: templates/header.php:117
+msgid "Import"
+msgstr "Importer"
+
+#: templates/header.php:118
+msgid "Admin"
+msgstr "Administrer"
+
+#: templates/header.php:134
+msgid "Change Module"
+msgstr "Changer le module"
+
+#: templates/header.php:177
+msgid "Invalid translation route!"
+msgstr "Le chemin des traductions n'est pas valide!"
+
+#: ajax_forms/getAccountForm.php:17
+msgid "Edit Account"
+msgstr "Modifier compte"
+
+#: ajax_forms/getAccountForm.php:17
+msgid "Add Account"
+msgstr "Ajouter compte"
+
+#: ajax_forms/getAccountForm.php:27
+msgid "Login Type:"
+msgstr "Type de connexion:"
+
+#: ajax_forms/getAccountForm.php:51 ajax_htmldata/getAccountDetails.php:96
+msgid "Registered Email:"
+msgstr "Email enregistré:"
+
+#: ajax_forms/getAccountForm.php:58 ajax_forms/getAccessForm.php:90
+msgid "Username:"
+msgstr "Nom d'utilisateur:"
+
+#: ajax_forms/getAccountForm.php:65 ajax_forms/getAccessForm.php:109
+#: ajax_htmldata/getAccountDetails.php:80
+msgid "Password:"
+msgstr "Mot de passe:"
+
+#: ajax_forms/getAccountForm.php:72 ajax_forms/getNoteForm.php:48
+#: ajax_forms/getContactForm.php:138 ajax_htmldata/getAccountDetails.php:104
+#: ajax_htmldata/getContactDetails.php:165
+msgid "Notes:"
+msgstr "Notes:"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:14
+msgid "Edit Currency"
+msgstr "Modifier la devise"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:14
+msgid "Add Currency"
+msgstr "Ajouter la devise"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:24
+#: ajax_htmldata/getAdminCurrencyDisplay.php:14
+msgid "Code"
+msgstr "Code"
+
+#: ajax_forms/getAdminCurrencyUpdateForm.php:27
+#: ajax_htmldata/getOutstandingQueue.php:20 ajax_htmldata/getSavedQueue.php:18
+#: ajax_htmldata/getSubmittedQueue.php:15
+#: ajax_htmldata/getSearchResources.php:113
+#: ajax_htmldata/getAdminCurrencyDisplay.php:15
+msgid "Name"
+msgstr "Nom"
+
+#: ajax_forms/getAttachmentForm.php:16
+msgid "Edit Attachment"
+msgstr "Modifier pièce jointe"
+
+#: ajax_forms/getAttachmentForm.php:16
+msgid "Add Attachment"
+msgstr "Ajouter pièce jointe"
+
+#: ajax_forms/getAttachmentForm.php:27 ajax_forms/getNewResourceForm.php:100
+#: ajax_forms/getContactForm.php:43 ajax_forms/getUpdateProductForm.php:91
+#: ajax_forms/getAdminWorkflowForm.php:123
+msgid "Name:"
+msgstr "Nom:"
+
+#: ajax_forms/getAttachmentForm.php:35 ajax_forms/getUpdateProductForm.php:330
+#: ajax_forms/getAdminWorkflowForm.php:89
+#: ajax_htmldata/getAttachmentDetails.php:47
+msgid "Type:"
+msgstr "Type:"
+
+#: ajax_forms/getAttachmentForm.php:55
+msgid "File:"
+msgstr "Fichier:"
+
+#: ajax_forms/getAttachmentForm.php:61
+msgid "replace with new file"
+msgstr "remplacer par un nouveau fichier"
+
+#: ajax_forms/getAttachmentForm.php:76
+#: ajax_htmldata/getAttachmentDetails.php:55
+msgid "Details:"
+msgstr "Détails:"
+
+#: ajax_forms/getGeneralSubjectUpdateForm.php:16
+#: ajax_forms/getDetailSubjectUpdateForm.php:16
+#: ajax_forms/getAdminUpdateForm.php:16
+msgid "Edit "
+msgstr "Modifier"
+
+#: ajax_forms/getGeneralSubjectUpdateForm.php:16
+#: ajax_forms/getDetailSubjectUpdateForm.php:16
+#: ajax_forms/getAdminUpdateForm.php:16
+msgid "Add "
+msgstr "Ajouter"
 
-#: ajax_forms/getOrderForm.php:40 ajax_htmldata/getAcquisitionsDetails.php:98
-#: summary.php:422
-msgid "Order"
-msgstr "Commande"
+#: ajax_forms/getAdminUserGroupForm.php:17
+msgid "Edit User Group"
+msgstr "Modifier le groupe d'utilisateur"
 
-#: ajax_forms/getOrderForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:115
-#: summary.php:436
-msgid "Order Number:"
-msgstr "Numéro de commande:"
+#: ajax_forms/getAdminUserGroupForm.php:17
+msgid "Add User Group"
+msgstr "Ajouter un groupe d'utilisateur"
 
-#: ajax_forms/getOrderForm.php:69 ajax_htmldata/getAcquisitionsDetails.php:122
-#: summary.php:443
-msgid "System Number:"
-msgstr "Numéro système:"
+#: ajax_forms/getAdminUserGroupForm.php:26
+msgid "User Group"
+msgstr "Groupe d'utilisateur"
 
-#: ajax_forms/getOrderForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:143
-#: summary.php:466
-msgid "Sub Start:"
-msgstr "Début d'abonnement:"
+#: ajax_forms/getAdminUserGroupForm.php:34
+msgid "Group Name:"
+msgstr "Nom du groupe"
 
-#: ajax_forms/getOrderForm.php:79 summary.php:473
-msgid "Current Sub End:"
-msgstr "Fin d'abonnement courant:"
+#: ajax_forms/getAdminUserGroupForm.php:41
+msgid "Email Address:"
+msgstr "Adresse email"
 
-#: ajax_forms/getOrderForm.php:89
-msgid "Enable Alert"
-msgstr "Activer l'alerte"
+#: ajax_forms/getAdminUserGroupForm.php:58
+msgid "Assigned Users"
+msgstr "Utilisateurs assignés"
 
-#: ajax_forms/getOrderForm.php:111
-msgid "Purchasing Site(s)"
-msgstr "Site d'achat(s)"
+#: ajax_forms/getAdminUserGroupForm.php:82
+msgid "add user"
+msgstr "Ajouter utilisateur"
+
+#: ajax_forms/getAdminUserGroupForm.php:121
+msgid "remove user from group"
+msgstr "Supprimer un utilisateur du groupe"
 
 #: ajax_forms/getResourceSubjectForm.php:7
 msgid "Add General / Detail Subject Link"
@@ -794,562 +1069,450 @@ msgid "add"
 msgstr "Ajouter"
 
 #: ajax_forms/getResourceSubjectForm.php:45
-#: ajax_htmldata/getAdminAlertDisplay.php:35
-#: ajax_htmldata/getAdminAlertDisplay.php:65
 #: ajax_htmldata/getAdminDisplay.php:35
+#: ajax_htmldata/getGeneralSubjectDisplay.php:35
 #: ajax_htmldata/getAdminSubjectDisplay.php:41
 #: ajax_htmldata/getAdminSubjectDisplay.php:81
 #: ajax_htmldata/getAdminSubjectDisplay.php:124
-#: ajax_htmldata/getAdminUserDisplay.php:58
 #: ajax_htmldata/getAdminWorkflowDisplay.php:49
 #: ajax_htmldata/getAdminWorkflowDisplay.php:100
-#: ajax_htmldata/getGeneralSubjectDisplay.php:35
+#: ajax_htmldata/getAdminAlertDisplay.php:35
+#: ajax_htmldata/getAdminAlertDisplay.php:65
+#: ajax_htmldata/getAdminUserDisplay.php:58
 msgid "(none found)"
 msgstr "(non trouvé)"
 
-#: ajax_forms/getUpdateProductForm.php:72
-msgid "Edit Resource"
-msgstr "Modifier ressource"
-
-#: ajax_forms/getUpdateProductForm.php:118
-msgid "Parents:"
-msgstr "Parents:"
-
-#: ajax_forms/getUpdateProductForm.php:124
-msgid "add Parent resource"
-msgstr "Ajouter ressource père"
-
-#: ajax_forms/getUpdateProductForm.php:124
-msgid "add Parent Resource"
-msgstr "Ajouter ressource père"
-
-#: ajax_forms/getUpdateProductForm.php:137 js/forms/resourceUpdateForm.js:286
-msgid "remove parent"
-msgstr "Enlever parent"
-
-#: ajax_forms/getUpdateProductForm.php:148
-#: ajax_htmldata/getProductDetails.php:197 summary.php:292
-msgid "ISSN / ISBN:"
-msgstr "ISSN / ISBN:"
-
-#: ajax_forms/getUpdateProductForm.php:152
-msgid "add Isbn"
-msgstr "Ajouter ISBN"
-
-#: ajax_forms/getUpdateProductForm.php:237
-msgid "Role:"
-msgstr "Rôle:"
-
-#: ajax_forms/getUpdateProductForm.php:238
-#: ajax_htmldata/getContactDetails.php:83
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: ajax_forms/getUpdateProductForm.php:260
-msgid "add organization"
-msgstr "Ajouter organisation"
-
-#: ajax_forms/getUpdateProductForm.php:300
-msgid "remove organization"
-msgstr "Supprimer organisation"
-
-#: ajax_forms/getUpdateProductForm.php:300
-msgid "organization"
-msgstr "organisation"
-
-#: ajax_forms/getUpdateProductForm.php:322
-msgid "Aliases"
-msgstr "Alias"
-
-#: ajax_forms/getUpdateProductForm.php:331
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ajax_forms/getUpdateProductForm.php:353
-msgid "add this alias"
-msgstr "Ajouter alias"
-
-#: ajax_forms/getUpdateProductForm.php:353
-msgid "add alias"
-msgstr "Ajouter alias"
-
-#: ajax_forms/getUpdateProductForm.php:394 js/forms/resourceUpdateForm.js:232
-#: js/forms/resourceUpdateForm.js:233
-msgid "remove this alias"
-msgstr "Supprimer alias"
-
-#: ajax_htmldata.php:27
-msgid "Data action "
-msgstr "Data Action "
-
-#: ajax_htmldata/getAccessDetails.php:31 summary.php:612
-msgid "Access Information"
-msgstr "Information d'accès"
-
-#: ajax_htmldata/getAccessDetails.php:35
-#: ajax_htmldata/getAccessDetails.php:170
-#: ajax_htmldata/getAccountDetails.php:44
-#: ajax_htmldata/getAcquisitionsDetails.php:100
-#: ajax_htmldata/getAcquisitionsDetails.php:171
-#: ajax_htmldata/getAcquisitionsDetails.php:264
-#: ajax_htmldata/getAcquisitionsDetails.php:367
-#: ajax_htmldata/getAdminAlertDisplay.php:25
-#: ajax_htmldata/getAdminAlertDisplay.php:55
-#: ajax_htmldata/getAdminCurrencyDisplay.php:25
-#: ajax_htmldata/getAdminDisplay.php:25
-#: ajax_htmldata/getAdminSubjectDisplay.php:66
-#: ajax_htmldata/getAdminSubjectDisplay.php:115
-#: ajax_htmldata/getAdminUserDisplay.php:47
-#: ajax_htmldata/getAdminWorkflowDisplay.php:39
-#: ajax_htmldata/getAdminWorkflowDisplay.php:90
-#: ajax_htmldata/getAttachmentDetails.php:35
-#: ajax_htmldata/getContactDetails.php:68
-#: ajax_htmldata/getGeneralSubjectDisplay.php:25
-#: ajax_htmldata/getProductDetails.php:69
-#: ajax_htmldata/getProductDetails.php:419 ajax_htmldata/getSavedQueue.php:49
-msgid "edit"
-msgstr "Modifier"
-
-#: ajax_htmldata/getAccessDetails.php:35
-#: ajax_htmldata/getAcquisitionsDetails.php:264
-#: ajax_htmldata/getProductDetails.php:69
-msgid "edit resource"
-msgstr "Modifier ressource"
-
-#: ajax_htmldata/getAccessDetails.php:43 summary.php:626
-msgid "Administering Sites:"
-msgstr "Administration sites:"
-
-#: ajax_htmldata/getAccessDetails.php:50 summary.php:458
-msgid "Authorized Sites:"
-msgstr "Sites autorisés:"
-
-#: ajax_htmldata/getAccessDetails.php:65 summary.php:640
-msgid "Username / Password:"
-msgstr "Nom d'utilisateur / Mot de passe:"
-
-#: ajax_htmldata/getAccessDetails.php:80 summary.php:655
-msgid "Registered IP Address:"
-msgstr "Adresse IP enregistré:"
-
-#: ajax_htmldata/getAccessDetails.php:109
-msgid "No access information available"
-msgstr "Pas d'information d'accès disponible"
+#: ajax_forms/getCostForm.php:48
+msgid "Edit Cost Information"
+msgstr "Modifier information de coût"
 
-#: ajax_htmldata/getAccessDetails.php:116
-msgid "edit access information"
-msgstr "Modifier information d'accès"
+#: ajax_forms/getCostForm.php:62 ajax_htmldata/getAcquisitionsDetails.php:178
+msgid "Year"
+msgstr "Année"
 
-#: ajax_htmldata/getAccessDetails.php:159
-#: ajax_htmldata/getAcquisitionsDetails.php:356
-#: ajax_htmldata/getProductDetails.php:408 resources/cataloging.php:209
-msgid "Additional Notes"
-msgstr "Notes additionnelles"
+#: ajax_forms/getCostForm.php:63 ajax_htmldata/getAcquisitionsDetails.php:179
+msgid "Sub Start"
+msgstr "Début d'abonnement"
 
-#: ajax_htmldata/getAccessDetails.php:162
-#: ajax_htmldata/getAccessDetails.php:181
-#: ajax_htmldata/getAcquisitionsDetails.php:359
-#: ajax_htmldata/getAcquisitionsDetails.php:378
-#: ajax_htmldata/getProductDetails.php:411
-#: ajax_htmldata/getProductDetails.php:430 resources/cataloging.php:212
-#: resources/cataloging.php:231
-msgid "add new note"
-msgstr "Ajouter note"
+#: ajax_forms/getCostForm.php:64 ajax_htmldata/getAcquisitionsDetails.php:180
+msgid "Sub End"
+msgstr "Fin d'abonnement"
 
-#: ajax_htmldata/getAccessDetails.php:170
-#: ajax_htmldata/getAcquisitionsDetails.php:367
-#: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
-msgid "edit note"
-msgstr "Modifier note"
+#: ajax_forms/getCostForm.php:67 ajax_htmldata/getAcquisitionsDetails.php:183
+msgid "Payment"
+msgstr "Paiement"
 
-#: ajax_htmldata/getAccessDetails.php:170
-#: ajax_htmldata/getAcquisitionsDetails.php:367
-#: ajax_htmldata/getContactDetails.php:69
-#: ajax_htmldata/getProductDetails.php:419 resources/cataloging.php:220
-msgid "remove note"
-msgstr "Supprimer note"
+#: ajax_forms/getCostForm.php:68 ajax_htmldata/getAcquisitionsDetails.php:187
+msgid "Type"
+msgstr "Type"
 
-#: ajax_htmldata/getAccountDetails.php:14
-#: ajax_htmldata/getContactDetails.php:35
-msgid "Resource Specific:"
-msgstr "Ressource spécifique:"
+#: ajax_forms/getCostForm.php:72
+msgid "Note"
+msgstr "Note"
 
-#: ajax_htmldata/getAccountDetails.php:18
-msgid "No Resource Specific Accounts"
-msgstr "Il n'y a pas une ressource spécifié par les comptes"
+#: ajax_forms/getCostForm.php:74 ajax_htmldata/getAcquisitionsDetails.php:193
+msgid "Invoice"
+msgstr "Facture"
 
-#: ajax_htmldata/getAccountDetails.php:22
-#: ajax_htmldata/getAccountDetails.php:119
-msgid "add new account"
-msgstr "Ajouter compte"
+#: ajax_forms/getCostForm.php:138
+msgid "add this payment"
+msgstr "Ajouter paiement"
 
-#: ajax_htmldata/getAccountDetails.php:27
-#: ajax_htmldata/getContactDetails.php:48
-msgid "Inherited:"
-msgstr "Hérité:"
+#: ajax_forms/getCostForm.php:138
+msgid "add payment"
+msgstr "Ajouter paiement"
 
-#: ajax_htmldata/getAccountDetails.php:44
-msgid "edit account"
-msgstr "Modifier compte"
+#: ajax_forms/getCostForm.php:222
+msgid "remove this payment"
+msgstr "Supprimer paiement"
 
-#: ajax_htmldata/getAccountDetails.php:44
-msgid "remove account"
-msgstr "Supprimer compte"
+#: ajax_forms/getGeneralDetailSubjectForm.php:18
+msgid "Add / Edit Subject Relationships"
+msgstr "Ajouter / Modifier liens sujets"
 
-#: ajax_htmldata/getAccountDetails.php:57
-msgid "Visit Account in Organizations Module"
-msgstr "Visitez les comptes dans le module Organisations"
+#: ajax_forms/getGeneralDetailSubjectForm.php:53
+msgid "Detailed Subjects"
+msgstr "Sujet détaillé"
 
-#: ajax_htmldata/getAccountDetails.php:65
-msgid "Visit Login URL"
-msgstr "Source URL de connexion"
+#: ajax_forms/getGeneralDetailSubjectForm.php:75
+msgid "add detail subject"
+msgstr "Ajouter sujet détaillé"
 
-#: ajax_htmldata/getAccountDetails.php:72
-msgid "User Name:"
-msgstr "Nom d'utilisateur:"
+#: ajax_forms/getGeneralDetailSubjectForm.php:105
+msgid "remove detailed subject"
+msgstr "Supprimer sujet détaillé"
 
-#: ajax_htmldata/getAccountDetails.php:88
-#: ajax_htmldata/getContactDetails.php:173
-msgid "Last Updated:"
-msgstr "Dernière mise à jour:"
+#: ajax_forms/getGeneralDetailSubjectForm.php:107
+#: ajax_htmldata/getAdminSubjectDisplay.php:30
+#: ajax_htmldata/getAdminSubjectDisplay.php:71
+msgid "subject in use"
+msgstr "Sujet en utilisation"
 
-#: ajax_htmldata/getAccountDetails.php:114
-msgid "No accounts available"
-msgstr "Pas de compte disponible"
+#: ajax_forms/getNoteForm.php:18
+msgid "Edit Note"
+msgstr "Modifier note"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:100
-#: ajax_htmldata/getAcquisitionsDetails.php:159 resources/cataloging.php:106
-msgid "edit order information"
-msgstr "Modifier information de commande"
+#: ajax_forms/getNoteForm.php:18
+msgid "Add Note"
+msgstr "Ajouter note"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:127
-msgid "catalog view"
-msgstr "Vue du catalogue"
+#: ajax_forms/getNoteForm.php:28
+msgid "Note Type:"
+msgstr "Type de note:"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:136
-msgid "Purchasing Sites:"
-msgstr "Site d'acquisition:"
+#: ajax_forms/getLicenseForm.php:50
+msgid "Edit Licenses"
+msgstr "Modifier licences"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:152 summary.php:475
-msgid "Expiration Alert Enabled"
-msgstr "Alerte d'expiration activé"
+#: ajax_forms/getLicenseForm.php:60
+msgid "License Records"
+msgstr "Fiches licence"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:171
-#: ajax_htmldata/getAcquisitionsDetails.php:253
-msgid "edit cost history"
-msgstr "Modifier historique de coût"
+#: ajax_forms/getLicenseForm.php:76
+msgid "add license"
+msgstr "Ajouter licence"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:189
-msgid "Details"
-msgstr "Détails"
+#: ajax_forms/getLicenseForm.php:103
+msgid "remove license link"
+msgstr "Supprimer lien de la licence"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:247
-msgid "No payment information available"
-msgstr "L'information du paiement n'est pas disponible"
+#: ajax_forms/getLicenseForm.php:103 ajax_forms/getUpdateProductForm.php:300
+msgid "remove "
+msgstr "Supprimer "
 
-#: ajax_htmldata/getAcquisitionsDetails.php:262 summary.php:511
-msgid "License"
-msgstr "Licence"
+#: ajax_forms/getLicenseForm.php:103
+msgid " license"
+msgstr "licence"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:276 summary.php:522
-msgid " on "
-msgstr " sur "
+#: ajax_forms/getLicenseForm.php:128
+msgid "Licensing Status"
+msgstr "Statut des licences"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:289 summary.php:533
-msgid "Licenses:"
-msgstr "Licences:"
+#: ajax_forms/getLicenseForm.php:160
+msgid "History:"
+msgstr "Historique:"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:295
-msgid "View License"
-msgstr "Voir licence"
+#: ajax_forms/getNewResourceForm.php:84
+msgid "Edit Saved Resource"
+msgstr "Modifier ressource enregistrée"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:298 summary.php:542
-msgid "No associated licenses available."
-msgstr "Pas de licence associée."
+#: ajax_forms/getNewResourceForm.php:84
+msgid "Add New Resource"
+msgstr "Ajouter ressource"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:312
-msgid "edit license and status"
-msgstr "Modifier licence et statut"
+#: ajax_forms/getNewResourceForm.php:85
+msgid "required fields"
+msgstr "champs obligatoires"
 
-#: ajax_htmldata/getAcquisitionsDetails.php:314
-msgid "edit license status"
-msgstr "Modifier statut de licence"
+#: ajax_forms/getNewResourceForm.php:91 ajax_forms/getUpdateProductForm.php:81
+msgid "Product"
+msgstr "Produit"
 
-#: ajax_htmldata/getAdminAlertDisplay.php:26
-#: ajax_htmldata/getAdminAlertDisplay.php:56
-#: ajax_htmldata/getAdminCurrencyDisplay.php:26
-#: ajax_htmldata/getAdminDisplay.php:26
-#: ajax_htmldata/getAdminSubjectDisplay.php:28
-#: ajax_htmldata/getAdminSubjectDisplay.php:69
-#: ajax_htmldata/getAdminUserDisplay.php:48
-#: ajax_htmldata/getAdminWorkflowDisplay.php:40
-#: ajax_htmldata/getAdminWorkflowDisplay.php:91
-#: ajax_htmldata/getGeneralSubjectDisplay.php:26
-msgid "remove"
-msgstr "supprimer"
+#: ajax_forms/getNewResourceForm.php:110
+msgid "Provider:"
+msgstr "Fournisseur:"
 
-#: ajax_htmldata/getAdminAlertDisplay.php:38
-msgid "add email address"
-msgstr "Ajouter adresse email"
+#: ajax_forms/getNewResourceForm.php:131
+msgid "Format"
+msgstr "Format"
 
-#: ajax_htmldata/getAdminAlertDisplay.php:46
-msgid "Days in advance of expiration"
-msgstr "Jours avant expiration"
+#: ajax_forms/getNewResourceForm.php:269
+#: ajax_htmldata/getAcquisitionsDetails.php:191
+msgid "Notes"
+msgstr "Notes"
 
-#: ajax_htmldata/getAdminAlertDisplay.php:71
-msgid "add days"
-msgstr "Ajouter jours"
+#: ajax_forms/getNewResourceForm.php:278
+msgid "Include any additional information"
+msgstr "Inclure information supplémentaire"
 
-#: ajax_htmldata/getAdminCurrencyDisplay.php:38
-msgid "add new currency"
-msgstr "Ajouter devise"
+#: ajax_forms/getNewResourceForm.php:294
+msgid "save"
+msgstr "enregistrer"
 
-#: ajax_htmldata/getAdminDisplay.php:16
-#: ajax_htmldata/getAdminSubjectDisplay.php:57
-#: ajax_htmldata/getGeneralSubjectDisplay.php:16
-msgid "Value"
-msgstr "Valeur"
+#: ajax_forms/getContactForm.php:30
+msgid "Edit Contact"
+msgstr "Modifier contact"
 
-#: ajax_htmldata/getAdminDisplay.php:38
-#: ajax_htmldata/getAdminSubjectDisplay.php:44
-#: ajax_htmldata/getAdminSubjectDisplay.php:84
-#: ajax_htmldata/getGeneralSubjectDisplay.php:38
-msgid "add new "
-msgstr "Ajouter  "
+#: ajax_forms/getContactForm.php:30
+msgid "Add Contact"
+msgstr "Ajouter contact"
 
-#: ajax_htmldata/getAdminSubjectDisplay.php:51
-#: ajax_htmldata/getAdminSubjectDisplay.php:99 index.php:282
-msgid "Detailed Subject"
-msgstr "Sujet détaillé"
+#: ajax_forms/getContactForm.php:50 ajax_htmldata/getContactDetails.php:100
+msgid "Title:"
+msgstr "Titre:"
 
-#: ajax_htmldata/getAdminSubjectDisplay.php:92
-msgid "Subject Relationships"
-msgstr "Relation des sujets"
+#: ajax_forms/getContactForm.php:57 ajax_htmldata/getContactDetails.php:133
+msgid "Phone:"
+msgstr "Téléphone:"
 
-#: ajax_htmldata/getAdminUserDisplay.php:47
-msgid "edit user"
-msgstr "Modifier utilisateur"
+#: ajax_forms/getContactForm.php:64 ajax_htmldata/getContactDetails.php:141
+msgid "Alt Phone:"
+msgstr "Téléphone Alt:"
 
-#: ajax_htmldata/getAdminUserDisplay.php:54
-#: ajax_htmldata/getAdminUserDisplay.php:58
-msgid "add new user"
-msgstr "Ajouter utilisateur"
+#: ajax_forms/getContactForm.php:71 ajax_htmldata/getContactDetails.php:149
+msgid "Fax:"
+msgstr "Fax:"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:10
-msgid "Workflow Setup"
-msgstr "Configuration du workflow"
+#: ajax_forms/getContactForm.php:78 ajax_htmldata/getContactDetails.php:157
+msgid "Email:"
+msgstr "Email:"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:54
-msgid "add workflow"
-msgstr "Ajouter workflow"
+#: ajax_forms/getContactForm.php:85 ajax_htmldata/getContactDetails.php:108
+msgid "Address:"
+msgstr "Adresse:"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:56
-msgid "You must set up at least one user group before you can add workflows"
-msgstr "Vous devez configurer au moins un groupe avant d'ajouter des workflows"
+#: ajax_forms/getContactForm.php:92 ajax_forms/getUpdateProductForm.php:208
+#: ajax_htmldata/getProductDetails.php:90
+msgid "Archived:"
+msgstr "Archivé:"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:66
-msgid "User Group Setup"
-msgstr "Configuration du groupe d'utilisateur"
+#: ajax_forms/getContactForm.php:102
+msgid "Role(s):"
+msgstr "Rôle(s):"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:72
-msgid "Group Name"
-msgstr "Nom du groupe"
+#: ajax_forms/getAdminUserUpdateForm.php:21
+msgid "Edit User"
+msgstr "Modifier utilisateur"
 
-#: ajax_htmldata/getAdminWorkflowDisplay.php:104
-msgid "add user group"
-msgstr "Ajouter groupe d'utilisateur"
+#: ajax_forms/getAdminUserUpdateForm.php:21
+msgid "Add New User"
+msgstr "Ajouter utilisateur"
 
-#: ajax_htmldata/getAttachmentDetails.php:30
-msgid "view attachment"
-msgstr "Regarder la pièce jointe"
+#: ajax_forms/getAdminUserUpdateForm.php:32
+#: ajax_htmldata/getAdminUserDisplay.php:22
+msgid "Login ID"
+msgstr "Identifiant de connexion"
 
-#: ajax_htmldata/getAttachmentDetails.php:35
-msgid "edit attachment"
-msgstr "Modifier la pièce jointe"
+#: ajax_forms/getAdminUserUpdateForm.php:33
+#: ajax_htmldata/getAdminUserDisplay.php:23
+msgid "First Name"
+msgstr "Prénom"
 
-#: ajax_htmldata/getAttachmentDetails.php:35
-msgid "remove this attachment"
-msgstr "Supprimer pièce jointe"
+#: ajax_forms/getAdminUserUpdateForm.php:34
+#: ajax_htmldata/getAdminUserDisplay.php:24
+msgid "Last Name"
+msgstr "Nom"
 
-#: ajax_htmldata/getAttachmentDetails.php:67
-msgid "No attachments available"
-msgstr "Pas de pièce jointe disponible."
+#: ajax_forms/getAdminUserUpdateForm.php:35
+#: ajax_htmldata/getAdminWorkflowDisplay.php:73
+#: ajax_htmldata/getAdminAlertDisplay.php:16
+#: ajax_htmldata/getAdminUserDisplay.php:27
+msgid "Email Address"
+msgstr "Adresse email"
 
-#: ajax_htmldata/getAttachmentDetails.php:72
-msgid "add new attachment"
-msgstr "Ajouter pièce jointe"
+#: ajax_forms/getAdminUserUpdateForm.php:36
+#: ajax_htmldata/getAdminUserDisplay.php:25
+msgid "Privilege"
+msgstr "Privilège"
 
-#: ajax_htmldata/getContactDetails.php:23
-msgid "The following are archived contacts:"
-msgstr "Les contacts suivants sont archivés: "
+#: ajax_forms/getAdminUserUpdateForm.php:54
+#: ajax_htmldata/getAdminUserDisplay.php:26
+msgid "View Accounts"
+msgstr "Voir comptes"
 
-#: ajax_htmldata/getContactDetails.php:39
-msgid "No Resource Specific Contacts"
-msgstr "Pas de ressource spécifique  pour ce contact"
+#: ajax_forms/getUpdateProductForm.php:72
+msgid "Edit Resource"
+msgstr "Modifier ressource"
 
-#: ajax_htmldata/getContactDetails.php:43
-#: ajax_htmldata/getContactDetails.php:187
-#: ajax_htmldata/getContactDetails.php:197
-msgid "add contact"
-msgstr "Ajouter contact"
+#: ajax_forms/getUpdateProductForm.php:118
+msgid "Parents:"
+msgstr "Parents:"
 
-#: ajax_htmldata/getContactDetails.php:68
-msgid "edit contact"
-msgstr "Modifier contact"
+#: ajax_forms/getUpdateProductForm.php:124
+msgid "add Parent resource"
+msgstr "Ajouter ressource père"
 
-#: ajax_htmldata/getContactDetails.php:69
-msgid "remove contact"
-msgstr "Supprimer contact"
+#: ajax_forms/getUpdateProductForm.php:124
+msgid "add Parent Resource"
+msgstr "Ajouter ressource père"
 
-#: ajax_htmldata/getContactDetails.php:84
-msgid "Visit Contact in Organizations Module"
-msgstr "Voir contact dans le module Organisations"
+#: ajax_forms/getUpdateProductForm.php:137
+msgid "remove parent"
+msgstr "Enlever parent"
 
-#: ajax_htmldata/getContactDetails.php:92
-msgid "No longer valid:"
-msgstr "N'est plus valide:"
+#: ajax_forms/getUpdateProductForm.php:152
+msgid "add Isbn"
+msgstr "Ajouter ISBN"
 
-#: ajax_htmldata/getContactDetails.php:116
-msgid "Location:"
-msgstr "Localisation:"
+#: ajax_forms/getUpdateProductForm.php:170
+#: ajax_forms/getAdminWorkflowForm.php:74
+msgid "Format:"
+msgstr "Format:"
 
-#: ajax_htmldata/getContactDetails.php:195
-msgid "No contacts available"
-msgstr "Pas de contact disponible"
+#: ajax_forms/getUpdateProductForm.php:237
+msgid "Role:"
+msgstr "Rôle:"
 
-#: ajax_htmldata/getContactDetails.php:205
-msgid " archived contact(s) available."
-msgstr " contact(s) archivé(s) disponible(s)."
+#: ajax_forms/getUpdateProductForm.php:238
+#: ajax_htmldata/getContactDetails.php:83
+msgid "Organization:"
+msgstr "Organisation:"
 
-#: ajax_htmldata/getContactDetails.php:205
-msgid "show archived contacts"
-msgstr "montrer les contacts archivés"
+#: ajax_forms/getUpdateProductForm.php:260
+msgid "add organization"
+msgstr "Ajouter organisation"
 
-#: ajax_htmldata/getContactDetails.php:209
-msgid "hide archived contacts"
-msgstr "Cacher les contacts archivés"
+#: ajax_forms/getUpdateProductForm.php:300
+msgid "remove organization"
+msgstr "Supprimer organisation"
 
-#: ajax_htmldata/getOutstandingQueue.php:7 queue.php:51
-msgid "Outstanding Tasks"
-msgstr "Tâches en attente"
+#: ajax_forms/getUpdateProductForm.php:300
+msgid "organization"
+msgstr "organisation"
 
-#: ajax_htmldata/getOutstandingQueue.php:12
-msgid "No outstanding requests"
-msgstr "Pas de requête en attente"
+#: ajax_forms/getUpdateProductForm.php:322
+msgid "Aliases"
+msgstr "Alias"
 
-#: ajax_htmldata/getOutstandingQueue.php:19 ajax_htmldata/getSavedQueue.php:17
-#: ajax_htmldata/getSearchResources.php:112
-#: ajax_htmldata/getSubmittedQueue.php:14
-msgid "ID"
-msgstr "Identifiant"
+#: ajax_forms/getUpdateProductForm.php:331
+msgid "Alias:"
+msgstr "Alias:"
 
-#: ajax_htmldata/getOutstandingQueue.php:22 index.php:553
-msgid "Routing Step"
-msgstr "Étape de routage"
+#: ajax_forms/getUpdateProductForm.php:353
+msgid "add this alias"
+msgstr "Ajouter alias"
 
-#: ajax_htmldata/getOutstandingQueue.php:23
-#: ajax_htmldata/getRoutingDetails.php:23
-msgid "Start Date"
-msgstr "Date de début"
+#: ajax_forms/getUpdateProductForm.php:353
+msgid "add alias"
+msgstr "Ajouter alias"
 
-#: ajax_htmldata/getProductDetails.php:69
-msgid "remove resource"
-msgstr "Supprimer ressource"
+#: ajax_forms/getUpdateProductForm.php:394
+msgid "remove this alias"
+msgstr "Supprimer alias"
 
-#: ajax_htmldata/getProductDetails.php:69
-msgid "remove resource and its children"
-msgstr "Supprimer ressource et ses fils"
+#: ajax_forms/getAdminAlertEmailForm.php:14
+msgid "Edit Alert Email Address"
+msgstr "Modifier l'adresse email d'alerte"
 
-#: ajax_htmldata/getProductDetails.php:75 summary.php:206
-msgid "Record ID:"
-msgstr "Identifiant:"
+#: ajax_forms/getAdminAlertEmailForm.php:14
+msgid "Add Alert Email Address"
+msgstr "Ajouter adresse email d'alerte"
 
-#: ajax_htmldata/getProductDetails.php:115 summary.php:218
-msgid "Created:"
-msgstr "Créé:"
+#: ajax_forms/getAdminUpdateForm.php:31
+msgid "Show stats button?"
+msgstr "Montrer le bouton de statistiques?"
 
-#: ajax_htmldata/getProductDetails.php:140 summary.php:244
-msgid "Last Update:"
-msgstr "Dernière mise à jour:"
+#: ajax_forms/getAccessForm.php:59
+msgid "Edit Access"
+msgstr "Modifier l'accès"
 
-#: ajax_htmldata/getProductDetails.php:165 summary.php:269
-msgid "Related Products:"
-msgstr "Produits liés:"
+#: ajax_forms/getAccessForm.php:68
+msgid "Access"
+msgstr "Accès"
 
-#: ajax_htmldata/getProductDetails.php:173
-#: ajax_htmldata/getProductDetails.php:181
-msgid "view resource"
-msgstr "voir ressource"
+#: ajax_forms/getAccessForm.php:145 ajax_htmldata/getAccessDetails.php:95
+msgid "Coverage:"
+msgstr "Couverture:"
 
-#: ajax_htmldata/getProductDetails.php:173
-#: ajax_htmldata/getProductDetails.php:181
-#: ajax_htmldata/getProductDetails.php:235
-msgid "View "
-msgstr "Voir "
+#: ajax_forms/getAccessForm.php:163
+msgid "Authorized Site(s)"
+msgstr "Site(s) autorisé(s)"
 
-#: ajax_htmldata/getProductDetails.php:211 summary.php:301
-msgid "Aliases:"
-msgstr "Alias:"
+#: ajax_forms/getAccessForm.php:208
+msgid "Administering Site(s)"
+msgstr "Administration site"
 
-#: ajax_htmldata/getProductDetails.php:228 summary.php:318
-msgid "Organizations:"
-msgstr "Organisations:"
+#: ajax_forms/getAdminWorkflowForm.php:42
+msgid "Edit Workflow"
+msgstr "Modifier workflow"
 
-#: ajax_htmldata/getProductDetails.php:249 summary.php:339
-msgid "Resource URL:"
-msgstr "URL de la Ressource: "
+#: ajax_forms/getAdminWorkflowForm.php:51
+msgid "Resource Entry Requirements"
+msgstr "Conditions d'entrée des ressources"
 
-#: ajax_htmldata/getProductDetails.php:250
-msgid "Visit Resource URL"
-msgstr "Visiter la ressource"
+#: ajax_forms/getAdminWorkflowForm.php:114
+msgid "Workflow Steps"
+msgstr "Étapes du Workflow"
 
-#: ajax_htmldata/getProductDetails.php:258
-msgid "Visit Secondary Resource URL"
-msgstr "Ressource URL secondaire de visite"
+#: ajax_forms/getAdminWorkflowForm.php:124
+msgid "Approval/Notification Group:"
+msgstr "Approbation/Notification de groupe"
 
-#: ajax_htmldata/getProductDetails.php:273
-msgid "edit product details"
-msgstr "Modifier détails"
+#: ajax_forms/getAdminWorkflowForm.php:125
+msgid "Parent Step"
+msgstr "Étape parent"
 
-#: ajax_htmldata/getProductDetails.php:340
-msgid "remove subject"
-msgstr "Supprimer sujet"
+#: ajax_forms/getAdminWorkflowForm.php:155
+msgid "add step"
+msgstr "Ajouter étape"
 
-#: ajax_htmldata/getProductDetails.php:361
-msgid "add new subject"
-msgstr "Ajouter sujet"
+#: ajax_forms/getAdminWorkflowForm.php:238
+msgid "remove this step"
+msgstr "Effacer étape"
 
-#: ajax_htmldata/getRightPanel.php:40
-msgid "Print View"
-msgstr "Imprimer vue"
+#: ajax_forms/getAdminAlertDaysForm.php:14
+msgid "Edit Alert Days In Advance"
+msgstr "Modifier l'alerte à l'avance"
 
-#: ajax_htmldata/getRightPanel.php:42
-msgid "Catalog View"
-msgstr "Vue catalogue"
+#: ajax_forms/getAdminAlertDaysForm.php:14
+msgid "Add Alert Days In Advance"
+msgstr "Ajouter alerte à l'avance"
 
-#: ajax_htmldata/getRightPanel.php:50
-msgid "Parent Record(s)"
-msgstr "Fiche parent"
+#: ajax_forms/getOrderForm.php:33
+msgid "Edit Acquisitions Information"
+msgstr "Modifier information d'acquisition"
 
-#: ajax_htmldata/getRightPanel.php:58
-msgid "Child Record(s)"
-msgstr "Fiche enfant"
+#: ajax_forms/getOrderForm.php:89
+msgid "Enable Alert"
+msgstr "Activer l'alerte"
 
-#: ajax_htmldata/getRightPanel.php:77
-msgid "Organizations Module"
-msgstr "Module organisation"
+#: ajax_forms/getOrderForm.php:111
+msgid "Purchasing Site(s)"
+msgstr "Site d'achat(s)"
 
-#: ajax_htmldata/getRightPanel.php:93
-msgid "Licensing Module"
-msgstr "Module licence"
+#: ajax_htmldata/getAdminDisplay.php:16
+#: ajax_htmldata/getGeneralSubjectDisplay.php:16
+#: ajax_htmldata/getAdminSubjectDisplay.php:57
+msgid "Value"
+msgstr "Valeur"
+
+#: ajax_htmldata/getAdminDisplay.php:25
+#: ajax_htmldata/getGeneralSubjectDisplay.php:25
+#: ajax_htmldata/getAdminSubjectDisplay.php:66
+#: ajax_htmldata/getAdminSubjectDisplay.php:115
+#: ajax_htmldata/getAdminWorkflowDisplay.php:39
+#: ajax_htmldata/getAdminWorkflowDisplay.php:90
+#: ajax_htmldata/getAcquisitionsDetails.php:100
+#: ajax_htmldata/getAcquisitionsDetails.php:171
+#: ajax_htmldata/getAcquisitionsDetails.php:264
+#: ajax_htmldata/getAcquisitionsDetails.php:367
+#: ajax_htmldata/getAccountDetails.php:44
+#: ajax_htmldata/getAdminAlertDisplay.php:25
+#: ajax_htmldata/getAdminAlertDisplay.php:55
+#: ajax_htmldata/getAttachmentDetails.php:35
+#: ajax_htmldata/getSavedQueue.php:49 ajax_htmldata/getAccessDetails.php:35
+#: ajax_htmldata/getAccessDetails.php:170
+#: ajax_htmldata/getContactDetails.php:68
+#: ajax_htmldata/getProductDetails.php:69
+#: ajax_htmldata/getProductDetails.php:419
+#: ajax_htmldata/getAdminCurrencyDisplay.php:25
+#: ajax_htmldata/getAdminUserDisplay.php:47
+msgid "edit"
+msgstr "Modifier"
 
-#: ajax_htmldata/getRightPanel.php:111
-msgid "Usage Statistics Module"
-msgstr "Module statistiques"
+#: ajax_htmldata/getAdminDisplay.php:26
+#: ajax_htmldata/getGeneralSubjectDisplay.php:26
+#: ajax_htmldata/getAdminSubjectDisplay.php:28
+#: ajax_htmldata/getAdminSubjectDisplay.php:69
+#: ajax_htmldata/getAdminWorkflowDisplay.php:40
+#: ajax_htmldata/getAdminWorkflowDisplay.php:91
+#: ajax_htmldata/getAdminAlertDisplay.php:26
+#: ajax_htmldata/getAdminAlertDisplay.php:56
+#: ajax_htmldata/getAdminCurrencyDisplay.php:26
+#: ajax_htmldata/getAdminUserDisplay.php:48
+msgid "remove"
+msgstr "supprimer"
 
-#: ajax_htmldata/getRightPanel.php:117
-msgid "Get Statistics"
-msgstr "Obtenir statistiques"
+#: ajax_htmldata/getAdminDisplay.php:38
+#: ajax_htmldata/getGeneralSubjectDisplay.php:38
+#: ajax_htmldata/getAdminSubjectDisplay.php:44
+#: ajax_htmldata/getAdminSubjectDisplay.php:84
+msgid "add new "
+msgstr "Ajouter  "
+
+#: ajax_htmldata/getAdminSubjectDisplay.php:92
+msgid "Subject Relationships"
+msgstr "Relation des sujets"
 
 #: ajax_htmldata/getRoutingDetails.php:13
 msgid ""
@@ -1378,6 +1541,11 @@ msgstr "Étape"
 msgid "Group"
 msgstr "Groupe"
 
+#: ajax_htmldata/getRoutingDetails.php:23
+#: ajax_htmldata/getOutstandingQueue.php:23
+msgid "Start Date"
+msgstr "Date de début"
+
 #: ajax_htmldata/getRoutingDetails.php:24
 msgid "Complete"
 msgstr "Complète"
@@ -1404,979 +1572,706 @@ msgstr "Redémarrer workflow"
 msgid "mark entire workflow complete"
 msgstr "Marquer workflow comme complet"
 
-#: ajax_htmldata/getSavedQueue.php:6 queue.php:52
-msgid "Saved Requests"
-msgstr "Requêtes enregistrées"
-
-#: ajax_htmldata/getSavedQueue.php:11
-msgid "No saved requests"
-msgstr "Pas de requête enregistrée"
-
-#: ajax_htmldata/getSavedQueue.php:19 ajax_htmldata/getSearchResources.php:115
-#: ajax_htmldata/getSubmittedQueue.php:16
-msgid "Date Created"
-msgstr "Date de création"
-
-#: ajax_htmldata/getSavedQueue.php:21 ajax_htmldata/getSearchResources.php:117
-#: ajax_htmldata/getSubmittedQueue.php:18 index.php:123
-msgid "Status"
-msgstr "Statut"
-
-#: ajax_htmldata/getSavedQueue.php:49
-msgid "edit request"
-msgstr "Modifier requête"
-
-#: ajax_htmldata/getSavedQueue.php:50
-msgid "remove request"
-msgstr "Supprimer requête"
-
-#: ajax_htmldata/getSearchResources.php:38
-msgid "Sorry, no requests fit your query"
-msgstr "Désolé, il n'y a pas de résultat à  votre requête"
-
-#: ajax_htmldata/getSearchResources.php:52
-msgid "Displaying "
-msgstr "Affichage de "
-
-#: ajax_htmldata/getSearchResources.php:52
-msgid " to "
-msgstr " sur "
-
-#: ajax_htmldata/getSearchResources.php:52
-msgid " of "
-msgstr " de "
-
-#: ajax_htmldata/getSearchResources.php:52
-msgid " Resource Records"
-msgstr " fiches ressources"
-
-#: ajax_htmldata/getSearchResources.php:64
-#: ajax_htmldata/getSearchResources.php:161
-msgid "previous page"
-msgstr "Page précédente"
-
-#: ajax_htmldata/getSearchResources.php:98
-#: ajax_htmldata/getSearchResources.php:195
-msgid "next page"
-msgstr "Page suivante"
-
-#: ajax_htmldata/getSearchResources.php:114 index.php:154
-msgid "Creator"
-msgstr "Créateur"
-
-#: ajax_htmldata/getSearchResources.php:212
-msgid "records per page"
-msgstr "résultats par page"
-
-#: ajax_htmldata/getSubmittedQueue.php:5 queue.php:53
-msgid "Submitted Requests"
-msgstr "Requêtes soumises"
-
-#: ajax_htmldata/getSubmittedQueue.php:8
-msgid "No submitted requests"
-msgstr "Pas de requête soumise"
-
-#: ajax_processing.php:27
-msgid "Processing action "
-msgstr ""
-
-#: ajax_processing/deleteDetailedSubject.php:12
-#: ajax_processing/deleteGeneralSubject.php:12
-#: ajax_processing/deleteInstance.php:18
-msgid ""
-"Unable to delete.  Please make sure no resources are set up with this "
-"information."
-msgstr ""
-"Impossible de supprimer. Vérifiez qu'i ln'y a pas de ressource ayant cette "
-"information."
-
-#: ajax_processing/deleteInstance.php:12
-msgid "Unable to delete  - this "
-msgstr "Impossible de supprimer - "
-
-#: ajax_processing/deleteInstance.php:12
-msgid ""
-" is in use.  Please make sure no resources are set up with this information."
-msgstr ""
-" est utilisé. Assurez-vous  qu'aucune ressource n'est configurée avec cet "
-"information."
-
-#: ajax_processing/deleteResource.php:7
-#: ajax_processing/deleteResourceAndChildren.php:8
-msgid "Resource successfully deleted."
-msgstr "Ressource supprimée"
-
-#: ajax_processing/deleteResourceNote.php:7
-msgid "Note successfully deleted."
-msgstr "Note supprimée."
-
-#: ajax_processing/removeResourceSubjectRelationship.php:10
-msgid "Subject successfully removed."
-msgstr "Sujet enlevé."
-
-#: ajax_processing/updateDetailedSubject.php:22
-#: ajax_processing/updateGeneralSubject.php:21
-msgid "A duplicate "
-msgstr "Doublon "
-
-#: ajax_processing/updateDetailedSubject.php:22
-#: ajax_processing/updateGeneralSubject.php:21
-msgid " exists."
-msgstr " existant."
-
-#: ajax_processing/updateUserData.php:26
-msgid "User successfully saved."
-msgstr "Utilisateur enregistré."
-
-#: ajax_processing/uploadAttachment.php:29
-msgid "There was a problem saving your file to "
-msgstr "Il y a eu un problème pour enregistrer votre fichier sur "
-
-#: ajax_processing/uploadAttachment.php:29
-msgid ".  Please ensure your attachments directory is writable."
-msgstr ""
-". S'il vous plaît assurez-vous que votre dossier des pièces jointes est "
-"accessible en écriture."
-
-#: import.php:22
-msgid "Resources import"
-msgstr "Import de ressources"
-
-#: import.php:24
-msgid "CSV File import"
-msgstr "Import d'un fichier CSV"
-
-#: import.php:32
-msgid "The file has been successfully uploaded."
-msgstr "Le fichier a été téléchargé."
-
-#: import.php:42
-msgid "Unable to get columns headers from the file"
-msgstr "Impossible d'obtenir les noms des colonnes du fichier"
-
-#: import.php:45
-msgid "Unable to open the uploaded file"
-msgstr "Impossible d'ouvrir le fichier téléchargé"
-
-#: import.php:48
-msgid "Unable to upload the file"
-msgstr "Impossible de télécharger le fichier"
-
-#: import.php:51
-msgid "Error: "
-msgstr "Erreur: "
-
-#: import.php:53
-msgid "Please choose columns from your CSV file:"
-msgstr "Choisissez les colonnes de votre fichier CSV:"
+#: ajax_htmldata/getOutstandingQueue.php:12
+msgid "No outstanding requests"
+msgstr "Pas de requête en attente"
 
-#: import.php:86
-msgid "Settings"
-msgstr "Configuration"
+#: ajax_htmldata/getOutstandingQueue.php:19 ajax_htmldata/getSavedQueue.php:17
+#: ajax_htmldata/getSubmittedQueue.php:14
+#: ajax_htmldata/getSearchResources.php:112
+msgid "ID"
+msgstr "Identifiant"
 
-#: import.php:87
-msgid "Importing and deduping isbnOrISSN on the following columns: "
-msgstr ""
-"Importation et dédoublonnage d'isbnOrISSN dans les colonnes suivantes: "
+#: ajax_htmldata/getAdminWorkflowDisplay.php:10
+msgid "Workflow Setup"
+msgstr "Configuration du workflow"
 
-#: import.php:143
-msgid "Organization "
-msgstr "Organisation"
+#: ajax_htmldata/getAdminWorkflowDisplay.php:54
+msgid "add workflow"
+msgstr "Ajouter workflow"
 
-#: import.php:143
-msgid " could not be added."
-msgstr " ne pu pas être ajouté."
+#: ajax_htmldata/getAdminWorkflowDisplay.php:56
+msgid "You must set up at least one user group before you can add workflows"
+msgstr "Vous devez configurer au moins un groupe avant d'ajouter des workflows"
 
-#: import.php:152 import.php:195
-msgid "Error: more than one organization is called "
-msgstr "Erreur: Plus d'une organisation a été appelée"
+#: ajax_htmldata/getAdminWorkflowDisplay.php:66
+msgid "User Group Setup"
+msgstr "Configuration du groupe d'utilisateur"
 
-#: import.php:152
-msgid ". Please consider deduping."
-msgstr ". Considérez un dédoublonnage."
+#: ajax_htmldata/getAdminWorkflowDisplay.php:72
+msgid "Group Name"
+msgstr "Nom du groupe"
 
-#: import.php:174
-msgid "Unable to associate organization "
-msgstr "Impossible d'associer l'organisation "
+#: ajax_htmldata/getAdminWorkflowDisplay.php:104
+msgid "add user group"
+msgstr "Ajouter groupe d'utilisateur"
 
-#: import.php:174
-msgid " with its role."
-msgstr " avec le rôle."
+#: ajax_htmldata/getRightPanel.php:40
+msgid "Print View"
+msgstr "Imprimer vue"
 
-#: import.php:195
-msgid " Please consider deduping."
-msgstr "Considérez un dédoublonnage."
+#: ajax_htmldata/getRightPanel.php:42
+msgid "Catalog View"
+msgstr "Vue catalogue"
 
-#: import.php:253
-msgid "Results"
-msgstr "Résultats"
+#: ajax_htmldata/getRightPanel.php:50
+msgid "Parent Record(s)"
+msgstr "Fiche parent"
 
-#: import.php:254
-msgid " rows have been processed. "
-msgstr " lignes ont été traitées. "
+#: ajax_htmldata/getRightPanel.php:58
+msgid "Child Record(s)"
+msgstr "Fiche enfant"
 
-#: import.php:254
-msgid " rows have been inserted."
-msgstr " lignes ont été insérées."
+#: ajax_htmldata/getRightPanel.php:77
+msgid "Organizations Module"
+msgstr "Module organisation"
 
-#: import.php:255
-msgid " parents have been created. "
-msgstr " parents ont été créés. "
+#: ajax_htmldata/getRightPanel.php:93
+msgid "Licensing Module"
+msgstr "Module licence"
 
-#: import.php:255
-msgid " resources have been attached to an existing parent."
-msgstr " ressources ont été ajoutées dans un parent existant."
+#: ajax_htmldata/getRightPanel.php:111
+msgid "Usage Statistics Module"
+msgstr "Module statistiques"
 
-#: import.php:256
-msgid " organizations have been created"
-msgstr " organisations ont été créées"
+#: ajax_htmldata/getRightPanel.php:117
+msgid "Get Statistics"
+msgstr "Obtenir statistiques"
 
-#: import.php:258
-msgid " resources have been attached to an existing organization."
-msgstr " ressources ont été ajoutées dans une organisation existante."
+#: ajax_htmldata/getAcquisitionsDetails.php:127
+msgid "catalog view"
+msgstr "Vue du catalogue"
 
-#: import.php:263
-msgid ""
-"The first line of the CSV file must contain column names, and not data. "
-"These names will be used during the import process."
-msgstr ""
-"La première ligne du fichier CSV doit contenir le noms des colonnes, et pas "
-"des données. Ces noms seront utilisés pendant le processus d'importation."
+#: ajax_htmldata/getAcquisitionsDetails.php:136
+msgid "Purchasing Sites:"
+msgstr "Site d'acquisition:"
 
-#: import.php:266
-msgid "File selection"
-msgstr "Sélection du fichier"
+#: ajax_htmldata/getAcquisitionsDetails.php:171
+#: ajax_htmldata/getAcquisitionsDetails.php:253
+msgid "edit cost history"
+msgstr "Modifier historique de coût"
 
-#: import.php:267
-msgid "CSV File"
-msgstr "Fichier CSV"
+#: ajax_htmldata/getAcquisitionsDetails.php:189
+msgid "Details"
+msgstr "Détails"
 
-#: import.php:271
-msgid "Import options"
-msgstr "Options d'importation"
+#: ajax_htmldata/getAcquisitionsDetails.php:247
+msgid "No payment information available"
+msgstr "L'information du paiement n'est pas disponible"
 
-#: import.php:272
-msgid "CSV delimiter"
-msgstr "Délimiteur CSV"
+#: ajax_htmldata/getAcquisitionsDetails.php:264
+#: ajax_htmldata/getAccessDetails.php:35
+#: ajax_htmldata/getProductDetails.php:69
+msgid "edit resource"
+msgstr "Modifier ressource"
 
-#: import.php:274
-msgid "(comma)"
-msgstr "(virgule)"
+#: ajax_htmldata/getAcquisitionsDetails.php:295
+msgid "View License"
+msgstr "Voir licence"
 
-#: import.php:275
-msgid "(semicolon)"
-msgstr "(point-virgule)"
+#: ajax_htmldata/getAcquisitionsDetails.php:312
+msgid "edit license and status"
+msgstr "Modifier licence et statut"
 
-#: import.php:276
-msgid "(pipe)"
-msgstr "(pipe)"
+#: ajax_htmldata/getAcquisitionsDetails.php:314
+msgid "edit license status"
+msgstr "Modifier statut de licence"
 
-#: import.php:279
-msgid "Upload"
-msgstr "Télécharger"
+#: ajax_htmldata/getAccountDetails.php:14
+#: ajax_htmldata/getContactDetails.php:35
+msgid "Resource Specific:"
+msgstr "Ressource spécifique:"
 
-#: index.php:26 templates/header.php:115
-msgid "Home"
-msgstr "Accueil"
+#: ajax_htmldata/getAccountDetails.php:18
+msgid "No Resource Specific Accounts"
+msgstr "Il n'y a pas une ressource spécifié par les comptes"
 
-#: index.php:58
-msgid "Search"
-msgstr "Recherche"
+#: ajax_htmldata/getAccountDetails.php:22
+#: ajax_htmldata/getAccountDetails.php:119
+msgid "add new account"
+msgstr "Ajouter compte"
 
-#: index.php:59
-msgid "new search"
-msgstr "Nouvelle"
+#: ajax_htmldata/getAccountDetails.php:27
+#: ajax_htmldata/getContactDetails.php:48
+msgid "Inherited:"
+msgstr "Hérité:"
 
-#: index.php:68
-msgid "Name (contains)"
-msgstr "Nom (contient)"
+#: ajax_htmldata/getAccountDetails.php:44
+msgid "edit account"
+msgstr "Modifier compte"
 
-#: index.php:72 index.php:83 index.php:93 index.php:246 index.php:378
-#: index.php:395
-msgid "go!"
-msgstr "valider!"
+#: ajax_htmldata/getAccountDetails.php:44
+msgid "remove account"
+msgstr "Supprimer compte"
 
-#: index.php:103 index.php:126 index.php:157 index.php:189 index.php:213
-#: index.php:254 index.php:285 index.php:347 index.php:405 index.php:437
-#: index.php:469 index.php:499 index.php:529 index.php:556
-msgid "All"
-msgstr "Tous"
+#: ajax_htmldata/getAccountDetails.php:57
+msgid "Visit Account in Organizations Module"
+msgstr "Visitez les comptes dans le module Organisations"
 
-#: index.php:218 index.php:220 index.php:259 index.php:261 index.php:290
-#: index.php:292 index.php:351 index.php:353 index.php:409 index.php:411
-#: index.php:441 index.php:443 index.php:473 index.php:475 index.php:503
-#: index.php:505 index.php:532 index.php:534
-msgid "(none)"
-msgstr "(aucun)"
+#: ajax_htmldata/getAccountDetails.php:65
+msgid "Visit Login URL"
+msgstr "Source URL de connexion"
 
-#: index.php:242
-msgid "Record ID"
-msgstr "ID de la fiche"
+#: ajax_htmldata/getAccountDetails.php:72
+msgid "User Name:"
+msgstr "Nom d'utilisateur:"
 
-#: index.php:313
-msgid "Starts with"
-msgstr "Commence par"
+#: ajax_htmldata/getAccountDetails.php:88
+#: ajax_htmldata/getContactDetails.php:173
+msgid "Last Updated:"
+msgstr "Dernière mise à jour:"
 
-#: index.php:339 js/index.js:236
-msgid "more options..."
-msgstr "plus d'options..."
+#: ajax_htmldata/getAccountDetails.php:114
+msgid "No accounts available"
+msgstr "Pas de compte disponible"
 
-#: index.php:374
-msgid "Note (contains)"
-msgstr "Note (contient)"
+#: ajax_htmldata/getAdminAlertDisplay.php:38
+msgid "add email address"
+msgstr "Ajouter adresse email"
 
-#: index.php:386
-msgid "Date Created Between"
-msgstr "Date de création entre"
+#: ajax_htmldata/getAdminAlertDisplay.php:46
+msgid "Days in advance of expiration"
+msgstr "Jours avant expiration"
 
-#: index.php:388
-msgid "and"
-msgstr "et"
+#: ajax_htmldata/getAdminAlertDisplay.php:71
+msgid "add days"
+msgstr "Ajouter jours"
 
-#: index.php:402
-msgid "Purchase Site"
-msgstr "Site d'acquisition"
+#: ajax_htmldata/getAttachmentDetails.php:30
+msgid "view attachment"
+msgstr "Regarder la pièce jointe"
 
-#: queue.php:22 queue.php:40 templates/header.php:117
-msgid "My Queue"
-msgstr "Ma queue"
+#: ajax_htmldata/getAttachmentDetails.php:35
+msgid "edit attachment"
+msgstr "Modifier la pièce jointe"
 
-#: resource.php:54
-msgid "Success!"
-msgstr "Fait!"
+#: ajax_htmldata/getAttachmentDetails.php:35
+msgid "remove this attachment"
+msgstr "Supprimer pièce jointe"
 
-#: resource.php:54
-msgid "New resource added"
-msgstr "Ressource ajoutée"
+#: ajax_htmldata/getAttachmentDetails.php:67
+msgid "No attachments available"
+msgstr "Pas de pièce jointe disponible."
 
-#: resource.php:236
-msgid "Send feedback on this resource"
-msgstr "Evaluer cette ressource"
+#: ajax_htmldata/getAttachmentDetails.php:72
+msgid "add new attachment"
+msgstr "Ajouter pièce jointe"
 
-#: resources/cataloging.php:103 summary.php:731
-msgid "Cataloging"
-msgstr "Catalogage"
+#: ajax_htmldata/getSavedQueue.php:11
+msgid "No saved requests"
+msgstr "Pas de requête enregistrée"
 
-#: resources/cataloging.php:114 summary.php:737
-msgid "Identifier:"
-msgstr "Identifiant:"
+#: ajax_htmldata/getSavedQueue.php:19 ajax_htmldata/getSubmittedQueue.php:16
+#: ajax_htmldata/getSearchResources.php:115
+msgid "Date Created"
+msgstr "Date de création"
 
-#: resources/cataloging.php:120
-msgid "Source URL:"
-msgstr "Source URL:"
+#: ajax_htmldata/getSavedQueue.php:49
+msgid "edit request"
+msgstr "Modifier requête"
 
-#: resources/cataloging.php:121
-msgid "Visit Source URL"
-msgstr "Source URL de visite"
+#: ajax_htmldata/getSavedQueue.php:50
+msgid "remove request"
+msgstr "Supprimer requête"
 
-#: resources/cataloging.php:128 summary.php:751
-msgid "Cataloging Type:"
-msgstr "Type de catalogage:"
+#: ajax_htmldata/getSubmittedQueue.php:8
+msgid "No submitted requests"
+msgstr "Pas de requête soumise"
 
-#: resources/cataloging.php:136 summary.php:759
-msgid "Cataloging Status:"
-msgstr "Statut de catalogage:"
+#: ajax_htmldata/getAccessDetails.php:109
+msgid "No access information available"
+msgstr "Pas d'information d'accès disponible"
 
-#: resources/cataloging.php:141
-msgid "Number of Records Available"
-msgstr "Nombre d'enregistrements disponibles"
+#: ajax_htmldata/getAccessDetails.php:116
+msgid "edit access information"
+msgstr "Modifier information d'accès"
 
-#: resources/cataloging.php:142 summary.php:765
-msgid "# Records Available:"
-msgstr "# fiches disponibles"
+#: ajax_htmldata/getSearchResources.php:38
+msgid "Sorry, no requests fit your query"
+msgstr "Désolé, il n'y a pas de résultat à  votre requête"
 
-#: resources/cataloging.php:147
-msgid "Number of Records Loaded"
-msgstr "Nombre de fiches chargées"
+#: ajax_htmldata/getSearchResources.php:52
+msgid "Displaying "
+msgstr "Affichage de "
 
-#: resources/cataloging.php:148 summary.php:771
-msgid "# Records Loaded:"
-msgstr "# Fiches chargées"
+#: ajax_htmldata/getSearchResources.php:52
+msgid " to "
+msgstr " sur "
 
-#: resources/cataloging.php:153 summary.php:777
-msgid "OCLC Holdings:"
-msgstr "OCLC Holdings:"
+#: ajax_htmldata/getSearchResources.php:52
+msgid " of "
+msgstr " de "
 
-#: resources/cataloging.php:154 summary.php:778
-msgid "Yes"
-msgstr "Oui"
+#: ajax_htmldata/getSearchResources.php:52
+msgid " Resource Records"
+msgstr " fiches ressources"
 
-#: resources/cataloging.php:154 summary.php:778
-msgid "No"
-msgstr "Non"
+#: ajax_htmldata/getSearchResources.php:64
+#: ajax_htmldata/getSearchResources.php:161
+msgid "previous page"
+msgstr "Page précédente"
 
-#: resources/cataloging.php:159 summary.php:784
-msgid "No cataloging information available."
-msgstr "Information de catalogage non disponible."
+#: ajax_htmldata/getSearchResources.php:98
+#: ajax_htmldata/getSearchResources.php:195
+msgid "next page"
+msgstr "Page suivante"
 
-#: resources/cataloging.php:165
-msgid "edit cataloging details"
-msgstr "Modifier détails de catalogage"
+#: ajax_htmldata/getSearchResources.php:212
+msgid "records per page"
+msgstr "résultats par page"
 
-#: resources/cataloging_edit.php:15
-msgid "Edit Cataloging"
-msgstr "Modifier catalogage"
+#: ajax_htmldata/getContactDetails.php:23
+msgid "The following are archived contacts:"
+msgstr "Les contacts suivants sont archivés: "
 
-#: resources/cataloging_edit.php:24
-msgid "Record Set"
-msgstr "Jeu d'enregistrement"
+#: ajax_htmldata/getContactDetails.php:39
+msgid "No Resource Specific Contacts"
+msgstr "Pas de ressource spécifique  pour ce contact"
 
-#: resources/cataloging_edit.php:36
-msgid "Identifier"
-msgstr "Identifiant"
+#: ajax_htmldata/getContactDetails.php:43
+#: ajax_htmldata/getContactDetails.php:187
+#: ajax_htmldata/getContactDetails.php:197
+msgid "add contact"
+msgstr "Ajouter contact"
 
-#: resources/cataloging_edit.php:42
-msgid "Source URL"
-msgstr "Source URL"
+#: ajax_htmldata/getContactDetails.php:68
+msgid "edit contact"
+msgstr "Modifier contact"
 
-#: resources/cataloging_edit.php:68
-msgid "# Records Available"
-msgstr "# Fiches disponibles"
+#: ajax_htmldata/getContactDetails.php:69
+msgid "remove contact"
+msgstr "Supprimer contact"
 
-#: resources/cataloging_edit.php:75
-msgid "# Records Loaded"
-msgstr "# Fiches chargées"
+#: ajax_htmldata/getContactDetails.php:84
+msgid "Visit Contact in Organizations Module"
+msgstr "Voir contact dans le module Organisations"
 
-#: resources/cataloging_edit.php:82
-msgid "OCLC Holdings"
-msgstr "OCLC Holdings"
+#: ajax_htmldata/getContactDetails.php:92
+msgid "No longer valid:"
+msgstr "N'est plus valide:"
 
-#: sendAlerts.php:76
-msgid "No Resources found fitting alert day criteria"
-msgstr "Aucune ressource ne répond aux critères d'alerte du jour"
+#: ajax_htmldata/getContactDetails.php:116
+msgid "Location:"
+msgstr "Localisation:"
 
-#: sendAlerts.php:81
-msgid "Alerts not enabled in configuration.ini file"
-msgstr "Les alertes ne sont pas activées dans le fichier configuration.ini"
+#: ajax_htmldata/getContactDetails.php:195
+msgid "No contacts available"
+msgstr "Pas de contact disponible"
 
-#: setuser.php:44
-msgid ""
-"LDAP Connection is not working or has timed out.  Please check configuration."
-"ini to verify settings."
-msgstr ""
-"La connexion LDAP ne marche pas ou a expiré. S'il vous plaît vérifiez la "
-"configuration du configuration.ini."
+#: ajax_htmldata/getContactDetails.php:205
+msgid " archived contact(s) available."
+msgstr " contact(s) archivé(s) disponible(s)."
 
-#: summary.php:34
-msgid " Summary"
-msgstr " Resumé"
+#: ajax_htmldata/getContactDetails.php:205
+msgid "show archived contacts"
+msgstr "montrer les contacts archivés"
 
-#: summary.php:275
-msgid "(Parent)"
-msgstr "(Parent)"
+#: ajax_htmldata/getContactDetails.php:209
+msgid "hide archived contacts"
+msgstr "Cacher les contacts archivés"
 
-#: summary.php:402
-msgid "Additional Product Notes"
-msgstr "Notes additionnelles du produit"
+#: ajax_htmldata/getProductDetails.php:69
+msgid "remove resource"
+msgstr "Supprimer ressource"
 
-#: summary.php:451
-msgid "Purchasing Site:"
-msgstr "Site d'acquisition:"
+#: ajax_htmldata/getProductDetails.php:69
+msgid "remove resource and its children"
+msgstr "Supprimer ressource et ses fils"
 
-#: summary.php:501
-msgid "No payment information available."
-msgstr "L'information du paiement n'est pas disponible."
+#: ajax_htmldata/getProductDetails.php:173
+#: ajax_htmldata/getProductDetails.php:181
+msgid "view resource"
+msgstr "voir ressource"
 
-#: summary.php:590
-msgid "Additional Acquisitions Notes"
-msgstr "Notes additionnelles d'acquisition"
+#: ajax_htmldata/getProductDetails.php:173
+#: ajax_htmldata/getProductDetails.php:181
+#: ajax_htmldata/getProductDetails.php:235
+msgid "View "
+msgstr "Voir "
 
-#: summary.php:620
-msgid "No access information available."
-msgstr "Pas d'information d'accès disponible."
+#: ajax_htmldata/getProductDetails.php:250
+msgid "Visit Resource URL"
+msgstr "Visiter la ressource"
 
-#: summary.php:715
-msgid "Additional Access Notes"
-msgstr "Notes additionnelles de connexion:"
+#: ajax_htmldata/getProductDetails.php:258
+msgid "Visit Secondary Resource URL"
+msgstr "Ressource URL secondaire de visite"
 
-#: summary.php:828
-msgid "Additional Cataloging Notes"
-msgstr "Notes additionnelles du catalogue"
+#: ajax_htmldata/getProductDetails.php:273
+msgid "edit product details"
+msgstr "Modifier détails"
 
-#: templates/header.php:74
-msgid ""
-"JavaScript must be enabled in order for you to use CORAL. However, it seems "
-"JavaScript is either disabled or not supported by your browser. To use "
-"CORAL, enable JavaScript by changing your browser options, then "
-msgstr ""
-"JavaScript doit être activé pour utiliser CORAL. JavaScript est désactivé ou "
-"n'est pas supporté par votre navigateur. Pour utiliser CORAL, activez "
-"JavaScript en modifiant la configuration de votre navigateur, puis"
+#: ajax_htmldata/getProductDetails.php:340
+msgid "remove subject"
+msgstr "Supprimer sujet"
 
-#: templates/header.php:74
-msgid "try again"
-msgstr "réessayez"
+#: ajax_htmldata/getProductDetails.php:361
+msgid "add new subject"
+msgstr "Ajouter sujet"
 
-#: templates/header.php:93
-msgid "Hello, "
-msgstr "Bonjour, "
+#: ajax_htmldata/getAdminCurrencyDisplay.php:38
+msgid "add new currency"
+msgstr "Ajouter devise"
 
-#: templates/header.php:104
-msgid "logout"
-msgstr "Se déconnecter"
+#: ajax_htmldata/getAdminUserDisplay.php:47
+msgid "edit user"
+msgstr "Modifier utilisateur"
 
-#: templates/header.php:106
-msgid "(Test)"
-msgstr "(Test)"
+#: ajax_htmldata/getAdminUserDisplay.php:54
+#: ajax_htmldata/getAdminUserDisplay.php:58
+msgid "add new user"
+msgstr "Ajouter utilisateur"
 
-#: templates/header.php:116
-msgid "New Resource"
-msgstr "Nouvelle ressource"
+#: admin/classes/common/Object.php:63 admin/classes/common/Object.php:72
+msgid "Cannot set value for undefined key ("
+msgstr "Ne peut pas assigner une clé indefinie ("
 
-#: templates/header.php:117
-msgid "Import"
-msgstr "Importer"
+#: admin/classes/common/LdapPerson.php:34
+msgid "Could not connect to "
+msgstr "N'a pas pu se connecter à "
 
-#: templates/header.php:118
-msgid "Admin"
-msgstr "Administrer"
+#: admin/classes/common/Utility.php:121
+msgid "Error: unexpected fgets() fail"
+msgstr "Erreur: inattendu fgets() échoue"
 
-#: templates/header.php:134
-msgid "Change Module"
-msgstr "Changer le module"
+#: admin/classes/common/Utility.php:133
+msgid "Edit DDW facet/term selections at: "
+msgstr "Modifier selections DDW facet/term à: "
 
-#: templates/header.php:177
-msgid "Invalid translation route!"
-msgstr "Le chemin des traductions n'est pas valide!"
+#: admin/classes/common/Utility.php:148
+msgid "Email template file not found: "
+msgstr "Le fichier template pour l'email est introuvable: "
 
-#: user.php:101
-msgid ""
-"Login is not working.  Check the .htaccess file and the "
-"remoteAuthVariableName specified in /admin/configuration.ini"
-msgstr ""
-"La connexion ne fonctionne pas. Vérifiez le fichier .htaccess et la valeur "
-"de remoteAuthVariableName specifiée dans /admin/configuration.ini"
+#: admin/classes/common/DBService.php:39
+msgid "There was a problem with the database: "
+msgstr "Il y avait un problème avec la base de données: "
 
-#: js/admin.js:301
-msgid "Number of days must be a number"
-msgstr "Le nombre de jours doit être un nombre"
+#~ msgid "Number of days must be a number"
+#~ msgstr "Le nombre de jours doit être un nombre"
 
-#: js/admin.js:304
-msgid "Number of days should be between 1 and 365"
-msgstr "Le nombre de jours doit être compris entre 1 et 365"
+#~ msgid "Number of days should be between 1 and 365"
+#~ msgstr "Le nombre de jours doit être compris entre 1 et 365"
 
-#: js/admin.js:325
-msgid "Do you really want to delete this data?"
-msgstr "Voulez-vous vraiment supprimer cette donnée?"
+#~ msgid "Do you really want to delete this data?"
+#~ msgstr "Voulez-vous vraiment supprimer cette donnée?"
 
-#: js/admin.js:352 js/admin.js:380 js/admin.js:408 js/admin.js:497
-msgid "Do you really want to remove this data?"
-msgstr "Voulez-vous vraiment enlever cette donnée?"
+#~ msgid "Do you really want to remove this data?"
+#~ msgstr "Voulez-vous vraiment enlever cette donnée?"
 
-#: js/admin.js:438
-msgid "Do you really want to delete this user?"
-msgstr "Voulez-vous vraiment supprimer cet utilisateur?"
+#~ msgid "Do you really want to delete this user?"
+#~ msgstr "Voulez-vous vraiment supprimer cet utilisateur?"
 
-#: js/admin.js:468
-msgid "Do you really want to remove this alert setting?"
-msgstr "Voulez-vous vraiment effacer cette configuration d'alerte?"
+#~ msgid "Do you really want to remove this alert setting?"
+#~ msgstr "Voulez-vous vraiment effacer cette configuration d'alerte?"
 
-#: js/admin.js:527
-msgid "Do you really want to delete this currency?"
-msgstr "Voulez-vous vraiment supprimer cette devise?"
+#~ msgid "Do you really want to delete this currency?"
+#~ msgstr "Voulez-vous vraiment supprimer cette devise?"
 
-#: js/common.js:73
-msgid "No match!"
-msgstr "Aucune concordance!"
+#~ msgid "No match!"
+#~ msgstr "Aucune concordance!"
 
-#: js/common.js:73
-msgid "Selected: "
-msgstr "Sélectionné: "
+#~ msgid "Selected: "
+#~ msgstr "Sélectionné: "
 
-#: js/forms/acquisitionsForm.js:123 js/forms/costForm.js:108
-msgid "Error - Either amount or fund is required"
-msgstr "Erreur, fond ou quantité est obligataoire"
+#~ msgid "Error - Either amount or fund is required"
+#~ msgstr "Erreur, fond ou quantité est obligataoire"
 
-#: js/forms/acquisitionsForm.js:126 js/forms/costForm.js:111
-#: js/forms/costForm.js:289
-msgid "Error - order type is a required field"
-msgstr "Erreur - le type de commande est obligatoire"
+#~ msgid "Error - order type is a required field"
+#~ msgstr "Erreur - le type de commande est obligatoire"
 
-#: js/forms/acquisitionsForm.js:129 js/forms/costForm.js:114
-#: js/forms/costForm.js:295
-msgid "Error - price is not numeric"
-msgstr "Erreur: le prix n'est pas numérique"
+#~ msgid "Error - price is not numeric"
+#~ msgstr "Erreur: le prix n'est pas numérique"
 
-#: js/forms/acquisitionsForm.js:227
-msgid "Error - acquisition type is a required field"
-msgstr "Erreur - le type d'acquisition est obligatoire"
+#~ msgid "Error - acquisition type is a required field"
+#~ msgstr "Erreur - le type d'acquisition est obligatoire"
 
-#: js/forms/attachmentForm.js:94
-msgid "File name is already being used..."
-msgstr "Le nom du fichier est utilisé..."
+#~ msgid "File name is already being used..."
+#~ msgstr "Le nom du fichier est utilisé..."
 
-#: js/forms/attachmentForm.js:98
-msgid ""
-"File name may not contain special characters - ampersand, single quote, "
-"double quote or less than/greater than characters"
-msgstr ""
-"Le nom du fichier ne peut pas contenir des caractères spéciaux -  "
-"esperluette, apostrophe, guillemet ou moins que / plus que."
+#~ msgid ""
+#~ "File name may not contain special characters - ampersand, single quote, "
+#~ "double quote or less than/greater than characters"
+#~ msgstr ""
+#~ "Le nom du fichier ne peut pas contenir des caractères spéciaux -  "
+#~ "esperluette, apostrophe, guillemet ou moins que / plus que."
 
-#: js/forms/attachmentForm.js:102
-msgid "The attachments directory is not writable."
-msgstr "Le dossier des pièces jointes n'a pas les droits d'écriture."
+#~ msgid "The attachments directory is not writable."
+#~ msgstr "Le dossier des pièces jointes n'a pas les droits d'écriture."
 
-#: js/forms/attachmentForm.js:124 js/forms/attachmentForm.js:146
-msgid " successfully uploaded."
-msgstr " téléchargé avec succès."
+#~ msgid " successfully uploaded."
+#~ msgstr " téléchargé avec succès."
 
-#: js/forms/attachmentForm.js:159 js/forms/resourceUpdateForm.js:378
-msgid "Name must be entered to continue."
-msgstr "Le nom doit être écrit avant de continuer."
+#~ msgid "Name must be entered to continue."
+#~ msgstr "Le nom doit être écrit avant de continuer."
 
-#: js/forms/attachmentForm.js:160
-msgid "Attachment Type must be selected to continue."
-msgstr "Le type de pièce jointe doit être sélectionné avant de continuer."
+#~ msgid "Attachment Type must be selected to continue."
+#~ msgstr "Le type de pièce jointe doit être sélectionné avant de continuer."
 
-#: js/forms/attachmentForm.js:178
-msgid "A file must be uploaded"
-msgstr "Le fichier doit être téléchargé"
+#~ msgid "A file must be uploaded"
+#~ msgstr "Le fichier doit être téléchargé"
 
-#: js/forms/contactForm.js:179
-msgid "Please choose at least one role."
-msgstr "Choisissez au moins un rôle."
+#~ msgid "Please choose at least one role."
+#~ msgstr "Choisissez au moins un rôle."
 
-#: js/forms/costForm.js:283
-msgid "Error - Either price or fund is required"
-msgstr "Erreur, fond ou quantité est obligatoire"
+#~ msgid "Error - Either price or fund is required"
+#~ msgstr "Erreur, fond ou quantité est obligatoire"
 
-#: js/forms/detailedSubjectForm.js:60 js/forms/generalSubjectForm.js:59
-msgid "Error - Please enter a value"
-msgstr "Erreur - Saisissez une valeur"
+#~ msgid "Error - Please enter a value"
+#~ msgstr "Erreur - Saisissez une valeur"
 
-#: js/forms/generalDetailSubjectForm.js:87
-msgid "Error - Detailed Subject is required"
-msgstr "Erreur - Le sujet détaillé est nécessaire"
+#~ msgid "Error - Detailed Subject is required"
+#~ msgstr "Erreur - Le sujet détaillé est nécessaire"
 
-#: js/forms/generalDetailSubjectForm.js:108
-#: js/forms/generalDetailSubjectForm.js:109
-msgid "Error - Detail Subject Already Added"
-msgstr "Erreur - Le sujet détaillé est déjà ajouté"
+#~ msgid "Error - Detail Subject Already Added"
+#~ msgstr "Erreur - Le sujet détaillé est déjà ajouté"
 
-#: js/forms/generalDetailSubjectForm.js:136 js/forms/userGroupForm.js:118
-msgid "remove from group"
-msgstr "Enlever du groupe"
+#~ msgid "remove from group"
+#~ msgstr "Enlever du groupe"
 
-#: js/forms/generalDetailSubjectForm.js:181
-msgid "Short Name must be entered to continue."
-msgstr "Un petit nom doit être saisi pour continuer."
+#~ msgid "Short Name must be entered to continue."
+#~ msgstr "Un petit nom doit être saisi pour continuer."
 
-#: js/forms/licenseForm.js:140 js/forms/licenseForm.js:256
-msgid "Error - Please choose a valid license"
-msgstr "Erreur - Choisissez une licence valide"
+#~ msgid "Error - Please choose a valid license"
+#~ msgstr "Erreur - Choisissez une licence valide"
 
-#: js/forms/licenseForm.js:155 js/forms/licenseForm.js:156
-msgid "remove this license"
-msgstr "Supprimer cette licence"
+#~ msgid "remove this license"
+#~ msgstr "Supprimer cette licence"
 
-#: js/forms/resourceNewForm.js:99
-msgid "Warning: this name already exists."
-msgstr "Attention: le nom existe déjà."
+#~ msgid "Warning: this name already exists."
+#~ msgstr "Attention: le nom existe déjà."
 
-#: js/forms/resourceNewForm.js:227
-msgid "A title must be entered to continue."
-msgstr "Un titre doit être écrit avant de continuer."
+#~ msgid "A title must be entered to continue."
+#~ msgstr "Un titre doit être écrit avant de continuer."
 
-#: js/forms/resourceNewForm.js:232
-msgid "The resource format is required."
-msgstr "Le format de ressource est obligatoire."
+#~ msgid "The resource format is required."
+#~ msgstr "Le format de ressource est obligatoire."
 
-#: js/forms/resourceNewForm.js:237
-msgid "The resource type is required."
-msgstr "Le type de ressource est obligatoire."
+#~ msgid "The resource type is required."
+#~ msgstr "Le type de ressource est obligatoire."
 
-#: js/forms/resourceNoteForm.js:34
-msgid "Note must be entered to continue."
-msgstr "La note doit être saisie avant de continuer."
+#~ msgid "Note must be entered to continue."
+#~ msgstr "La note doit être saisie avant de continuer."
 
-#: js/forms/resourceUpdateForm.js:90
-msgid "Error - Parent cannot be the same as the child"
-msgstr "Erreur - Le père ne peut pas être aussi l'enfant"
+#~ msgid "Error - Parent cannot be the same as the child"
+#~ msgstr "Erreur - Le père ne peut pas être aussi l'enfant"
 
-#: js/forms/resourceUpdateForm.js:217 js/forms/resourceUpdateForm.js:302
-#: js/forms/resourceUpdateForm.js:392 js/forms/resourceUpdateForm.js:403
-msgid "Error - Both fields are required"
-msgstr "Erreur, Les deux champs sont obligatoires"
+#~ msgid "Error - Both fields are required"
+#~ msgstr "Erreur, Les deux champs sont obligatoires"
 
-#: js/forms/resourceUpdateForm.js:277
-msgid "Error - Parent is not found.  Please use the Autocomplete."
-msgstr "Erreur - Le parent n'est pas trouvé. Utilisez l’auto complétion"
+#~ msgid "Error - Parent is not found.  Please use the Autocomplete."
+#~ msgstr "Erreur - Le parent n'est pas trouvé. Utilisez l’auto complétion"
 
-#: js/forms/resourceUpdateForm.js:304
-msgid "Error - Organization is not found.  Please use the Autocomplete."
-msgstr "Erreur - L'organisation n'est pas trouvée. Utilisez l’auto complétion."
+#~ msgid "Error - Organization is not found.  Please use the Autocomplete."
+#~ msgstr ""
+#~ "Erreur - L'organisation n'est pas trouvée. Utilisez l’auto complétion."
 
-#: js/forms/resourceUpdateForm.js:321 js/forms/resourceUpdateForm.js:322
-msgid "remove this organization"
-msgstr "Supprimer organisation"
+#~ msgid "remove this organization"
+#~ msgstr "Supprimer organisation"
 
-#: js/forms/resourceUpdateForm.js:394
-msgid "Error - Organization is not found.  Please use Autocomplete."
-msgstr "Erreur - L'organisation n'est pas trouvée. Utilisez l'auto complétion."
+#~ msgid "Error - Organization is not found.  Please use Autocomplete."
+#~ msgstr ""
+#~ "Erreur - L'organisation n'est pas trouvée. Utilisez l'auto complétion."
 
-#: js/forms/userGroupForm.js:101
-msgid "Error - User is required"
-msgstr "Erreur, un utilisateur est obligatoire"
+#~ msgid "Error - User is required"
+#~ msgstr "Erreur, un utilisateur est obligatoire"
 
-#: js/forms/userGroupForm.js:163
-msgid "Group name must be entered to continue."
-msgstr "Le nom du groupe doit être saisi avant de continuer."
+#~ msgid "Group name must be entered to continue."
+#~ msgstr "Le nom du groupe doit être saisi avant de continuer."
 
-#: js/forms/workflowForm.js:185
-msgid "Error - Step name is required"
-msgstr "Erreur, Le nom de l'étape est obligatoire"
+#~ msgid "Error - Step name is required"
+#~ msgstr "Erreur, Le nom de l'étape est obligatoire"
 
-#: js/forms/workflowForm.js:373
-msgid "Please add at least one step to this workflow."
-msgstr "AZjoutez au moins une étape à ce workflow."
+#~ msgid "Please add at least one step to this workflow."
+#~ msgstr "AZjoutez au moins une étape à ce workflow."
 
-#: js/forms/workflowForm.js:379
-msgid ""
-"Please click the Add button to the first step before submitting this "
-"workflow."
-msgstr ""
-"Cliquez sur le bouton Ajouter pour cette étape avant de valider ce workflow."
+#~ msgid ""
+#~ "Please click the Add button to the first step before submitting this "
+#~ "workflow."
+#~ msgstr ""
+#~ "Cliquez sur le bouton Ajouter pour cette étape avant de valider ce "
+#~ "workflow."
 
-#: js/index.js:112
-msgid "Processing..."
-msgstr "En traitement..."
+#~ msgid "Processing..."
+#~ msgstr "En traitement..."
 
-#: js/plugins/date.js:30
-msgid "Sunday"
-msgstr "Dimanche"
+#~ msgid "Sunday"
+#~ msgstr "Dimanche"
 
-#: js/plugins/date.js:30
-msgid "Monday"
-msgstr "Lundi"
+#~ msgid "Monday"
+#~ msgstr "Lundi"
 
-#: js/plugins/date.js:30
-msgid "Tuesday"
-msgstr "Mardi"
+#~ msgid "Tuesday"
+#~ msgstr "Mardi"
 
-#: js/plugins/date.js:30
-msgid "Wednesday"
-msgstr "Mercredi"
+#~ msgid "Wednesday"
+#~ msgstr "Mercredi"
 
-#: js/plugins/date.js:30
-msgid "Thursday"
-msgstr "Jeudi"
+#~ msgid "Thursday"
+#~ msgstr "Jeudi"
 
-#: js/plugins/date.js:30
-msgid "Friday"
-msgstr "Vendredi"
+#~ msgid "Friday"
+#~ msgstr "Vendredi"
 
-#: js/plugins/date.js:30
-msgid "Saturday"
-msgstr "Samedi"
+#~ msgid "Saturday"
+#~ msgstr "Samedi"
 
-#: js/plugins/date.js:42
-msgid "Sun"
-msgstr "Dim"
+#~ msgid "Sun"
+#~ msgstr "Dim"
 
-#: js/plugins/date.js:42
-msgid "Mon"
-msgstr "Lun"
+#~ msgid "Mon"
+#~ msgstr "Lun"
 
-#: js/plugins/date.js:42
-msgid "Tue"
-msgstr "Mar"
+#~ msgid "Tue"
+#~ msgstr "Mar"
 
-#: js/plugins/date.js:42
-msgid "Wed"
-msgstr "Mer"
+#~ msgid "Wed"
+#~ msgstr "Mer"
 
-#: js/plugins/date.js:42
-msgid "Thu"
-msgstr "Jeu"
+#~ msgid "Thu"
+#~ msgstr "Jeu"
 
-#: js/plugins/date.js:42
-msgid "Fri"
-msgstr "Ven"
+#~ msgid "Fri"
+#~ msgstr "Ven"
 
-#: js/plugins/date.js:42
-msgid "Sat"
-msgstr "Sam"
+#~ msgid "Sat"
+#~ msgstr "Sam"
 
-#: js/plugins/date.js:54
-msgid "January"
-msgstr "Janvier"
+#~ msgid "January"
+#~ msgstr "Janvier"
 
-#: js/plugins/date.js:54
-msgid "February"
-msgstr "Février"
+#~ msgid "February"
+#~ msgstr "Février"
 
-#: js/plugins/date.js:54
-msgid "March"
-msgstr "Mars"
+#~ msgid "March"
+#~ msgstr "Mars"
 
-#: js/plugins/date.js:54
-msgid "April"
-msgstr "Avril"
+#~ msgid "April"
+#~ msgstr "Avril"
 
-#: js/plugins/date.js:54 js/plugins/date.js:66
-msgid "May"
-msgstr "Mai"
+#~ msgid "May"
+#~ msgstr "Mai"
 
-#: js/plugins/date.js:54
-msgid "June"
-msgstr "Juin"
+#~ msgid "June"
+#~ msgstr "Juin"
 
-#: js/plugins/date.js:54
-msgid "July"
-msgstr "Juillet"
+#~ msgid "July"
+#~ msgstr "Juillet"
 
-#: js/plugins/date.js:54
-msgid "August"
-msgstr "Août"
+#~ msgid "August"
+#~ msgstr "Août"
 
-#: js/plugins/date.js:54
-msgid "September"
-msgstr "Septembre"
+#~ msgid "September"
+#~ msgstr "Septembre"
 
-#: js/plugins/date.js:54
-msgid "October"
-msgstr "Octobre"
+#~ msgid "October"
+#~ msgstr "Octobre"
 
-#: js/plugins/date.js:54
-msgid "November"
-msgstr "Novembre"
+#~ msgid "November"
+#~ msgstr "Novembre"
 
-#: js/plugins/date.js:54
-msgid "December"
-msgstr "Décembre"
+#~ msgid "December"
+#~ msgstr "Décembre"
 
-#: js/plugins/date.js:66
-msgid "Jan"
-msgstr "Jan"
+#~ msgid "Jan"
+#~ msgstr "Jan"
 
-#: js/plugins/date.js:66
-msgid "Feb"
-msgstr "Fév"
+#~ msgid "Feb"
+#~ msgstr "Fév"
 
-#: js/plugins/date.js:66
-msgid "Mar"
-msgstr "Mar"
+#~ msgid "Mar"
+#~ msgstr "Mar"
 
-#: js/plugins/date.js:66
-msgid "Apr"
-msgstr "Avr"
+#~ msgid "Apr"
+#~ msgstr "Avr"
 
-#: js/plugins/date.js:66
-msgid "Jun"
-msgstr "Jui"
+#~ msgid "Jun"
+#~ msgstr "Jui"
 
-#: js/plugins/date.js:66
-msgid "Jul"
-msgstr "Juil"
+#~ msgid "Jul"
+#~ msgstr "Juil"
 
-#: js/plugins/date.js:66
-msgid "Aug"
-msgstr "Aoû"
+#~ msgid "Aug"
+#~ msgstr "Aoû"
 
-#: js/plugins/date.js:66
-msgid "Sep"
-msgstr "Sep"
+#~ msgid "Sep"
+#~ msgstr "Sep"
 
-#: js/plugins/date.js:66
-msgid "Oct"
-msgstr "Oct"
+#~ msgid "Oct"
+#~ msgstr "Oct"
 
-#: js/plugins/date.js:66
-msgid "Nov"
-msgstr "Nov"
+#~ msgid "Nov"
+#~ msgstr "Nov"
 
-#: js/plugins/date.js:66
-msgid "Dec"
-msgstr "Déc"
+#~ msgid "Dec"
+#~ msgstr "Déc"
 
-#: js/plugins/jquery.datePicker.js:1129
-msgid "Previous year"
-msgstr "Année précédente"
+#~ msgid "Previous year"
+#~ msgstr "Année précédente"
 
-#: js/plugins/jquery.datePicker.js:1130
-msgid "Previous month"
-msgstr "Mois précédent"
+#~ msgid "Previous month"
+#~ msgstr "Mois précédent"
 
-#: js/plugins/jquery.datePicker.js:1131
-msgid "Next year"
-msgstr "Année suivante"
+#~ msgid "Next year"
+#~ msgstr "Année suivante"
 
-#: js/plugins/jquery.datePicker.js:1132
-msgid "Next month"
-msgstr "Mois suivant"
+#~ msgid "Next month"
+#~ msgstr "Mois suivant"
 
-#: js/plugins/jquery.datePicker.js:1133
-msgid "Close"
-msgstr "Fermer"
+#~ msgid "Close"
+#~ msgstr "Fermer"
 
-#: js/plugins/jquery.datePicker.js:1134
-msgid "Choose date"
-msgstr "Choisir la date"
+#~ msgid "Choose date"
+#~ msgstr "Choisir la date"
 
-#: js/queue.js:55 js/queue.js:89 js/queue.js:123 js/queue.js:155
-msgid "Refreshing..."
-msgstr "Rechargement..."
+#~ msgid "Refreshing..."
+#~ msgstr "Rechargement..."
 
-#: js/queue.js:153
-msgid "Do you really want to delete this request?"
-msgstr "Voulez-vous vraiment supprimer cette requête?"
+#~ msgid "Do you really want to delete this request?"
+#~ msgstr "Voulez-vous vraiment supprimer cette requête?"
 
-#: js/queue.js:193 js/queue.js:214 js/queue.js:235 js/resource.js:275
-msgid " record)"
-msgstr " fiche)"
+#~ msgid " record)"
+#~ msgstr " fiche)"
 
-#: js/queue.js:195 js/queue.js:216 js/queue.js:237 js/resource.js:277
-msgid " records)"
-msgstr " fiches)"
+#~ msgid " records)"
+#~ msgstr " fiches)"
 
-#: js/resource.js:209 js/resource.js:323
-msgid "Refreshing Contents..."
-msgstr "Rechargements des contenus..."
+#~ msgid "Refreshing Contents..."
+#~ msgstr "Rechargements des contenus..."
 
-#: js/resource.js:369
-msgid "Do you really want to delete this contact?"
-msgstr "Voulez-vous vraiment supprimer ce contact?"
+#~ msgid "Do you really want to delete this contact?"
+#~ msgstr "Voulez-vous vraiment supprimer ce contact?"
 
-#: js/resource.js:387
-msgid "Do you really want to delete this account?"
-msgstr "Voulez-vous vraiment supprimer ce compte?"
+#~ msgid "Do you really want to delete this account?"
+#~ msgstr "Voulez-vous vraiment supprimer ce compte?"
 
-#: js/resource.js:405
-msgid "Do you really want to delete this attachment?"
-msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
+#~ msgid "Do you really want to delete this attachment?"
+#~ msgstr "Voulez-vous vraiment supprimer cette pièce jointe?"
 
-#: js/resource.js:425
-msgid "Do you really want to delete this resource?"
-msgstr "Voulez-vous vraiment supprimer cette ressource?"
+#~ msgid "Do you really want to delete this resource?"
+#~ msgstr "Voulez-vous vraiment supprimer cette ressource?"
 
-#: js/resource.js:443
-msgid "Do you really want to delete this resource and all its children?"
-msgstr "Voulez-vous vraiment supprimer cette ressource et tous ses fils?"
+#~ msgid "Do you really want to delete this resource and all its children?"
+#~ msgstr "Voulez-vous vraiment supprimer cette ressource et tous ses fils?"
 
-#: js/resource.js:464
-msgid "Do you really want to remove this Subject?"
-msgstr "Voulez-vous vraiment enlever ce sujet?"
+#~ msgid "Do you really want to remove this Subject?"
+#~ msgstr "Voulez-vous vraiment enlever ce sujet?"
 
-#: js/resource.js:482
-msgid "Do you really want to delete this note?"
-msgstr "Voulez-vous vraiment supprimer cette note?"
+#~ msgid "Do you really want to delete this note?"
+#~ msgstr "Voulez-vous vraiment supprimer cette note?"
 
-#: js/resource.js:525
-msgid ""
-"Warning!  You are about to remove any steps that have been started and "
-"completed.  Are you sure you wish to continue?"
-msgstr ""
-"Attention! Vous êtes sur le point d'effacer quelques étapes qui ont été "
-"commencées et complétées. Êtes-vous sûrs que vous voulez continuer?"
+#~ msgid ""
+#~ "Warning!  You are about to remove any steps that have been started and "
+#~ "completed.  Are you sure you wish to continue?"
+#~ msgstr ""
+#~ "Attention! Vous êtes sur le point d'effacer quelques étapes qui ont été "
+#~ "commencées et complétées. Êtes-vous sûrs que vous voulez continuer?"
 
-#: js/resource.js:542
-msgid ""
-"Do you really want to mark this resource complete?  This action cannot be "
-"undone."
-msgstr ""
-"Êtes-vous sûrs de marquer cette ressource comme complète? Cette action ne "
-"peut pas être annulée."
+#~ msgid ""
+#~ "Do you really want to mark this resource complete?  This action cannot be "
+#~ "undone."
+#~ msgstr ""
+#~ "Êtes-vous sûrs de marquer cette ressource comme complète? Cette action ne "
+#~ "peut pas être annulée."
 
 #~ msgid "Spanish, ES"
 #~ msgstr "Espagnol, ES"

From 0cf9dbb26bb1c8dcbfb5f771fbbb839f59678924 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 23 Jul 2015 13:29:06 -0500
Subject: [PATCH 037/159] update install scripts

---
 install/protected/install.sql | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/install/protected/install.sql b/install/protected/install.sql
index 473fda9..7b3be45 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -591,6 +591,50 @@ CREATE TABLE `_DATABASE_NAME_`.`CostDetails` (
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 
 
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
+CREATE TABLE `_DATABASE_NAME_`.`Issue` (
+  `issueID` int(11) NOT NULL AUTO_INCREMENT,
+  `creatorID` int(11) NOT NULL,
+  `subjectText` varchar(80) NOT NULL,
+  `bodyText` text NOT NULL,
+  `reminderInterval` int(11) NOT NULL,
+  `dateCreated` datetime NOT NULL,
+  `dateClosed` datetime NOT NULL,
+  `resolutionText` text NOT NULL,
+  PRIMARY KEY (`issueID`),
+  KEY `creatorID` (`creatorID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueRelationship`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
+  `issueRelationshipID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `entityID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL,
+  PRIMARY KEY (`issueRelationshipID`),
+  KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
+  `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `entityName` varchar(80) NOT NULL,
+  PRIMARY KEY (`entityTypeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
+  `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `contactID` int(11) NOT NULL,
+  `isPrimary` tinyint(1) NOT NULL,
+  PRIMARY KEY (`issueContactID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
 ALTER TABLE `_DATABASE_NAME_`.`Alias` ADD INDEX `Index_resourceID`(`resourceID`),
  ADD INDEX `Index_aliasTypeID`(`aliasTypeID`),
  ADD INDEX `shortName` ( `shortName` ),

From da8f8a6086853c5e8b6ae57513c22a7e7e9f2c90 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 14:39:02 -0500
Subject: [PATCH 038/159] Added icons for issues

---
 images/help.gif    | Bin 0 -> 658 bytes
 images/help_bw.gif | Bin 0 -> 3434 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 images/help.gif
 create mode 100644 images/help_bw.gif

diff --git a/images/help.gif b/images/help.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bb3d178285dfbb9021932efbbc90219531e18071
GIT binary patch
literal 658
zcmV;D0&V?ANk%w1VGsZj0Oo%HGg^Z&RCf9Q|0Yy?Mr@HXRedQ{geX^qE>?k(s=*~z
zi6c{mEn0&sR)sB8ekoFdC|7?iQGqgCh$UHwrM1m0Rf&R_t#6E~NoIxr|Ns8~`z=;_
zz0u=BWP@OWre}bd{r&zaT8$}BeEt6Z_Wu6({QhKnmL^emvBJz-b&!IfxZUmjLtuz~
zm$Lc${xVd6^ZNgmvAi)-h~Vn=h@Q38=kfdd{rdd<#NO?yztH&o{ab;h^!xhw{QppS
zrF5CBiJ`sz{{1UchUDz^s=m?q`1<zx{wz<4<LvdHwafAK`XpC`HDHRu)aZ_(vgq&k
z&)@K=yv_ao|M>g;o~yL(_y7F;|F*`~`~CmY<m#NNt=Z=E_51$j^Y`5F@%a1x^7j5H
zS%LHS{`dU;EK_><{{BmBjqd;d^ZNen^Z6}Od{1_l@Ad!C+T>Dik@x)lQ+J!S($-yY
zm_A>A`1<?P<mxk7ef0PF=kWac`uu>8tgyk-LR^0;Revp5hX4QnA^8LW004ggEC2ui
z01yBX000N?fPaF6goTEOh#7PxTskE^R)<(y7X$|m1S&OUAcRIh01yKVehUUH6k?r!
zFeVNL0DO9KFMbUHG-!Wc34R6vIV1uCD;NzSeH<fQa|(VY0$CqgBq#wBOCLpX2oV(?
z2|f^O8b|>f2LNdlBB28T5h-8-Eq((b4>M5!Ct(u^4ytId(B}bz1qhzhVIZVIpFVH|
z?CImDz<~)E?(o?0KmwTp1gKmvAfkXXCpLoM=y0Nf3=e0T6p+woftevv{*2+!LBbIN
sF)XMVV8;!VH-qwc`GMd-gbfOqBw*vB(1;sK+7L-{1<#ZWg8~5nJGk{#@c;k-

literal 0
HcmV?d00001

diff --git a/images/help_bw.gif b/images/help_bw.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db3cd58e349fc34d8d1d1f23c696a66eff3f1cc2
GIT binary patch
literal 3434
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
O%2DLYYm~Kt^M3$S&RyyN

literal 0
HcmV?d00001


From 5b1b0a2e388d70912a0c83f55e664e4c1887f002 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 14:40:31 -0500
Subject: [PATCH 039/159] Added the issues tab to the side bar

---
 ajax_htmldata/getIssues.php | 214 ++++++++++++++++++++++++++++++++++++
 directory.php               |   1 +
 js/resource.js              |  29 +++++
 resource.php                |  16 +++
 4 files changed, 260 insertions(+)
 create mode 100644 ajax_htmldata/getIssues.php

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
new file mode 100644
index 0000000..a6827c3
--- /dev/null
+++ b/ajax_htmldata/getIssues.php
@@ -0,0 +1,214 @@
+<?php
+	$resourceID = $_GET['resourceID'];
+
+	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+	echo '<div>issues!</div>';
+/*
+		$util = new Utility();
+
+		//these are used to display the header since the arrays have resource and organization level contacts combined
+		$resContactFlag = 0;
+		$orgContactFlag = 0;
+
+		//get contacts
+		$sanitizedInstance = array();
+		$contactArray = array();
+		$contactObjArray = array();
+
+		if ((isset($archiveInd)) && ($archiveInd == "1")){
+			//if we want archives to be displayed
+			if ($showArchivesInd == "1"){
+				if (count($resource->getArchivedContacts()) > 0){
+					echo "<i><b>The following are archived contacts:</b></i>";
+				}
+				$contactArray = $resource->getArchivedContacts();
+			}
+		}else{
+			$contactArray = $resource->getUnarchivedContacts();
+		}
+
+
+		if (count($contactArray) > 0){
+			foreach ($contactArray as $contact){
+				if (($resContactFlag == 0) && (!isset($contact['organizationName']))){
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
+					$resContactFlag = 1;
+				}else if (($orgContactFlag == 0) && (isset($contact['organizationName']))){
+					if ($resContactFlag == 0){
+						echo "<i>No Resource Specific Contacts</i><br /><br />";
+					}
+
+					if ($user->canEdit() && ($archiveInd != 1) && ($showArchivesInd != 1)){ ?>
+						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+						<br /><br /><br />
+					<?php
+					}
+
+					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
+					$orgContactFlag = 1;
+				}else{
+					echo "<br />";
+				}
+
+				?>
+
+				<table class='linedFormTable'>
+				<tr>
+				<th style='background:#f5f8fa;'>
+					<?php echo $contact['contactRoles']; ?>
+				</th>
+				<th style='background:#f5f8fa;'>
+				<span style='float:left;vertical-align:bottom;'>
+					<?php if ($contact['name']) { echo $contact['name']; }else{ echo "&nbsp;"; } ?>
+				</span>
+				<span style='float:right;vertical-align:top;'>
+				<?php
+					if (($user->canEdit()) && (!isset($contact['organizationName']))){
+						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit contact'></a>";
+						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='remove note' title='remove contact'></a>";
+					}else{
+						echo "&nbsp;";
+					}
+
+				?>
+				</span>
+				</th>
+				</tr>
+
+				<?php
+				if (isset($contact['organizationName'])){ ?>
+
+				<tr>
+				<td style='vertical-align:top;width:110px;'>Organization:</td>
+				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Contact in Organizations Module' title='Visit Contact in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
+				</tr>
+
+				<?php
+				}
+
+				if (($contact['archiveDate'] != '0000-00-00') && ($contact['archiveDate'])) { ?>
+				<tr>
+				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'>No longer valid:</td>
+				<td style='background-color:#ebebeb'><i><?php echo format_date($contact['archiveDate']); ?></i></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['title']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Title:</td>
+				<td><?php echo $contact['title']; ?></td>
+				</tr>
+				<?php
+				}
+
+				if ((isset($contact['addressText'])) && ($contact['addressText'] != '')){ ?>
+					<tr>
+					<td style='vertical-align:top; width:110px;'>Address:</td>
+					<td><?php echo nl2br($contact['addressText']); ?></td>
+					</tr>
+				<?php
+				}
+
+				if ((isset($contact['state']) || (isset($contact['country']))) && (($contact['state'] != '') || ($contact['country'] != ''))){ ?>
+					<tr>
+					<td style='vertical-align:top; width:110px;'>Location:</td>
+					<td><?php
+						if (!($contact['state'])) {
+							echo $contact['country'];
+						}else if (!($contact['country'])) {
+							echo $contact['state'];
+						}else{
+							echo $contact['state'] . ", " . $contact['country'];
+						}
+						?>
+					</td>
+					</tr>
+				<?php
+				}
+
+				if ($contact['phoneNumber']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Phone:</td>
+				<td><?php echo $contact['phoneNumber']; ?></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['altPhoneNumber']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Alt Phone:</td>
+				<td><?php echo $contact['altPhoneNumber']; ?></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['faxNumber']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Fax:</td>
+				<td><?php echo $contact['faxNumber']; ?></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['emailAddress']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Email:</td>
+				<td><a href='mailto:<?php echo $contact['emailAddress']; ?>'><?php echo $contact['emailAddress']; ?></a></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['noteText']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Notes:</td>
+				<td><?php echo nl2br($contact['noteText']); ?></td>
+				</tr>
+				<?php
+				}
+
+				if ($contact['lastUpdateDate']) { ?>
+				<tr>
+				<td style='vertical-align:top; width:110px;'>Last Updated:</td>
+				<td><i><?php echo format_date($contact['lastUpdateDate']); ?></i></td>
+				</tr>
+				<?php
+				}
+
+				?>
+
+				</table>
+			<?php
+			}
+
+
+			if ($user->canEdit() && ($orgContactFlag == 0) && ($showArchivesInd != 1)){ ?>
+				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+				<br /><br /><br />
+			<?php
+			}
+
+
+		} else {
+			if (($archiveInd != 1) && ($showArchivesInd != 1)){
+				echo "<i>No contacts available</i><br /><br />";
+				if (($user->canEdit())){ ?>
+					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
+					<br /><br /><br />
+				<?php
+				}
+			}
+		}
+
+		if (($showArchivesInd == "0") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
+			echo "<i>" . count($resource->getArchivedContacts()) . " archived contact(s) available.  <a href='javascript:updateArchivedContacts(1);'>show archived contacts</a></i><br />";
+		}
+
+		if (($showArchivesInd == "1") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
+			echo "<i><a href='javascript:updateArchivedContacts(0);'>hide archived contacts</a></i><br />";
+		}
+
+		echo "<br /><br />";
+*/
+?>
+
diff --git a/directory.php b/directory.php
index 4e4c0f6..b08fc5c 100644
--- a/directory.php
+++ b/directory.php
@@ -143,6 +143,7 @@ function resource_sidemenu($selected_link = '') {
     'cataloging' => 'cataloging',
     'contacts' => 'contacts',
     'accounts' => 'lock',
+    'issues' => 'help',
     'attachments' => 'attachment',
     'routing' => 'routing',
   );
diff --git a/js/resource.js b/js/resource.js
index 16840d1..1297716 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -56,6 +56,14 @@ $(document).ready(function(){
 		return false;
 	});
 
+	$(".showIssues").click(function () {
+	    $('.resource_tab_content').hide();
+		$('#div_issues').show();
+		$('#div_fullRightPanel').show();
+		updateIssues();
+		return false;
+	});
+
 	$(".showAccounts").click(function () {
 	  $('.resource_tab_content').hide();
 		$('#div_product').hide();
@@ -223,6 +231,27 @@ function updateArchivedContacts(showArchivedPassed){
 
 }
 
+function updateIssues(){
+//  $("#icon_issues").html("<img src='images/issues_bw.gif'>");
+  
+  $.ajax({
+	 type:       "GET",
+	 url:        "ajax_htmldata.php",
+	 cache:      false,
+	 data:       "action=getIssues&resourceID=" + $("#resourceID").val(),
+	 success:    function(html) {
+	 	console.log(html);
+		$(".div_mainContent").html(html);
+		bind_removes();
+		tb_reinit();
+ //		$("#icon_issues").html("<img src='images/issues_bw.gif'>");
+	 }
+
+
+  });
+
+}
+
 
 function updateAccounts(){
   $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
diff --git a/resource.php b/resource.php
index 92274ee..e4dfc01 100644
--- a/resource.php
+++ b/resource.php
@@ -145,6 +145,22 @@
 
 		</div>
 
+		<div style="display:none;width: 597px;" id='div_issues' class="resource_tab_content">
+			<table cellpadding="0" cellspacing="0" style="width: 100%; table-layout: fixed;">
+				<tr>
+					<td class="sidemenu">
+						<?php echo resource_sidemenu('issues'); ?>
+					</td>
+					<td class='mainContent'>
+
+						<div class='div_mainContent'></div>
+
+					</td>
+				</tr>
+			</table>
+
+		</div>
+
 
 		<?php if ($user->accountTabIndicator == '1') { ?>
 

From 1ec87b5c323d3fecf56ca7ea6c94bcf9809223ff Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 14:48:50 -0500
Subject: [PATCH 040/159] Changed CreatorID to a varchar

---
 install/protected/install.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/protected/install.sql b/install/protected/install.sql
index 7b3be45..6dae98b 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -594,7 +594,7 @@ CREATE TABLE `_DATABASE_NAME_`.`CostDetails` (
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
 CREATE TABLE `_DATABASE_NAME_`.`Issue` (
   `issueID` int(11) NOT NULL AUTO_INCREMENT,
-  `creatorID` int(11) NOT NULL,
+  `creatorID` varchar(20) NOT NULL,
   `subjectText` varchar(80) NOT NULL,
   `bodyText` text NOT NULL,
   `reminderInterval` int(11) NOT NULL,

From 503cdd784fc4c7b5d468fd88a2ccfad158e82447 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 15:37:09 -0500
Subject: [PATCH 041/159] Created an Issue Class

---
 admin/classes/domain/Issue.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 admin/classes/domain/Issue.php

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
new file mode 100644
index 0000000..2908a73
--- /dev/null
+++ b/admin/classes/domain/Issue.php
@@ -0,0 +1,12 @@
+<?php
+
+class Issue extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+
+}
+
+?>
\ No newline at end of file

From de67ac086002a16170e6d992ad44c7ede871a640 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 15:37:59 -0500
Subject: [PATCH 042/159] Outputting the raw issue data the screen

---
 admin/classes/domain/Resource.php | 28 ++++++++++++++++++++++++++++
 ajax_htmldata/getIssues.php       | 15 ++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 280bb27..ab509a2 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -748,9 +748,37 @@ public function getNotes($tabName = NULL){
 		return $objects;
 	}
 
+	//returns array of notes objects
+	public function getIssues(){
+
+		$query = "SELECT I.* FROM Issue I";
+		
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
 
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+
+			foreach (array_keys($result) as $attributeName) {
+				$resultArray[$attributeName] = $result[$attributeName];
+			}
 
+			array_push($objects, $resultArray);
 
+		}else{
+			foreach ($result as $row) {
+				$resultArray = array();
+				foreach (array_keys($row) as $attributeName) {
+					$resultArray[$attributeName] = $row[$attributeName];
+				}
+
+				array_push($objects, $resultArray);
+			}
+		}
+
+		return $objects;
+	}
 
 
 	//returns array of the initial note object
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index a6827c3..6e645aa 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -2,7 +2,20 @@
 	$resourceID = $_GET['resourceID'];
 
 	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
-	echo '<div>issues!</div>';
+
+	$util = new Utility();
+
+	//$issueArray = $resource->getUnarchivedContacts();
+	$issueArray = $resource->getIssues();
+
+
+	echo "<pre>";
+	//foreach($issueArray as $issue) {
+		print_r($issueArray);
+	//}
+	echo "</pre>";
+
+
 /*
 		$util = new Utility();
 

From 291a6756b1ad543e36bc6e4b1cbb89f7dc70f179 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 15:55:44 -0500
Subject: [PATCH 043/159] Removed unused lines

---
 js/resource.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index 1297716..6db3e0b 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -232,7 +232,6 @@ function updateArchivedContacts(showArchivedPassed){
 }
 
 function updateIssues(){
-//  $("#icon_issues").html("<img src='images/issues_bw.gif'>");
   
   $.ajax({
 	 type:       "GET",
@@ -244,7 +243,6 @@ function updateIssues(){
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
- //		$("#icon_issues").html("<img src='images/issues_bw.gif'>");
 	 }
 
 

From 72dd3eb2dc435635ec8ebd41a938cb03abcdad3e Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 23 Jul 2015 15:56:18 -0500
Subject: [PATCH 044/159] Added html for the issues table

---
 ajax_htmldata/getIssues.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 6e645aa..a88f29b 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -5,15 +5,31 @@
 
 	$util = new Utility();
 
-	//$issueArray = $resource->getUnarchivedContacts();
-	$issueArray = $resource->getIssues();
+?>
 
+	<table class='linedFormTable'>
+		<tr>
+			<th style='background:#f5f8fa;'>Issues/Problems</th>
+		</tr>
+		<tr>
+			<td><a href="">report new issue</a></td>
+		</tr>
+		<tr>
+			<td>
+				<a href="">view open issue</a> 
+				<a href=""><img src="images/xls.gif" /></a>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<a href="">view archived issues</a> 
+				<a href=""><img src="images/xls.gif" /></a>
+			</td>
+		</tr>
+	</table>
 
-	echo "<pre>";
-	//foreach($issueArray as $issue) {
-		print_r($issueArray);
-	//}
-	echo "</pre>";
+<?php
+	
 
 
 /*

From ae8c080b63af9f9d65fb7166f87b0706cd516fcd Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 24 Jul 2015 09:42:50 -0500
Subject: [PATCH 045/159] Added getIssuesForm.php

---
 ajax_htmldata/getIssuesForm.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 ajax_htmldata/getIssuesForm.php

diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
new file mode 100644
index 0000000..9101306
--- /dev/null
+++ b/ajax_htmldata/getIssuesForm.php
@@ -0,0 +1,20 @@
+<?php
+	$resourceID = $_GET['resourceID'];
+	$archived = $_GET['archived'];
+
+	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+
+	$util = new Utility();
+	
+	$issues = $resource->getIssues();
+
+
+	echo "<dl>";
+	foreach($issues as $issue) {
+		echo "<dt>Date reported:</dt> <dd>{$issue["dateCreated"]}</dd>
+			  <dt>Subject:</dt> <dd>{$issue["subjectText"]}</dd> 
+			  <dt>Body:</dt> <dd>{$issue["bodyText"]}</dd>";
+	}
+	echo "</dl>";
+	
+?>
\ No newline at end of file

From c2c39c81ab62665d9e9e9e8f3c359fe3128a2c72 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 24 Jul 2015 09:44:03 -0500
Subject: [PATCH 046/159] Getting issues lists through ajax

---
 ajax_htmldata/getIssues.php |  8 ++++++--
 js/resource.js              | 28 +++++++++++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index a88f29b..19a4ee4 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -4,6 +4,8 @@
 	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 
 	$util = new Utility();
+	$getIssuesFormData = "action=getIssuesForm&resourceID=".$resourceID;
+
 
 ?>
 
@@ -16,14 +18,16 @@
 		</tr>
 		<tr>
 			<td>
-				<a href="">view open issue</a> 
+				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issue</a> 
 				<a href=""><img src="images/xls.gif" /></a>
+				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<a href="">view archived issues</a> 
+				<a href="<?php echo $getIssuesFormData."&archived=1"; ?>" class="issuesBtn" id="archivedIssuesBtn">view archived issues</a> 
 				<a href=""><img src="images/xls.gif" /></a>
+				<div class="issueList" id="archivedIssues" style="display:none;"></div>
 			</td>
 		</tr>
 	</table>
diff --git a/js/resource.js b/js/resource.js
index 6db3e0b..319854b 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -64,6 +64,11 @@ $(document).ready(function(){
 		return false;
 	});
 
+	$(".issuesBtn").live("click", function(e) {
+		e.preventDefault();
+		getIssues($(this));
+	});
+
 	$(".showAccounts").click(function () {
 	  $('.resource_tab_content').hide();
 		$('#div_product').hide();
@@ -239,7 +244,6 @@ function updateIssues(){
 	 cache:      false,
 	 data:       "action=getIssues&resourceID=" + $("#resourceID").val(),
 	 success:    function(html) {
-	 	console.log(html);
 		$(".div_mainContent").html(html);
 		bind_removes();
 		tb_reinit();
@@ -250,6 +254,20 @@ function updateIssues(){
 
 }
 
+function getIssues(element) {
+	var data = element.attr("href");
+	$.ajax({
+		url:        "ajax_htmldata.php",
+		data: 		data,
+		cache:      false,
+		success:    function(html) {
+			element.siblings(".issueList").html(html).slideToggle(250);
+			console.log(html);
+		}
+	});
+	
+}
+
 
 function updateAccounts(){
   $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
@@ -364,8 +382,6 @@ function updateRightPanel(){
 } 
 
 
-
-
 function updateTitle(){
   $.ajax({
 	 type:       "GET",
@@ -382,12 +398,6 @@ function updateTitle(){
 } 
 
 
-
-
-
-
-
-
 function bind_removes(){
 
 

From 9ecd44d356ebc8bd1c47cf1ca6321a0cbfa4a5b9 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 24 Jul 2015 10:29:14 -0500
Subject: [PATCH 047/159] Moved the css from inline to an external style sheet

---
 ajax_htmldata/getIssues.php     |  6 ++---
 ajax_htmldata/getIssuesForm.php | 20 +++++++++++-----
 css/style.css                   | 41 +++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 19a4ee4..7b5669f 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -9,9 +9,9 @@
 
 ?>
 
-	<table class='linedFormTable'>
+	<table class='linedFormTable issueTable'>
 		<tr>
-			<th style='background:#f5f8fa;'>Issues/Problems</th>
+			<th>Issues/Problems</th>
 		</tr>
 		<tr>
 			<td><a href="">report new issue</a></td>
@@ -27,7 +27,7 @@
 			<td>
 				<a href="<?php echo $getIssuesFormData."&archived=1"; ?>" class="issuesBtn" id="archivedIssuesBtn">view archived issues</a> 
 				<a href=""><img src="images/xls.gif" /></a>
-				<div class="issueList" id="archivedIssues" style="display:none;"></div>
+				<div class="issueList" id="archivedIssues"></div>
 			</td>
 		</tr>
 	</table>
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 9101306..81f899c 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -8,13 +8,21 @@
 	
 	$issues = $resource->getIssues();
 
-
-	echo "<dl>";
 	foreach($issues as $issue) {
-		echo "<dt>Date reported:</dt> <dd>{$issue["dateCreated"]}</dd>
-			  <dt>Subject:</dt> <dd>{$issue["subjectText"]}</dd> 
-			  <dt>Body:</dt> <dd>{$issue["bodyText"]}</dd>";
+
+		echo "<div class=\"issue\">
+			  	<a class=\"issueCloseBtn\" href=\"\">close</a>
+			  	<dl>
+			  		<dt>Date reported:</dt> 
+			  		<dd>{$issue["dateCreated"]}</dd>
+			  		
+			  		<dt>Subject:</dt> 
+			  		<dd>{$issue["subjectText"]}</dd> 
+			  		
+			  		<dt class=\"block\">Body:</dt> 
+			  		<dd>{$issue["bodyText"]}</dd>
+			  	</dl>
+			</div>";
 	}
-	echo "</dl>";
 	
 ?>
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index 1b64713..3538faf 100644
--- a/css/style.css
+++ b/css/style.css
@@ -966,6 +966,47 @@ table.borderedHeadTable tr {
 	vertical-align:middle;
 }
 
+table.issueTable tr th {
+	background:#f5f8fa;
+}
+
+div.issueList {
+	display: none;
+	width: 85%;
+	padding: 0 10px 5px 25px;
+}
+
+div.issueList .issue {
+	width: 85%;
+}
+
+div.issueList a.issueCloseBtn {
+	float: right;
+}
+
+div.issueList dl {
+	margin-top: 15px;
+}
+
+div.issueList dl dt {
+	margin-top: 5px; 
+	font-weight: bold;
+	display: inline;
+}
+
+div.issueList dl dd {
+	display: inline;
+}
+
+div.issueList dl dd:after { 
+	content:"\A"; white-space:pre; 
+}
+
+div.issueList dl dt.block {
+	display: block;
+}
+
+
 
 
 table.noBorder td { border:0; }

From 6d440e9a54b323610c30463a06b629f845165a18 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 24 Jul 2015 13:45:38 -0500
Subject: [PATCH 048/159] added contacts to the issues list

---
 admin/classes/domain/Issue.php    | 21 ++++++++++++++
 admin/classes/domain/Resource.php | 13 ++++++++-
 ajax_htmldata/getIssuesForm.php   | 48 ++++++++++++++++++++++---------
 css/style.css                     |  2 +-
 4 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 2908a73..ed6b3b5 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -6,6 +6,27 @@ protected function defineRelationships() {}
 
 	protected function overridePrimaryKeyName() {}
 
+	public function getContacts(){
+		$query = "SELECT c.* 
+				FROM IssueContact ic
+				LEFT JOIN Contact c ON c.contactID=ic.contactID 
+				WHERE ic.issueID=".$this->issueID;
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['contactID'])){
+			$object = new Contact(new NamedArguments(array('primaryKey' => $result['contactID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Contact(new NamedArguments(array('primaryKey' => $row['contactID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
 
 }
 
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index ab509a2..391b167 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -758,6 +758,7 @@ public function getIssues(){
 		$objects = array();
 
 		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+/*
 		if (isset($result['issueID'])){
 
 			foreach (array_keys($result) as $attributeName) {
@@ -776,7 +777,17 @@ public function getIssues(){
 				array_push($objects, $resultArray);
 			}
 		}
-
+*/
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+			$object = new Issue(new NamedArguments(array('primaryKey' => $result['issueID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Issue(new NamedArguments(array('primaryKey' => $row['issueID'])));
+				array_push($objects, $object);
+			}
+		}
 		return $objects;
 	}
 
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 81f899c..9c670cb 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -8,21 +8,41 @@
 	
 	$issues = $resource->getIssues();
 
+	
 	foreach($issues as $issue) {
+		$contacts = $issue->getContacts();
+
+		echo "
+		<div class=\"issue\">
+		  	<a class=\"closeBtn\" href=\"\">close</a>
+		  	<dl>
+		  		<dt>Date reported:</dt> 
+		  		<dd>{$issue->attributes['dateCreated']}</dd>
+		  		
+		  		<dt>Contact(s):</dt> 
+		  		<dd>";
+
+		if($contacts) {
+			echo "<ul class=\"contactList\">";
+			foreach($contacts as $contact) {
+				echo "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
+			}
+			echo "</ul>";
+		}
+
 
-		echo "<div class=\"issue\">
-			  	<a class=\"issueCloseBtn\" href=\"\">close</a>
-			  	<dl>
-			  		<dt>Date reported:</dt> 
-			  		<dd>{$issue["dateCreated"]}</dd>
-			  		
-			  		<dt>Subject:</dt> 
-			  		<dd>{$issue["subjectText"]}</dd> 
-			  		
-			  		<dt class=\"block\">Body:</dt> 
-			  		<dd>{$issue["bodyText"]}</dd>
-			  	</dl>
-			</div>";
+		echo  	"</dd> 
+
+		  		<dt>Applies to:</dt> 
+		  		<dd></dd> 
+
+		  		<dt>Subject:</dt> 
+		  		<dd>{$issue->attributes['subjectText']}</dd> 
+		  		
+		  		<dt class=\"block\">Body:</dt> 
+		  		<dd>{$issue->attributes['bodyText']}</dd>
+		  	</dl>
+		</div>";
 	}
-	
+
 ?>
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index 3538faf..36f791a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -980,7 +980,7 @@ div.issueList .issue {
 	width: 85%;
 }
 
-div.issueList a.issueCloseBtn {
+div.issueList a.closeBtn {
 	float: right;
 }
 

From ab42b8399f0c39df260924ac68eaa42298370a79 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 24 Jul 2015 14:45:31 -0500
Subject: [PATCH 049/159] get associated resources of issue

---
 admin/classes/domain/Issue.php    | 23 ++++++++++++++++++++++-
 admin/classes/domain/Resource.php |  5 ++++-
 ajax_htmldata/getIssuesForm.php   | 17 +++++++++++------
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index ed6b3b5..3b9b7da 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -7,7 +7,7 @@ protected function defineRelationships() {}
 	protected function overridePrimaryKeyName() {}
 
 	public function getContacts(){
-		$query = "SELECT c.* 
+		$query = "SELECT c.contactID 
 				FROM IssueContact ic
 				LEFT JOIN Contact c ON c.contactID=ic.contactID 
 				WHERE ic.issueID=".$this->issueID;
@@ -28,6 +28,27 @@ public function getContacts(){
 		return $objects;
 	}
 
+	public function getAssociatedEntities() {
+		$query = "SELECT r.resourceID 
+				  FROM IssueRelationship ir
+				  LEFT JOIN Resource r ON (r.resourceID=ir.entityID AND ir.entityTypeID=2)
+				  WHERE ir.issueID={$this->issueID}";
+		$result = $this->db->processQuery($query, 'assoc');
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['resourceID'])){
+			$object = new Resource(new NamedArguments(array('primaryKey' => $result['resourceID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Resource(new NamedArguments(array('primaryKey' => $row['resourceID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 391b167..ea659a0 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -751,7 +751,10 @@ public function getNotes($tabName = NULL){
 	//returns array of notes objects
 	public function getIssues(){
 
-		$query = "SELECT I.* FROM Issue I";
+		$query = "SELECT i.* 
+				  FROM Issue i
+				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
+				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
 		
 		$result = $this->db->processQuery($query, 'assoc');
 
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 9c670cb..f6f43d1 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -7,11 +7,10 @@
 	$util = new Utility();
 	
 	$issues = $resource->getIssues();
-
 	
 	foreach($issues as $issue) {
 		$contacts = $issue->getContacts();
-
+		$associatedEntities = $issue->getAssociatedEntities();
 		echo "
 		<div class=\"issue\">
 		  	<a class=\"closeBtn\" href=\"\">close</a>
@@ -31,11 +30,17 @@
 		}
 
 
-		echo  	"</dd> 
-
+		echo "	</dd> 
 		  		<dt>Applies to:</dt> 
-		  		<dd></dd> 
-
+		  		<dd>";
+		if ($associatedEntities) {
+			$temp ='';
+			foreach ($associatedEntities as $entity) {
+				$temp .= " {$entity->attributes['titleText']},";
+			}
+			echo rtrim($temp,',');
+		}
+		echo "	</dd> 
 		  		<dt>Subject:</dt> 
 		  		<dd>{$issue->attributes['subjectText']}</dd> 
 		  		

From 9e27d89507c83ebbcf7ac03ce47f94919a18531c Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 24 Jul 2015 17:01:41 -0500
Subject: [PATCH 050/159] (wip)  progress on resources with organization level
 issues

---
 admin/classes/domain/Issue.php        | 20 ++++++--
 admin/classes/domain/Organization.php | 25 +++++++++-
 admin/classes/domain/Resource.php     | 70 ++++++++-------------------
 ajax_htmldata/getIssuesForm.php       | 13 +++--
 4 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 3b9b7da..634c354 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -28,7 +28,22 @@ public function getContacts(){
 		return $objects;
 	}
 
-	public function getAssociatedEntities() {
+	public function getAssociatedOrganization() {
+		$query = "SELECT r.resourceID 
+				  FROM IssueRelationship ir
+				  LEFT JOIN Resource r ON (r.resourceID=ir.entityID AND ir.entityTypeID=1)
+				  WHERE ir.issueID={$this->issueID}";
+		$result = $this->db->processQuery($query, 'assoc');
+		$objects = array();
+
+		if (isset($result['organizationID'])){
+			$object = new Organization(new NamedArguments(array('primaryKey' => $result['organizationID'])));
+			array_push($objects, $object);
+		}
+		return $objects;
+	}
+
+	public function getAssociatedResources() {
 		$query = "SELECT r.resourceID 
 				  FROM IssueRelationship ir
 				  LEFT JOIN Resource r ON (r.resourceID=ir.entityID AND ir.entityTypeID=2)
@@ -40,7 +55,7 @@ public function getAssociatedEntities() {
 		if (isset($result['resourceID'])){
 			$object = new Resource(new NamedArguments(array('primaryKey' => $result['resourceID'])));
 			array_push($objects, $object);
-		}else{
+		} else{
 			foreach ($result as $row) {
 				$object = new Resource(new NamedArguments(array('primaryKey' => $row['resourceID'])));
 				array_push($objects, $object);
@@ -48,7 +63,6 @@ public function getAssociatedEntities() {
 		}
 		return $objects;
 	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index 2fdabb5..2c602f6 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -48,9 +48,30 @@ public function getOrganizationIDByName($shortName) {
 		$result = $this->db->processQuery($query, 'assoc');
 		return $result['organizationID'];
   }
+/*
+	public function getIssues(){
+		$query = "SELECT i.* 
+				  FROM Issue i
+				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
+				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
+		
+		$result = $this->db->processQuery($query, 'assoc');
 
-
-
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+			$object = new Issue(new NamedArguments(array('primaryKey' => $result['issueID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Issue(new NamedArguments(array('primaryKey' => $row['issueID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
+*/
 
 }
 
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index ea659a0..9bcf814 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -748,53 +748,6 @@ public function getNotes($tabName = NULL){
 		return $objects;
 	}
 
-	//returns array of notes objects
-	public function getIssues(){
-
-		$query = "SELECT i.* 
-				  FROM Issue i
-				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
-				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
-		
-		$result = $this->db->processQuery($query, 'assoc');
-
-		$objects = array();
-
-		//need to do this since it could be that there's only one request and this is how the dbservice returns result
-/*
-		if (isset($result['issueID'])){
-
-			foreach (array_keys($result) as $attributeName) {
-				$resultArray[$attributeName] = $result[$attributeName];
-			}
-
-			array_push($objects, $resultArray);
-
-		}else{
-			foreach ($result as $row) {
-				$resultArray = array();
-				foreach (array_keys($row) as $attributeName) {
-					$resultArray[$attributeName] = $row[$attributeName];
-				}
-
-				array_push($objects, $resultArray);
-			}
-		}
-*/
-		//need to do this since it could be that there's only one request and this is how the dbservice returns result
-		if (isset($result['issueID'])){
-			$object = new Issue(new NamedArguments(array('primaryKey' => $result['issueID'])));
-			array_push($objects, $object);
-		}else{
-			foreach ($result as $row) {
-				$object = new Issue(new NamedArguments(array('primaryKey' => $row['issueID'])));
-				array_push($objects, $object);
-			}
-		}
-		return $objects;
-	}
-
-
 	//returns array of the initial note object
 	public function getInitialNote(){
 		$noteType = new NoteType();
@@ -818,11 +771,28 @@ public function getInitialNote(){
 
 	}
 
+	public function getIssues(){
+		$query = "SELECT i.* 
+				  FROM Issue i
+				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
+				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
+		
+		$result = $this->db->processQuery($query, 'assoc');
 
+		$objects = array();
 
-
-
-
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+			$object = new Issue(new NamedArguments(array('primaryKey' => $result['issueID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Issue(new NamedArguments(array('primaryKey' => $row['issueID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
 
 	//returns array of attachments objects
 	public function getAttachments(){
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index f6f43d1..75e3a5f 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -5,12 +5,19 @@
 	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 
 	$util = new Utility();
-	
 	$issues = $resource->getIssues();
-	
+
+	$organizationArray = $resource->getOrganizationArray();
+
 	foreach($issues as $issue) {
 		$contacts = $issue->getContacts();
-		$associatedEntities = $issue->getAssociatedEntities();
+		if (count($organizationArray) > 0) {
+			foreach ($organizationArray as $orgData) {
+				$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+//				$organizationIssues[$orgData['organizationID']] = $organization->getIssues();
+			}
+		}
+
 		echo "
 		<div class=\"issue\">
 		  	<a class=\"closeBtn\" href=\"\">close</a>

From cb1fe5057fb41b70698e549058195d1a7078d6a0 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 10:24:19 -0500
Subject: [PATCH 051/159] (wip) get organization level issues too

---
 admin/classes/domain/Organization.php | 29 ++++----
 ajax_htmldata/getIssuesForm.php       | 99 ++++++++++++++-------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index 2c602f6..bfb9e57 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -37,33 +37,32 @@ public function getNumberOfChildren(){
 
 	}
 
-  public function alreadyExists($shortName) {
+	public function alreadyExists($shortName) {
 		$query = "SELECT count(*) orgcount FROM Organization WHERE UPPER(shortName) = '" . str_replace("'", "''", strtoupper($shortName)) . "';";
 		$result = $this->db->processQuery($query, 'assoc');
 		return $result['orgcount'];
-  }
+ 	}
 
-  public function getOrganizationIDByName($shortName) {
-    $query = "SELECT organizationID FROM Organization WHERE UPPER(shortName) = '" . str_replace("'", "''", strtoupper($shortName)) . "';";
+  	public function getOrganizationIDByName($shortName) {
+    	$query = "SELECT organizationID FROM Organization WHERE UPPER(shortName) = '" . str_replace("'", "''", strtoupper($shortName)) . "';";
 		$result = $this->db->processQuery($query, 'assoc');
 		return $result['organizationID'];
-  }
-/*
-	public function getIssues(){
+  	}
+
+	public function getIssues() {
+		$issueDB = $this->db->config->settings->organizationsDatabaseName;
 		$query = "SELECT i.* 
-				  FROM Issue i
-				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
-				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
-		
+			  FROM `{$issueDB}`.Issue i
+			  LEFT JOIN `{$issueDB}`.IssueRelationship ir ON ir.issueID=i.issueID
+			  WHERE ir.entityID={$this->organizationID}";
 		$result = $this->db->processQuery($query, 'assoc');
 
 		$objects = array();
-
 		//need to do this since it could be that there's only one request and this is how the dbservice returns result
-		if (isset($result['issueID'])){
+		if (isset($result['issueID'])) {
 			$object = new Issue(new NamedArguments(array('primaryKey' => $result['issueID'])));
 			array_push($objects, $object);
-		}else{
+		} else {
 			foreach ($result as $row) {
 				$object = new Issue(new NamedArguments(array('primaryKey' => $row['issueID'])));
 				array_push($objects, $object);
@@ -71,8 +70,6 @@ public function getIssues(){
 		}
 		return $objects;
 	}
-*/
-
 }
 
 ?>
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 75e3a5f..96a705a 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -1,60 +1,63 @@
 <?php
-	$resourceID = $_GET['resourceID'];
-	$archived = $_GET['archived'];
+$resourceID = $_GET['resourceID'];
+$archived = $_GET['archived'];
 
-	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 
-	$util = new Utility();
-	$issues = $resource->getIssues();
+$util = new Utility();
+$resourceIssues[$resourceID] = $resource->getIssues();
 
-	$organizationArray = $resource->getOrganizationArray();
+$organizationArray = $resource->getOrganizationArray();
 
-	foreach($issues as $issue) {
-		$contacts = $issue->getContacts();
-		if (count($organizationArray) > 0) {
-			foreach ($organizationArray as $orgData) {
-				$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
-//				$organizationIssues[$orgData['organizationID']] = $organization->getIssues();
-			}
-		}
-
-		echo "
-		<div class=\"issue\">
-		  	<a class=\"closeBtn\" href=\"\">close</a>
-		  	<dl>
-		  		<dt>Date reported:</dt> 
-		  		<dd>{$issue->attributes['dateCreated']}</dd>
-		  		
-		  		<dt>Contact(s):</dt> 
-		  		<dd>";
-
-		if($contacts) {
-			echo "<ul class=\"contactList\">";
-			foreach($contacts as $contact) {
-				echo "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
+if (count($organizationArray) > 0) {
+	foreach ($organizationArray as $orgData) {
+		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+		$organizationIssues[$orgData['organizationID']] = $organization->getIssues();
+	}
+}
+
+foreach(array($organizationIssues,$resourceIssues) as $entityIssues) {
+	foreach ($entityIssues as $entityID=>$issues) {
+		foreach ($issues as $issue) {
+			$contacts = $issue->getContacts();
+			echo "
+			<div class=\"issue\">
+			  	<a class=\"closeBtn\" href=\"\">close</a>
+			  	<dl>
+			  		<dt>Date reported:</dt> 
+			  		<dd>{$issue->attributes['dateCreated']}</dd>
+			  		
+			  		<dt>Contact(s):</dt> 
+			  		<dd>";
+
+			if($contacts) {
+				echo "<ul class=\"contactList\">";
+				foreach($contacts as $contact) {
+					echo "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
+				}
+				echo "</ul>";
 			}
-			echo "</ul>";
-		}
 
 
-		echo "	</dd> 
-		  		<dt>Applies to:</dt> 
-		  		<dd>";
-		if ($associatedEntities) {
-			$temp ='';
-			foreach ($associatedEntities as $entity) {
-				$temp .= " {$entity->attributes['titleText']},";
+			echo "	</dd> 
+			  		<dt>Applies to:</dt> 
+			  		<dd>";
+			if ($associatedEntities) {
+				$temp ='';
+				foreach ($associatedEntities as $entity) {
+					$temp .= " {$entity->attributes['titleText']},";
+				}
+				echo rtrim($temp,',');
 			}
-			echo rtrim($temp,',');
+			echo "	</dd> 
+			  		<dt>Subject:</dt> 
+			  		<dd>{$issue->attributes['subjectText']}</dd> 
+			  		
+			  		<dt class=\"block\">Body:</dt> 
+			  		<dd>{$issue->attributes['bodyText']}</dd>
+			  	</dl>
+			</div>";
 		}
-		echo "	</dd> 
-		  		<dt>Subject:</dt> 
-		  		<dd>{$issue->attributes['subjectText']}</dd> 
-		  		
-		  		<dt class=\"block\">Body:</dt> 
-		  		<dd>{$issue->attributes['bodyText']}</dd>
-		  	</dl>
-		</div>";
 	}
-
+}
 ?>
\ No newline at end of file

From 934a3293117b2688ccbb38539f5c84ab30e91644 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 12:38:16 -0500
Subject: [PATCH 052/159] display org and resource issues from resource view

---
 admin/classes/domain/Issue.php        |  6 +-
 admin/classes/domain/Organization.php |  5 +-
 ajax_htmldata/getIssuesForm.php       | 98 +++++++++++++++------------
 3 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 634c354..42b4b3d 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -29,9 +29,10 @@ public function getContacts(){
 	}
 
 	public function getAssociatedOrganization() {
-		$query = "SELECT r.resourceID 
+		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		$query = "SELECT o.organizationID 
 				  FROM IssueRelationship ir
-				  LEFT JOIN Resource r ON (r.resourceID=ir.entityID AND ir.entityTypeID=1)
+				  LEFT JOIN `{$orgDB}`.Organization o ON (o.organizationID=ir.entityID AND ir.entityTypeID=1)
 				  WHERE ir.issueID={$this->issueID}";
 		$result = $this->db->processQuery($query, 'assoc');
 		$objects = array();
@@ -43,6 +44,7 @@ public function getAssociatedOrganization() {
 		return $objects;
 	}
 
+
 	public function getAssociatedResources() {
 		$query = "SELECT r.resourceID 
 				  FROM IssueRelationship ir
diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index bfb9e57..edbf9b4 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -50,10 +50,9 @@ public function getOrganizationIDByName($shortName) {
   	}
 
 	public function getIssues() {
-		$issueDB = $this->db->config->settings->organizationsDatabaseName;
 		$query = "SELECT i.* 
-			  FROM `{$issueDB}`.Issue i
-			  LEFT JOIN `{$issueDB}`.IssueRelationship ir ON ir.issueID=i.issueID
+			  FROM Issue i
+			  LEFT JOIN IssueRelationship ir ON (ir.issueID=i.issueID AND ir.entityTypeID=1)
 			  WHERE ir.entityID={$this->organizationID}";
 		$result = $this->db->processQuery($query, 'assoc');
 
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 96a705a..552539a 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -2,62 +2,72 @@
 $resourceID = $_GET['resourceID'];
 $archived = $_GET['archived'];
 
+//shared html template for organization and resource issues
+function generateIssueHTML($issue,$associatedEntities=null) {
+	$html = "
+	<div class=\"issue\">
+	  	<a class=\"closeBtn\" href=\"\">close</a>
+	  	<dl>
+	  		<dt>Date reported: {$issue->issueID}</dt> 
+	  		<dd>{$issue->attributes['dateCreated']}</dd>
+	  		
+	  		<dt>Contact(s):</dt> 
+	  		<dd>";
+	$contacts = $issue->getContacts();
+	if($contacts) {
+		$html .= "<ul class=\"contactList\">";
+		foreach($contacts as $contact) {
+			$html .= "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
+		}
+		$html .= "</ul>";
+	}
+
+
+	$html .= "	</dd> 
+	  		<dt>Applies to:</dt> 
+	  		<dd>";
+	if ($associatedEntities) {
+		$temp ='';
+		foreach ($associatedEntities as $entity) {
+			$temp .= " {$entity['name']},";
+		}
+		$html .= rtrim($temp,',');
+	}
+	$html .= "</dd> 
+	  		<dt>Subject:</dt> 
+	  		<dd>{$issue->attributes['subjectText']}</dd> 
+	  		
+	  		<dt class=\"block\">Body:</dt> 
+	  		<dd>{$issue->attributes['bodyText']}</dd>
+	  	</dl>
+	</div>";
+	return $html;
+}
+
 $resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 
 $util = new Utility();
-$resourceIssues[$resourceID] = $resource->getIssues();
 
+//display any organization level issues for the resource
 $organizationArray = $resource->getOrganizationArray();
-
 if (count($organizationArray) > 0) {
 	foreach ($organizationArray as $orgData) {
 		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
-		$organizationIssues[$orgData['organizationID']] = $organization->getIssues();
+		foreach ($organization->getIssues() as $issue) {
+			echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+		}
 	}
 }
 
-foreach(array($organizationIssues,$resourceIssues) as $entityIssues) {
-	foreach ($entityIssues as $entityID=>$issues) {
-		foreach ($issues as $issue) {
-			$contacts = $issue->getContacts();
-			echo "
-			<div class=\"issue\">
-			  	<a class=\"closeBtn\" href=\"\">close</a>
-			  	<dl>
-			  		<dt>Date reported:</dt> 
-			  		<dd>{$issue->attributes['dateCreated']}</dd>
-			  		
-			  		<dt>Contact(s):</dt> 
-			  		<dd>";
-
-			if($contacts) {
-				echo "<ul class=\"contactList\">";
-				foreach($contacts as $contact) {
-					echo "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
-				}
-				echo "</ul>";
-			}
-
-
-			echo "	</dd> 
-			  		<dt>Applies to:</dt> 
-			  		<dd>";
-			if ($associatedEntities) {
-				$temp ='';
-				foreach ($associatedEntities as $entity) {
-					$temp .= " {$entity->attributes['titleText']},";
-				}
-				echo rtrim($temp,',');
-			}
-			echo "	</dd> 
-			  		<dt>Subject:</dt> 
-			  		<dd>{$issue->attributes['subjectText']}</dd> 
-			  		
-			  		<dt class=\"block\">Body:</dt> 
-			  		<dd>{$issue->attributes['bodyText']}</dd>
-			  	</dl>
-			</div>";
+//display any resource level issues for the resource (shows any other resources associated with the issue, too)
+$resourceIssues = $resource->getIssues();
+foreach ($resourceIssues as $issue) {
+	$associatedEntities = array();
+	if ($associatedResources = $issue->getAssociatedResources()) {
+		foreach ($associatedResources as $resource) {
+			$associatedEntities[] = array("name"=>$resource->titleText,"id"=>$resource->resourceID,"entityType"=>2);
 		}
 	}
+	echo generateIssueHTML($issue,$associatedEntities);
 }
 ?>
\ No newline at end of file

From d59fec6e9246eee23bbbc59eb904f29a4b359a84 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 14:21:39 -0500
Subject: [PATCH 053/159] filter by archived issues, sort issues by date

---
 admin/classes/domain/Organization.php | 9 ++++++++-
 admin/classes/domain/Resource.php     | 8 +++++++-
 ajax_htmldata/getIssuesForm.php       | 2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index edbf9b4..b384a78 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -49,11 +49,18 @@ public function getOrganizationIDByName($shortName) {
 		return $result['organizationID'];
   	}
 
-	public function getIssues() {
+	public function getIssues($archivedOnly=false) {
 		$query = "SELECT i.* 
 			  FROM Issue i
 			  LEFT JOIN IssueRelationship ir ON (ir.issueID=i.issueID AND ir.entityTypeID=1)
 			  WHERE ir.entityID={$this->organizationID}";
+		if ($archivedOnly) {
+			$query .= " AND i.dateClosed IS NOT NULL";
+		} else {
+			$query .= " AND i.dateClosed IS NULL";
+		}
+		$query .= "	ORDER BY i.dateCreated DESC";
+
 		$result = $this->db->processQuery($query, 'assoc');
 
 		$objects = array();
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 9bcf814..5af549d 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -771,11 +771,17 @@ public function getInitialNote(){
 
 	}
 
-	public function getIssues(){
+	public function getIssues($archivedOnly=false){
 		$query = "SELECT i.* 
 				  FROM Issue i
 				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
 				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
+		if ($archivedOnly) {
+			$query .= " AND i.dateClosed IS NOT NULL";
+		} else {
+			$query .= " AND i.dateClosed IS NULL";
+		}
+		$query .= "	ORDER BY i.dateCreated DESC";
 		
 		$result = $this->db->processQuery($query, 'assoc');
 
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 552539a..5121da6 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -8,7 +8,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	<div class=\"issue\">
 	  	<a class=\"closeBtn\" href=\"\">close</a>
 	  	<dl>
-	  		<dt>Date reported: {$issue->issueID}</dt> 
+	  		<dt>Date reported:</dt> 
 	  		<dd>{$issue->attributes['dateCreated']}</dd>
 	  		
 	  		<dt>Contact(s):</dt> 

From 1effc8453254566eafcf50b77091e4c0a969008e Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 14:27:58 -0500
Subject: [PATCH 054/159] get atrributes directly

---
 ajax_htmldata/getIssuesForm.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesForm.php
index 5121da6..f3bf103 100644
--- a/ajax_htmldata/getIssuesForm.php
+++ b/ajax_htmldata/getIssuesForm.php
@@ -9,7 +9,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	  	<a class=\"closeBtn\" href=\"\">close</a>
 	  	<dl>
 	  		<dt>Date reported:</dt> 
-	  		<dd>{$issue->attributes['dateCreated']}</dd>
+	  		<dd>{$issue->dateCreated}</dd>
 	  		
 	  		<dt>Contact(s):</dt> 
 	  		<dd>";
@@ -17,7 +17,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	if($contacts) {
 		$html .= "<ul class=\"contactList\">";
 		foreach($contacts as $contact) {
-			$html .= "<li><a href=\"mailto:".urlencode($contact->attributes['emailAddress'])."?Subject=RE: {$issue->attributes['subjectText']}\">{$contact->attributes['name']}</a></li>";
+			$html .= "<li><a href=\"mailto:".urlencode($contact->emailAddress)."?Subject=RE: {$issue->subjectText}\">{$contact->name}</a></li>";
 		}
 		$html .= "</ul>";
 	}
@@ -35,10 +35,10 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	}
 	$html .= "</dd> 
 	  		<dt>Subject:</dt> 
-	  		<dd>{$issue->attributes['subjectText']}</dd> 
+	  		<dd>{$issue->subjectText}</dd> 
 	  		
 	  		<dt class=\"block\">Body:</dt> 
-	  		<dd>{$issue->attributes['bodyText']}</dd>
+	  		<dd>{$issue->bodyText}</dd>
 	  	</dl>
 	</div>";
 	return $html;

From 16c8b25e24c81b59714d0cc680a827f756dae42f Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 14:33:02 -0500
Subject: [PATCH 055/159] refactor getissues filename

---
 ajax_htmldata/getIssues.php                            | 2 +-
 ajax_htmldata/{getIssuesForm.php => getIssuesList.php} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ajax_htmldata/{getIssuesForm.php => getIssuesList.php} (100%)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 7b5669f..f8d36ce 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -4,7 +4,7 @@
 	$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 
 	$util = new Utility();
-	$getIssuesFormData = "action=getIssuesForm&resourceID=".$resourceID;
+	$getIssuesFormData = "action=getIssuesList&resourceID=".$resourceID;
 
 
 ?>
diff --git a/ajax_htmldata/getIssuesForm.php b/ajax_htmldata/getIssuesList.php
similarity index 100%
rename from ajax_htmldata/getIssuesForm.php
rename to ajax_htmldata/getIssuesList.php

From ba767298996bf614ecde08f5df348ef1e467f735 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 14:37:50 -0500
Subject: [PATCH 056/159] lists for both open and archived issues

---
 ajax_htmldata/getIssuesList.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index f3bf103..280844c 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -1,12 +1,16 @@
 <?php
 $resourceID = $_GET['resourceID'];
-$archived = $_GET['archived'];
+$archivedFlag = (!empty($_GET['archived']) && $_GET['archived'] == 1) ? true:false;
 
 //shared html template for organization and resource issues
 function generateIssueHTML($issue,$associatedEntities=null) {
 	$html = "
-	<div class=\"issue\">
-	  	<a class=\"closeBtn\" href=\"\">close</a>
+	<div class=\"issue\">";
+	if (!$issue->dateClosed) {
+		$html .= "
+		<a class=\"closeBtn\" href=\"\">close</a>";
+	}
+	$html .= "
 	  	<dl>
 	  		<dt>Date reported:</dt> 
 	  		<dd>{$issue->dateCreated}</dd>
@@ -53,14 +57,14 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 if (count($organizationArray) > 0) {
 	foreach ($organizationArray as $orgData) {
 		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
-		foreach ($organization->getIssues() as $issue) {
+		foreach ($organization->getIssues($archivedFlag) as $issue) {
 			echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
 		}
 	}
 }
 
 //display any resource level issues for the resource (shows any other resources associated with the issue, too)
-$resourceIssues = $resource->getIssues();
+$resourceIssues = $resource->getIssues($archivedFlag);
 foreach ($resourceIssues as $issue) {
 	$associatedEntities = array();
 	if ($associatedResources = $issue->getAssociatedResources()) {

From 19f0303b5bf74aab0e4a0f4f0932e5da9e7b9b6a Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 14:44:26 -0500
Subject: [PATCH 057/159] show org/resource issue groupings

---
 ajax_htmldata/getIssuesList.php | 2 ++
 css/style.css                   | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 280844c..c07dab0 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -55,6 +55,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 //display any organization level issues for the resource
 $organizationArray = $resource->getOrganizationArray();
 if (count($organizationArray) > 0) {
+	echo '<h3 class="text-center">Organizational</h3>';
 	foreach ($organizationArray as $orgData) {
 		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
 		foreach ($organization->getIssues($archivedFlag) as $issue) {
@@ -65,6 +66,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 
 //display any resource level issues for the resource (shows any other resources associated with the issue, too)
 $resourceIssues = $resource->getIssues($archivedFlag);
+echo '<h3 class="text-center">Resources</h3>';
 foreach ($resourceIssues as $issue) {
 	$associatedEntities = array();
 	if ($associatedResources = $issue->getAssociatedResources()) {
diff --git a/css/style.css b/css/style.css
index 36f791a..8e22eed 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1153,3 +1153,11 @@ select option.changeSelect{
 #importPage h1, h2 {
   color: #2c3c42;
 }
+
+.text-center {
+	text-align: center;
+}
+
+.issueList h3 {
+	margin-top: 8px;
+}

From 9babb605effafb63f0c094aed85a9258472144ba Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 28 Jul 2015 16:24:36 -0500
Subject: [PATCH 058/159] prerequisites for closing issues

---
 ajax_forms/getCloseIssueForm.php | 30 ++++++++++++++++++++++++++++++
 ajax_htmldata/getIssuesList.php  | 10 +++++-----
 css/style.css                    |  9 ++++++++-
 js/resource.js                   |  3 +--
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 ajax_forms/getCloseIssueForm.php

diff --git a/ajax_forms/getCloseIssueForm.php b/ajax_forms/getCloseIssueForm.php
new file mode 100644
index 0000000..dc59947
--- /dev/null
+++ b/ajax_forms/getCloseIssueForm.php
@@ -0,0 +1,30 @@
+<?php
+	$issueID = $_GET['issueID'];
+
+?>
+<div id="closeIssue">
+	<form>
+		<input type="hidden" name="issueID" value="<?php echo $issueID; ?>">
+		<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
+			<tr>
+				<td colspan='2'>
+					<span id='headerText' class='headerText'>Issue Resolution</span><br />
+				</td>
+			</tr>
+			<tr>
+				<td colspan='2'>
+					<label for="resolutionText">Resolution:</label>
+					<textarea name="resolutionText"></textarea>
+				</td>
+			</tr>
+		</table>
+		<table class='noBorderTable' style='width:125px;'>
+			<tr>
+				<td class="text-left"><input type="button" value="submit" name="submitCloseIssue" id="submitCloseIssue"></td>
+				<td class='text-right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+			</tr>
+		</table>
+
+	</form>
+</div>
+
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index c07dab0..31a641b 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -2,13 +2,17 @@
 $resourceID = $_GET['resourceID'];
 $archivedFlag = (!empty($_GET['archived']) && $_GET['archived'] == 1) ? true:false;
 
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$util = new Utility();
+
+
 //shared html template for organization and resource issues
 function generateIssueHTML($issue,$associatedEntities=null) {
 	$html = "
 	<div class=\"issue\">";
 	if (!$issue->dateClosed) {
 		$html .= "
-		<a class=\"closeBtn\" href=\"\">close</a>";
+		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>";
 	}
 	$html .= "
 	  	<dl>
@@ -48,10 +52,6 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	return $html;
 }
 
-$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
-
-$util = new Utility();
-
 //display any organization level issues for the resource
 $organizationArray = $resource->getOrganizationArray();
 if (count($organizationArray) > 0) {
diff --git a/css/style.css b/css/style.css
index 8e22eed..00519c1 100644
--- a/css/style.css
+++ b/css/style.css
@@ -980,7 +980,7 @@ div.issueList .issue {
 	width: 85%;
 }
 
-div.issueList a.closeBtn {
+div.issueList a.closeIssueBtn {
 	float: right;
 }
 
@@ -1006,6 +1006,13 @@ div.issueList dl dt.block {
 	display: block;
 }
 
+div#closeIssue .text-left {
+	text-align: left;
+}
+
+div#closeIssue .text-right {
+	text-align: right;
+}
 
 
 
diff --git a/js/resource.js b/js/resource.js
index 319854b..ad9e598 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -262,13 +262,12 @@ function getIssues(element) {
 		cache:      false,
 		success:    function(html) {
 			element.siblings(".issueList").html(html).slideToggle(250);
-			console.log(html);
+			tb_reinit();
 		}
 	});
 	
 }
 
-
 function updateAccounts(){
   $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
   $.ajax({

From e2178ef696a7be2e8232eaefeaba92a4bde7f805 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Wed, 29 Jul 2015 09:38:32 -0500
Subject: [PATCH 059/159] issues are closable through the ui

---
 admin/classes/domain/Issue.php   |  1 +
 ajax_forms/getCloseIssueForm.php |  4 ++--
 js/resource.js                   | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 42b4b3d..98391ec 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -65,6 +65,7 @@ public function getAssociatedResources() {
 		}
 		return $objects;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/ajax_forms/getCloseIssueForm.php b/ajax_forms/getCloseIssueForm.php
index dc59947..e5a4d92 100644
--- a/ajax_forms/getCloseIssueForm.php
+++ b/ajax_forms/getCloseIssueForm.php
@@ -4,7 +4,7 @@
 ?>
 <div id="closeIssue">
 	<form>
-		<input type="hidden" name="issueID" value="<?php echo $issueID; ?>">
+		<input type="hidden" id="issueID" name="issueID" value="<?php echo $issueID; ?>">
 		<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
 			<tr>
 				<td colspan='2'>
@@ -14,7 +14,7 @@
 			<tr>
 				<td colspan='2'>
 					<label for="resolutionText">Resolution:</label>
-					<textarea name="resolutionText"></textarea>
+					<textarea id="resolutionText" name="resolutionText"></textarea>
 				</td>
 			</tr>
 		</table>
diff --git a/js/resource.js b/js/resource.js
index ad9e598..5fade21 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -69,6 +69,10 @@ $(document).ready(function(){
 		getIssues($(this));
 	});
 
+	$("#submitCloseIssue").live("click", function() {
+		submitCloseIssue();
+	});
+
 	$(".showAccounts").click(function () {
 	  $('.resource_tab_content').hide();
 		$('#div_product').hide();
@@ -268,6 +272,27 @@ function getIssues(element) {
 	
 }
 
+function submitCloseIssue() {
+	$('#submitCloseIssue').attr("disabled", "disabled"); 
+	$.ajax({
+		type:       "POST",
+		url:        "ajax_processing.php?action=submitCloseIssue",
+		cache:      false,
+		data:       { "issueID": $("#issueID").val(), "resolutionText":$("#resolutionText").val() },
+		success:    function(html) {
+			if (html.length > 1) {
+				//$("#span_errors").html(html);
+				$("#submitCloseIssue").removeAttr("disabled");
+			} else {
+				tb_remove();
+				//update open issues
+				//update archived issues
+				return false;
+			}			
+		}
+	});
+}
+
 function updateAccounts(){
   $("#icon_accounts").html("<img src='images/littlecircle.gif'>");
   $.ajax({

From afa0aa1eb29750ac84f4103f8d6817641d74850e Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Wed, 29 Jul 2015 10:44:38 -0500
Subject: [PATCH 060/159] add missing file

---
 ajax_processing/submitCloseIssue.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 ajax_processing/submitCloseIssue.php

diff --git a/ajax_processing/submitCloseIssue.php b/ajax_processing/submitCloseIssue.php
new file mode 100644
index 0000000..01ceed8
--- /dev/null
+++ b/ajax_processing/submitCloseIssue.php
@@ -0,0 +1,12 @@
+<?php
+if (!empty($_POST['issueID'])){
+	$issueID = $_POST['issueID'];
+	$issue = new Issue(new NamedArguments(array('primaryKey' => $issueID)));
+	$issue->resolutionText = $_POST['resolutionText'];
+	$issue->dateClosed = date("Y-m-d H:i:s");
+	try {
+		$issue->save();
+	} catch (Exception $e) {
+		echo $e->getMessage();
+	}
+}
\ No newline at end of file

From 3a39ab3365099151526b066f4724adb757b8eb4d Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 29 Jul 2015 13:31:30 -0500
Subject: [PATCH 061/159] Showing no organizations message

---
 ajax_htmldata/getIssuesList.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 31a641b..c5b7e58 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -54,13 +54,26 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 
 //display any organization level issues for the resource
 $organizationArray = $resource->getOrganizationArray();
+
 if (count($organizationArray) > 0) {
 	echo '<h3 class="text-center">Organizational</h3>';
+
 	foreach ($organizationArray as $orgData) {
+
 		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
-		foreach ($organization->getIssues($archivedFlag) as $issue) {
-			echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+
+		$orgIssues = $organization->getIssues($archivedFlag);
+
+		if(count($orgIssues) > 0) {
+			foreach ($orgIssues as $issue) {
+				echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+			}
+		} else {
+			echo "<br><p>There are no organization level issues.</p><br>";
 		}
+
+		$orgIssues = null;
+
 	}
 }
 

From f996141d3c185ac5bbfe1a484af78502df239824 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 29 Jul 2015 13:32:12 -0500
Subject: [PATCH 062/159] Now updating issues on close issue

---
 js/resource.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index 5fade21..40d4c26 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -281,12 +281,10 @@ function submitCloseIssue() {
 		data:       { "issueID": $("#issueID").val(), "resolutionText":$("#resolutionText").val() },
 		success:    function(html) {
 			if (html.length > 1) {
-				//$("#span_errors").html(html);
 				$("#submitCloseIssue").removeAttr("disabled");
 			} else {
 				tb_remove();
-				//update open issues
-				//update archived issues
+				updateIssues();
 				return false;
 			}			
 		}

From b1abd999cf324e4236bc9d92c7c97599e1705512 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 29 Jul 2015 16:43:36 -0500
Subject: [PATCH 063/159] Added contacts to the create new issues modal

---
 admin/classes/domain/Resource.php |  16 +++--
 ajax_forms/getNewIssueForm.php    | 114 ++++++++++++++++++++++++++++++
 ajax_htmldata/getIssues.php       |   2 +-
 3 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 ajax_forms/getNewIssueForm.php

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 5af549d..25d6d6d 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -1617,19 +1617,27 @@ public function getOrganizationArray(){
 
 			}
 
-
-
-
-
 		}
 
 
 		return $resourceOrgArray;
 	}
 
+	public function organizationContactsArray($organizationID) {
 
+		if($this->db->config->settings->organizationsModule == 'Y') {
+			$dbName = $this->db->config->settings->organizationsDatabaseName;
 
+			$orgContactsArray = array();
 
+			$query = "SELECT * FROM {$dbName}.Contact WHERE organizationID = '" . $organizationID . "'";
+
+			return $this->db->processQuery($query, 'assoc');
+
+		} else {
+			return false;
+		} 	
+	}
 
 	//gets an array of distinct organizations set up for this resource (organizationID, organization)
 	public function getDistinctOrganizationArray(){
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
new file mode 100644
index 0000000..2c73bf6
--- /dev/null
+++ b/ajax_forms/getNewIssueForm.php
@@ -0,0 +1,114 @@
+<?php
+
+$resourceID = $_GET["resourceID"];
+
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID))); 
+
+$organizationArray = $resource->getOrganizationArray();
+$organizationID = $organizationArray[0]["organizationID"];
+
+if($organizationID) {
+	$organizationContactsArray = $resource->organizationContactsArray($organizationID);
+}
+	
+
+/*
+if (organizationID) {
+	$organization = new Organization
+	get organization contacts
+	get organization resources
+}
+
+if (resourceID) {
+	use to highlight in list of applies to
+}
+
+-on organization change - 
+
+*/
+?>
+
+<form id='newIssueForm'>
+
+	<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
+		<tr>
+			<td colspan="2">
+				<h1> Report New Problem</h1>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Organization:</label></td>
+			<td>
+				<p><?php echo $organization->shortName; ?></p>
+				<span id='span_error_organizationId' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Contact:</label></td>
+			<td>
+				<select type='text' id='contactName' name='contactName'>
+<?php 
+
+	foreach ($organizationContactsArray as $contact) {
+		echo "<option>{$contact['name']}</option>";
+	}
+
+?>
+				</select>
+				<span id='span_error_contactName' class='smallDarkRedText'>
+				<a href="">add additional contact:</a>
+			</td>
+		</tr>
+		<tr>
+			<td><label>CC myself:</label></td>
+			<td>
+				<input type='checkbox' id='primaryContact' name='primaryContact' class='changeInput' />
+				<span id='span_error_primaryContact' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>CC:</label></td>
+			<td>
+				<select id='contactIDs' name='contactIDs' value='' class='changeInput' />
+				<span id='span_error_contactIDs' class='smallDarkRedText'>
+				<a href="">add additional cc:</a>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Subject:</label></td>
+			<td>
+				<input type='text' id='subjectText' name='subjectText' value='' class='changeInput' />
+				<span id='span_error_subjectText' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Body:</label></td>
+			<td>
+				<textarea id='bodyText' name='bodyText' value='' />
+				<span id='span_error_bodyText' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Applies to:</label></td>
+			<td>
+				<select multiple id="resourceIDs" name="resourceIDs">
+				</select>
+				<span id='span_error_resourceIDs' class='smallDarkRedText'>
+			</td>
+		</tr>
+	</table>
+
+	<p> Send me a reminder in 
+		<select></select> days 
+	</p>
+
+	<table class='noBorderTable' style='width:125px;'>
+		<tr>
+			<td style='text-align:left'><input type='button' value='submit' name='submitNewIssue' id='submitNewIssue'></td>
+			<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+		</tr>
+	</table>
+
+</form>
+
+
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index f8d36ce..032cae0 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -14,7 +14,7 @@
 			<th>Issues/Problems</th>
 		</tr>
 		<tr>
-			<td><a href="">report new issue</a></td>
+			<td><a class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
 		</tr>
 		<tr>
 			<td>

From 42c76772ca620c33136991fafc71f79d54c6abc6 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 09:51:25 -0500
Subject: [PATCH 064/159] show organization name in form

---
 ajax_forms/getNewIssueForm.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 2c73bf6..7543895 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -5,10 +5,10 @@
 $resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID))); 
 
 $organizationArray = $resource->getOrganizationArray();
-$organizationID = $organizationArray[0]["organizationID"];
+$organizationData = $organizationArray[0];
 
-if($organizationID) {
-	$organizationContactsArray = $resource->organizationContactsArray($organizationID);
+if($organizationData['organizationID']) {
+	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
 }
 	
 
@@ -39,7 +39,7 @@
 		<tr>
 			<td><label>Organization:</label></td>
 			<td>
-				<p><?php echo $organization->shortName; ?></p>
+				<p><?php echo $organizationData['organization']; ?></p>
 				<span id='span_error_organizationId' class='smallDarkRedText'>
 			</td>
 		</tr>
@@ -50,13 +50,15 @@
 <?php 
 
 	foreach ($organizationContactsArray as $contact) {
-		echo "<option>{$contact['name']}</option>";
+		echo "		<option>{$contact['name']}</option>";
 	}
 
 ?>
 				</select>
 				<span id='span_error_contactName' class='smallDarkRedText'>
-				<a href="">add additional contact:</a>
+				<p>
+					<a href="">add additional contact:</a>
+				</p>
 			</td>
 		</tr>
 		<tr>
@@ -71,7 +73,9 @@
 			<td>
 				<select id='contactIDs' name='contactIDs' value='' class='changeInput' />
 				<span id='span_error_contactIDs' class='smallDarkRedText'>
-				<a href="">add additional cc:</a>
+				<p>
+					<a href="">add additional cc:</a>
+				</p>
 			</td>
 		</tr>
 		<tr>

From d77a7ebeab1f65bdd7ffa6a2b79b564fbfaee5d1 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 11:02:04 -0500
Subject: [PATCH 065/159] display org resources in issue form

---
 admin/classes/domain/Resource.php |  9 +++++++++
 ajax_forms/getNewIssueForm.php    | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 25d6d6d..640ad6b 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -1639,6 +1639,15 @@ public function organizationContactsArray($organizationID) {
 		} 	
 	}
 
+	public function getSiblingResourcesArray($organizationID) {
+
+			$query = "SELECT DISTINCT r.resourceID, r.titleText FROM ResourceOrganizationLink rol 
+					  LEFT JOIN Resource r ON r.resourceID=rol.resourceID
+					  WHERE rol.organizationID=".$organizationID." AND r.archiveDate IS NULL
+					  ORDER BY r.titleText";
+			return $this->db->processQuery($query, 'assoc');
+	}
+
 	//gets an array of distinct organizations set up for this resource (organizationID, organization)
 	public function getDistinctOrganizationArray(){
 		$config = new Configuration;
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 7543895..46a2145 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -9,6 +9,7 @@
 
 if($organizationData['organizationID']) {
 	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
+	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
 }
 	
 
@@ -95,7 +96,17 @@
 		<tr>
 			<td><label>Applies to:</label></td>
 			<td>
-				<select multiple id="resourceIDs" name="resourceIDs">
+				<div>
+					<input type="checkbox" name="allResources" value="1" /> <label for="allResources">Applies to all</label>
+				</div>
+				<select style="min-height: 140px" multiple id="resourceIDs" name="resourceIDs">
+<?php
+if (!empty($organizationResourcesArray)) {
+	foreach ($organizationResourcesArray as $resource) {
+		echo "		<option value=\"{$resource['resourceID']}\">{$resource['titleText']}</option>";
+	}
+}
+?>
 				</select>
 				<span id='span_error_resourceIDs' class='smallDarkRedText'>
 			</td>

From 92e02fcbe91285c6cc910b73cbb4944fe99073d7 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 30 Jul 2015 12:19:32 -0500
Subject: [PATCH 066/159] Now saving an issue without relationships (WIP)

---
 ajax_forms/getNewIssueForm.php  | 14 +++++++-------
 ajax_processing/insertIssue.php | 21 +++++++++++++++++++++
 js/resource.js                  | 24 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 ajax_processing/insertIssue.php

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 46a2145..de322fa 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -47,7 +47,7 @@
 		<tr>
 			<td><label>Contact:</label></td>
 			<td>
-				<select type='text' id='contactName' name='contactName'>
+				<select type='text' id='contactName' name='issueContact[contactName]'>
 <?php 
 
 	foreach ($organizationContactsArray as $contact) {
@@ -72,7 +72,7 @@
 		<tr>
 			<td><label>CC:</label></td>
 			<td>
-				<select id='contactIDs' name='contactIDs' value='' class='changeInput' />
+				<select id='contactIDs' name='issue[contactIDs]' value='' class='changeInput' />
 				<span id='span_error_contactIDs' class='smallDarkRedText'>
 				<p>
 					<a href="">add additional cc:</a>
@@ -82,14 +82,14 @@
 		<tr>
 			<td><label>Subject:</label></td>
 			<td>
-				<input type='text' id='subjectText' name='subjectText' value='' class='changeInput' />
+				<input type='text' id='subjectText' name='issue[subjectText]' value='' class='changeInput' />
 				<span id='span_error_subjectText' class='smallDarkRedText'>
 			</td>
 		</tr>
 		<tr>
 			<td><label>Body:</label></td>
 			<td>
-				<textarea id='bodyText' name='bodyText' value='' />
+				<textarea id='bodyText' name='issue[bodyText]' value='' />
 				<span id='span_error_bodyText' class='smallDarkRedText'>
 			</td>
 		</tr>
@@ -97,9 +97,9 @@
 			<td><label>Applies to:</label></td>
 			<td>
 				<div>
-					<input type="checkbox" name="allResources" value="1" /> <label for="allResources">Applies to all</label>
+					<input type="checkbox" name="issueResources[allResources]" value="1" /> <label for="allResources">Applies to all</label>
 				</div>
-				<select style="min-height: 140px" multiple id="resourceIDs" name="resourceIDs">
+				<select style="min-height: 140px" multiple id="resourceIDs" name="resourceIDs[]">
 <?php
 if (!empty($organizationResourcesArray)) {
 	foreach ($organizationResourcesArray as $resource) {
@@ -114,7 +114,7 @@
 	</table>
 
 	<p> Send me a reminder in 
-		<select></select> days 
+		<select name="issue[reminderInterval]"></select> days 
 	</p>
 
 	<table class='noBorderTable' style='width:125px;'>
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
new file mode 100644
index 0000000..23a16b2
--- /dev/null
+++ b/ajax_processing/insertIssue.php
@@ -0,0 +1,21 @@
+<?php
+
+	$formDataArray = $_POST["issue"];
+	$newIssue = new Issue();
+
+	$newIssue->creatorID = $user->loginID;
+	$newIssue->dateCreated = date( 'Y-m-d H:i:s');
+
+	if(!is_numeric($formDataArray["reminderInterval"])) {
+		$formDataArray["reminderInterval"] = 0;
+	}
+
+	foreach($formDataArray as $key => $value) {
+		$newIssue->$key = $value;
+	}
+
+	print_r($formDataArray);
+
+	$newIssue->save();
+
+?>
\ No newline at end of file
diff --git a/js/resource.js b/js/resource.js
index 40d4c26..a47026d 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -73,6 +73,11 @@ $(document).ready(function(){
 		submitCloseIssue();
 	});
 
+	$("#submitNewIssue").live("click", function(e) {
+		e.preventDefault();
+		submitNewIssue();
+	});
+
 	$(".showAccounts").click(function () {
 	  $('.resource_tab_content').hide();
 		$('#div_product').hide();
@@ -258,6 +263,25 @@ function updateIssues(){
 
 }
 
+function submitNewIssue() {
+	
+	$.ajax({
+		 type:       "POST",
+		 url:        "ajax_processing.php?action=insertIssue",
+		 cache:      false,
+		 data:       $("#newIssueForm").serialize(),
+		 success:    function(res) {
+			console.log(res);
+			updateIssues();
+			tb_remove()
+		 }
+
+
+	  });
+
+
+}
+
 function getIssues(element) {
 	var data = element.attr("href");
 	$.ajax({

From 07491b37f8fc90bc6ac8be92c711c3026c34edc8 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 30 Jul 2015 12:58:31 -0500
Subject: [PATCH 067/159] Can now add new issues at the resource level

---
 admin/classes/domain/IssueRelationship.php | 11 +++++++++++
 admin/classes/domain/Organization.php      |  3 +--
 ajax_processing/insertIssue.php            | 12 ++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 admin/classes/domain/IssueRelationship.php

diff --git a/admin/classes/domain/IssueRelationship.php b/admin/classes/domain/IssueRelationship.php
new file mode 100644
index 0000000..553b24b
--- /dev/null
+++ b/admin/classes/domain/IssueRelationship.php
@@ -0,0 +1,11 @@
+<?php
+
+class IssueRelationship extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+}
+
+?>
\ No newline at end of file
diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index b384a78..0283660 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -53,14 +53,13 @@ public function getIssues($archivedOnly=false) {
 		$query = "SELECT i.* 
 			  FROM Issue i
 			  LEFT JOIN IssueRelationship ir ON (ir.issueID=i.issueID AND ir.entityTypeID=1)
-			  WHERE ir.entityID={$this->organizationID}";
+			  WHERE ir.entityID={$this->primaryKey}";
 		if ($archivedOnly) {
 			$query .= " AND i.dateClosed IS NOT NULL";
 		} else {
 			$query .= " AND i.dateClosed IS NULL";
 		}
 		$query .= "	ORDER BY i.dateCreated DESC";
-
 		$result = $this->db->processQuery($query, 'assoc');
 
 		$objects = array();
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 23a16b2..3d6eab4 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -1,6 +1,7 @@
 <?php
 
 	$formDataArray = $_POST["issue"];
+	$resourceIDArray = $_POST["resourceIDs"];
 	$newIssue = new Issue();
 
 	$newIssue->creatorID = $user->loginID;
@@ -14,8 +15,15 @@
 		$newIssue->$key = $value;
 	}
 
-	print_r($formDataArray);
-
 	$newIssue->save();
 
+	foreach($resourceIDArray as $resourceID) {
+		$newIssueRelationship = new IssueRelationship();
+		$newIssueRelationship->issueID = $newIssue->primaryKey;
+		$newIssueRelationship->entityID = $resourceID;
+		$newIssueRelationship->entityTypeID = 2;
+		$newIssueRelationship->save();
+		unset($newIssueRelationship);
+	}
+
 ?>
\ No newline at end of file

From a0fd87c0f0339d21cd8f33794706526b07c9dd95 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 14:36:15 -0500
Subject: [PATCH 068/159] move db updates to new file

---
 install/protected/install.sql         | 44 ---------------------------
 install/protected/resource_issues.sql | 42 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 44 deletions(-)
 create mode 100644 install/protected/resource_issues.sql

diff --git a/install/protected/install.sql b/install/protected/install.sql
index 6dae98b..473fda9 100644
--- a/install/protected/install.sql
+++ b/install/protected/install.sql
@@ -591,50 +591,6 @@ CREATE TABLE `_DATABASE_NAME_`.`CostDetails` (
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 
 
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
-CREATE TABLE `_DATABASE_NAME_`.`Issue` (
-  `issueID` int(11) NOT NULL AUTO_INCREMENT,
-  `creatorID` varchar(20) NOT NULL,
-  `subjectText` varchar(80) NOT NULL,
-  `bodyText` text NOT NULL,
-  `reminderInterval` int(11) NOT NULL,
-  `dateCreated` datetime NOT NULL,
-  `dateClosed` datetime NOT NULL,
-  `resolutionText` text NOT NULL,
-  PRIMARY KEY (`issueID`),
-  KEY `creatorID` (`creatorID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
-
-
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueRelationship`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
-  `issueRelationshipID` int(11) NOT NULL AUTO_INCREMENT,
-  `issueID` int(11) NOT NULL,
-  `entityID` int(11) NOT NULL,
-  `entityTypeID` int(11) NOT NULL,
-  PRIMARY KEY (`issueRelationshipID`),
-  KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
-
-
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
-  `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
-  `entityName` varchar(80) NOT NULL,
-  PRIMARY KEY (`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
-
-
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
-  `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
-  `issueID` int(11) NOT NULL,
-  `contactID` int(11) NOT NULL,
-  `isPrimary` tinyint(1) NOT NULL,
-  PRIMARY KEY (`issueContactID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
-
-
 ALTER TABLE `_DATABASE_NAME_`.`Alias` ADD INDEX `Index_resourceID`(`resourceID`),
  ADD INDEX `Index_aliasTypeID`(`aliasTypeID`),
  ADD INDEX `shortName` ( `shortName` ),
diff --git a/install/protected/resource_issues.sql b/install/protected/resource_issues.sql
new file mode 100644
index 0000000..08c9393
--- /dev/null
+++ b/install/protected/resource_issues.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
+CREATE TABLE `_DATABASE_NAME_`.`Issue` (
+  `issueID` int(11) NOT NULL AUTO_INCREMENT,
+  `creatorID` varchar(20) NOT NULL,
+  `subjectText` varchar(80) NOT NULL,
+  `bodyText` text NOT NULL,
+  `reminderInterval` int(11) DEFAULT NULL,
+  `dateCreated` datetime NOT NULL,
+  `dateClosed` datetime DEFAULT NULL,
+  `resolutionText` text,
+  PRIMARY KEY (`issueID`),
+  KEY `creatorID` (`creatorID`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueRelationship`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
+  `issueRelationshipID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `entityID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL,
+  PRIMARY KEY (`issueRelationshipID`),
+  KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
+  `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `entityName` varchar(80) NOT NULL,
+  PRIMARY KEY (`entityTypeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
+  `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `contactID` int(11) NOT NULL,
+  `isPrimary` tinyint(1) NOT NULL,
+  PRIMARY KEY (`issueContactID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;

From 35ae9073b0a073a36e5712b0e549846cce631ac3 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 14:44:33 -0500
Subject: [PATCH 069/159] create IssueEmail sql, update IssueContact collation

---
 install/protected/resource_issues.sql | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/install/protected/resource_issues.sql b/install/protected/resource_issues.sql
index 08c9393..fc9e1fa 100644
--- a/install/protected/resource_issues.sql
+++ b/install/protected/resource_issues.sql
@@ -39,4 +39,14 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
   `contactID` int(11) NOT NULL,
   `isPrimary` tinyint(1) NOT NULL,
   PRIMARY KEY (`issueContactID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEmail`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueEmail` (
+  `IssueEmailID` int(11) NOT NULL AUTO_INCREMENT,
+  `IssueID` int(11) NOT NULL,
+  `email` varchar(120) NOT NULL,
+  PRIMARY KEY (`IssueEmailID`),
+  KEY `IssueID` (`IssueID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;

From 552885139e3bf756114928d15317d5049699bb86 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 15:52:12 -0500
Subject: [PATCH 070/159] fix case on db fields

---
 install/protected/resource_issues.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/protected/resource_issues.sql b/install/protected/resource_issues.sql
index fc9e1fa..5e26c95 100644
--- a/install/protected/resource_issues.sql
+++ b/install/protected/resource_issues.sql
@@ -44,8 +44,8 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEmail`;
 CREATE TABLE `_DATABASE_NAME_`.`IssueEmail` (
-  `IssueEmailID` int(11) NOT NULL AUTO_INCREMENT,
-  `IssueID` int(11) NOT NULL,
+  `issueEmailID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
   `email` varchar(120) NOT NULL,
   PRIMARY KEY (`IssueEmailID`),
   KEY `IssueID` (`IssueID`)

From af78df8cd3a24cbe0665c8da6309192baf285d14 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 15:57:30 -0500
Subject: [PATCH 071/159] store current user email when cc is checked

---
 admin/classes/domain/IssueEmail.php | 11 +++++++++++
 ajax_forms/getNewIssueForm.php      |  4 ++--
 ajax_processing/insertIssue.php     | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 admin/classes/domain/IssueEmail.php

diff --git a/admin/classes/domain/IssueEmail.php b/admin/classes/domain/IssueEmail.php
new file mode 100644
index 0000000..a568497
--- /dev/null
+++ b/admin/classes/domain/IssueEmail.php
@@ -0,0 +1,11 @@
+<?php
+
+class IssueEmail extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+}
+
+?>
\ No newline at end of file
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index de322fa..621abf0 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -65,8 +65,8 @@
 		<tr>
 			<td><label>CC myself:</label></td>
 			<td>
-				<input type='checkbox' id='primaryContact' name='primaryContact' class='changeInput' />
-				<span id='span_error_primaryContact' class='smallDarkRedText'>
+				<input type='checkbox' id='ccCreator' name='ccCreator' class='changeInput' />
+				<span id='span_error_ccCreator' class='smallDarkRedText'>
 			</td>
 		</tr>
 		<tr>
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 3d6eab4..acb6e38 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -2,11 +2,18 @@
 
 	$formDataArray = $_POST["issue"];
 	$resourceIDArray = $_POST["resourceIDs"];
+
 	$newIssue = new Issue();
 
 	$newIssue->creatorID = $user->loginID;
 	$newIssue->dateCreated = date( 'Y-m-d H:i:s');
 
+	$issueEmails = array();
+
+	if($_POST["ccCreator"]) {
+		$issueEmails[] = $user->emailAddress;
+	}
+
 	if(!is_numeric($formDataArray["reminderInterval"])) {
 		$formDataArray["reminderInterval"] = 0;
 	}
@@ -26,4 +33,13 @@
 		unset($newIssueRelationship);
 	}
 
+	if (count($issueEmails) > 0) {
+		foreach ($issueEmails as $email) {
+			$newIssueEmail = new IssueEmail();
+			$newIssueEmail->issueID = $newIssue->primaryKey;
+			$newIssueEmail->email = $email;
+			$newIssueEmail->save();
+			unset($newIssueEmail);
+		}
+	}
 ?>
\ No newline at end of file

From 1c532a76f2cdd434e34e2d0c1e66823b621cbe77 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 16:24:17 -0500
Subject: [PATCH 072/159] add cc emails to issue

---
 ajax_forms/getNewIssueForm.php  |  8 ++--
 ajax_processing/insertIssue.php | 82 +++++++++++++++++----------------
 js/resource.js                  | 12 +++++
 3 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 621abf0..2e27b0d 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -72,11 +72,13 @@
 		<tr>
 			<td><label>CC:</label></td>
 			<td>
-				<select id='contactIDs' name='issue[contactIDs]' value='' class='changeInput' />
-				<span id='span_error_contactIDs' class='smallDarkRedText'>
+				<input type="text" id="inputEmail" name="inputEmail" />
+				<input type="button" id="addEmail" name="addEmail" value="Add" />
 				<p>
-					<a href="">add additional cc:</a>
+					Current CCs: <span id="currentEmails"></span>
 				</p>
+				<input type="hidden" id='ccEmails' name='ccEmails' value='' class='changeInput' />
+				<span id='span_error_contactIDs' class='smallDarkRedText'>
 			</td>
 		</tr>
 		<tr>
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index acb6e38..8d6f133 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -1,45 +1,47 @@
 <?php
 
-	$formDataArray = $_POST["issue"];
-	$resourceIDArray = $_POST["resourceIDs"];
-
-	$newIssue = new Issue();
-
-	$newIssue->creatorID = $user->loginID;
-	$newIssue->dateCreated = date( 'Y-m-d H:i:s');
-
-	$issueEmails = array();
-
-	if($_POST["ccCreator"]) {
-		$issueEmails[] = $user->emailAddress;
-	}
-
-	if(!is_numeric($formDataArray["reminderInterval"])) {
-		$formDataArray["reminderInterval"] = 0;
+$formDataArray = $_POST["issue"];
+$resourceIDArray = $_POST["resourceIDs"];
+
+$issueEmails = array();
+$issueEmails = explode(',',$_POST["ccEmails"]);
+
+$newIssue = new Issue();
+
+$newIssue->creatorID = $user->loginID;
+$newIssue->dateCreated = date( 'Y-m-d H:i:s');
+
+if($_POST["ccCreator"]) {
+	$issueEmails[] = $user->emailAddress;
+}
+
+if(!is_numeric($formDataArray["reminderInterval"])) {
+	$formDataArray["reminderInterval"] = 0;
+}
+
+foreach($formDataArray as $key => $value) {
+	$newIssue->$key = $value;
+}
+
+$newIssue->save();
+
+foreach($resourceIDArray as $resourceID) {
+	$newIssueRelationship = new IssueRelationship();
+	$newIssueRelationship->issueID = $newIssue->primaryKey;
+	$newIssueRelationship->entityID = $resourceID;
+	$newIssueRelationship->entityTypeID = 2;
+	$newIssueRelationship->save();
+	unset($newIssueRelationship);
+}
+
+if (count($issueEmails) > 0) {
+	foreach ($issueEmails as $email) {
+		$newIssueEmail = new IssueEmail();
+		$newIssueEmail->issueID = $newIssue->primaryKey;
+		$newIssueEmail->email = $email;
+		$newIssueEmail->save();
+		unset($newIssueEmail);
 	}
+}
 
-	foreach($formDataArray as $key => $value) {
-		$newIssue->$key = $value;
-	}
-
-	$newIssue->save();
-
-	foreach($resourceIDArray as $resourceID) {
-		$newIssueRelationship = new IssueRelationship();
-		$newIssueRelationship->issueID = $newIssue->primaryKey;
-		$newIssueRelationship->entityID = $resourceID;
-		$newIssueRelationship->entityTypeID = 2;
-		$newIssueRelationship->save();
-		unset($newIssueRelationship);
-	}
-
-	if (count($issueEmails) > 0) {
-		foreach ($issueEmails as $email) {
-			$newIssueEmail = new IssueEmail();
-			$newIssueEmail->issueID = $newIssue->primaryKey;
-			$newIssueEmail->email = $email;
-			$newIssueEmail->save();
-			unset($newIssueEmail);
-		}
-	}
 ?>
\ No newline at end of file
diff --git a/js/resource.js b/js/resource.js
index a47026d..18d8f7b 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -78,6 +78,18 @@ $(document).ready(function(){
 		submitNewIssue();
 	});
 
+	$("#addEmail").live("click", function(e) {
+		e.preventDefault();
+		$("#currentEmails").append($("#inputEmail").val()+", ");
+		currentVal = $("#ccEmails").val();
+		if (!currentVal) {
+			$("#ccEmails").val($("#inputEmail").val());
+		} else {
+			$("#ccEmails").val(currentVal+','+$("#inputEmail").val());
+		}
+		$("#inputEmail").val('');
+	});
+
 	$(".showAccounts").click(function () {
 	  $('.resource_tab_content').hide();
 		$('#div_product').hide();

From cd279c120d07080b011b882c35bbd6609c1fc22f Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 30 Jul 2015 16:49:10 -0500
Subject: [PATCH 073/159] add contacts on add issue

---
 admin/classes/domain/IssueContact.php | 11 +++++++++++
 ajax_forms/getNewIssueForm.php        | 22 ++--------------------
 ajax_processing/insertIssue.php       | 11 +++++++++++
 install/protected/resource_issues.sql |  1 -
 4 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 admin/classes/domain/IssueContact.php

diff --git a/admin/classes/domain/IssueContact.php b/admin/classes/domain/IssueContact.php
new file mode 100644
index 0000000..042f3af
--- /dev/null
+++ b/admin/classes/domain/IssueContact.php
@@ -0,0 +1,11 @@
+<?php
+
+class IssueContact extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+}
+
+?>
\ No newline at end of file
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 2e27b0d..3bac83f 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -11,22 +11,7 @@
 	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
 	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
 }
-	
 
-/*
-if (organizationID) {
-	$organization = new Organization
-	get organization contacts
-	get organization resources
-}
-
-if (resourceID) {
-	use to highlight in list of applies to
-}
-
--on organization change - 
-
-*/
 ?>
 
 <form id='newIssueForm'>
@@ -47,19 +32,16 @@
 		<tr>
 			<td><label>Contact:</label></td>
 			<td>
-				<select type='text' id='contactName' name='issueContact[contactName]'>
+				<select multiple style="min-height: 60px;" type='text' id='contactIDs' name='contactIDs[]'>
 <?php 
 
 	foreach ($organizationContactsArray as $contact) {
-		echo "		<option>{$contact['name']}</option>";
+		echo "		<option value=\"{$contact['contactID']}\">{$contact['name']}</option>";
 	}
 
 ?>
 				</select>
 				<span id='span_error_contactName' class='smallDarkRedText'>
-				<p>
-					<a href="">add additional contact:</a>
-				</p>
 			</td>
 		</tr>
 		<tr>
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 8d6f133..4814fba 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -2,6 +2,7 @@
 
 $formDataArray = $_POST["issue"];
 $resourceIDArray = $_POST["resourceIDs"];
+$contactIDs = $_POST['contactIDs'];
 
 $issueEmails = array();
 $issueEmails = explode(',',$_POST["ccEmails"]);
@@ -44,4 +45,14 @@
 	}
 }
 
+if (count($contactIDs)) {
+	foreach ($contactIDs as $contactID) {
+		$newIssueContact = new IssueContact();
+		$newIssueContact->issueID = $newIssue->primaryKey;
+		$newIssueContact->contactID = $contactID;
+		$newIssueContact->save();
+		unset($newIssueContact);
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/install/protected/resource_issues.sql b/install/protected/resource_issues.sql
index 5e26c95..d18278c 100644
--- a/install/protected/resource_issues.sql
+++ b/install/protected/resource_issues.sql
@@ -37,7 +37,6 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
   `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
   `issueID` int(11) NOT NULL,
   `contactID` int(11) NOT NULL,
-  `isPrimary` tinyint(1) NOT NULL,
   PRIMARY KEY (`issueContactID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 

From 1001da6c1c41d884ef049f041dd9bdefc5dccbb8 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 30 Jul 2015 17:41:00 -0500
Subject: [PATCH 074/159] Added options to the reminider interval selction

---
 ajax_forms/getNewIssueForm.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 3bac83f..4489deb 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -97,8 +97,19 @@
 		</tr>
 	</table>
 
-	<p> Send me a reminder in 
-		<select name="issue[reminderInterval]"></select> days 
+	<p> Send me a reminder every 
+		<select name="issue[reminderInterval]">
+			<option>1</option>
+			<option>2</option>
+			<option>3</option>
+			<option>4</option>
+			<option>5</option>
+			<option>6</option>
+			<option>7</option>
+			<option>8</option>
+			<option>9</option>
+			<option>10</option>
+		</select> day(s) 
 	</p>
 
 	<table class='noBorderTable' style='width:125px;'>

From 208a0677d3d50bef5b89e70eee8f61c167f008d6 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 30 Jul 2015 18:11:49 -0500
Subject: [PATCH 075/159] added multiple options for resource selection and
 reminder interval

---
 ajax_forms/getNewIssueForm.php | 22 ++++++++++------------
 css/style.css                  |  5 ++++-
 js/resource.js                 | 13 +++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 4489deb..875ec2e 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -80,10 +80,17 @@
 		<tr>
 			<td><label>Applies to:</label></td>
 			<td>
+
+				<div>
+					<input type="checkbox" class="issueResources" name="issueResources[thisResource]" value="1" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
+				</div>
+				<div>
+					<input type="checkbox" class="issueResources" name="issueResources[allResources]" value="1" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+				</div>
 				<div>
-					<input type="checkbox" name="issueResources[allResources]" value="1" /> <label for="allResources">Applies to all</label>
+					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources</label>
 				</div>
-				<select style="min-height: 140px" multiple id="resourceIDs" name="resourceIDs[]">
+				<select multiple id="resourceIDs" name="resourceIDs[]">
 <?php
 if (!empty($organizationResourcesArray)) {
 	foreach ($organizationResourcesArray as $resource) {
@@ -99,16 +106,7 @@
 
 	<p> Send me a reminder every 
 		<select name="issue[reminderInterval]">
-			<option>1</option>
-			<option>2</option>
-			<option>3</option>
-			<option>4</option>
-			<option>5</option>
-			<option>6</option>
-			<option>7</option>
-			<option>8</option>
-			<option>9</option>
-			<option>10</option>
+			<?php for ($i = 1; $i <= 31; $i++) echo "<option>{$i}</option>"; ?>
 		</select> day(s) 
 	</p>
 
diff --git a/css/style.css b/css/style.css
index 00519c1..5246167 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1014,7 +1014,10 @@ div#closeIssue .text-right {
 	text-align: right;
 }
 
-
+form#newIssueForm #resourceIDs {
+	min-height: 140px;
+	display: none;
+}
 
 table.noBorder td { border:0; }
 table.smallPadding td{ padding:1px; }
diff --git a/js/resource.js b/js/resource.js
index 18d8f7b..372be9a 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -78,6 +78,19 @@ $(document).ready(function(){
 		submitNewIssue();
 	});
 
+	$(".issueResources").live("click", function() {
+
+		$(".issueResources").attr("checked", false);
+		$(this).attr("checked", true);
+
+		if($(this).attr("id") == "otherResources") {
+			$("#resourceIDs").fadeIn(250)
+		} else {
+			$("#resourceIDs").fadeOut(250)
+		}
+
+	});
+
 	$("#addEmail").live("click", function(e) {
 		e.preventDefault();
 		$("#currentEmails").append($("#inputEmail").val()+", ");

From da0f956eb2bc904fb3f355ffccea2264760e1453 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 09:56:49 -0500
Subject: [PATCH 076/159] add issues by org, fix cc processing bug, display org
 issues only once

---
 ajax_forms/getNewIssueForm.php  |  4 ++--
 ajax_htmldata/getIssuesList.php | 24 +++++++++++++-----------
 ajax_processing/insertIssue.php | 23 +++++++++++++++++------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 875ec2e..9d58166 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -82,10 +82,10 @@
 			<td>
 
 				<div>
-					<input type="checkbox" class="issueResources" name="issueResources[thisResource]" value="1" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
+					<input type="checkbox" class="issueResources" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources" name="issueResources[allResources]" value="1" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+					<input type="checkbox" class="issueResources" name="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
 				</div>
 				<div>
 					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources</label>
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index c5b7e58..a72619a 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -58,22 +58,24 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 if (count($organizationArray) > 0) {
 	echo '<h3 class="text-center">Organizational</h3>';
 
+	$issuedOrgs = array();
 	foreach ($organizationArray as $orgData) {
+		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
+			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
 
-		$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+			$orgIssues = $organization->getIssues($archivedFlag);
 
-		$orgIssues = $organization->getIssues($archivedFlag);
-
-		if(count($orgIssues) > 0) {
-			foreach ($orgIssues as $issue) {
-				echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+			if(count($orgIssues) > 0) {
+				foreach ($orgIssues as $issue) {
+					echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+				}
+			} else {
+				echo "<br><p>There are no organization level issues.</p><br>";
 			}
-		} else {
-			echo "<br><p>There are no organization level issues.</p><br>";
-		}
-
-		$orgIssues = null;
 
+			$orgIssues = null;
+			$issuedOrgs[] = $orgData['organizationID'];
+		}
 	}
 }
 
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 4814fba..2bccd87 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -1,11 +1,14 @@
 <?php
-
 $formDataArray = $_POST["issue"];
 $resourceIDArray = $_POST["resourceIDs"];
 $contactIDs = $_POST['contactIDs'];
+$organizationID = $_POST['organizationID'];
 
 $issueEmails = array();
-$issueEmails = explode(',',$_POST["ccEmails"]);
+
+if (!empty($_POST["ccEmails"])) {
+	$issueEmails = explode(',',$_POST["ccEmails"]);
+}
 
 $newIssue = new Issue();
 
@@ -26,13 +29,21 @@
 
 $newIssue->save();
 
-foreach($resourceIDArray as $resourceID) {
+if ($organizationID) {
 	$newIssueRelationship = new IssueRelationship();
 	$newIssueRelationship->issueID = $newIssue->primaryKey;
-	$newIssueRelationship->entityID = $resourceID;
-	$newIssueRelationship->entityTypeID = 2;
+	$newIssueRelationship->entityID = $organizationID;
+	$newIssueRelationship->entityTypeID = 1;
 	$newIssueRelationship->save();
-	unset($newIssueRelationship);
+} else {
+	foreach($resourceIDArray as $resourceID) {
+		$newIssueRelationship = new IssueRelationship();
+		$newIssueRelationship->issueID = $newIssue->primaryKey;
+		$newIssueRelationship->entityID = $resourceID;
+		$newIssueRelationship->entityTypeID = 2;
+		$newIssueRelationship->save();
+		unset($newIssueRelationship);
+	}
 }
 
 if (count($issueEmails) > 0) {

From 43abad3d922bc137e76c27e773c3dba72d1f91c6 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 10:18:57 -0500
Subject: [PATCH 077/159] return issue contacts array from org module

---
 admin/classes/domain/Issue.php  | 20 +++++++-------------
 ajax_htmldata/getIssuesList.php |  4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 98391ec..6f5558a 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -6,26 +6,20 @@ protected function defineRelationships() {}
 
 	protected function overridePrimaryKeyName() {}
 
-	public function getContacts(){
-		$query = "SELECT c.contactID 
+	public function getContacts() {
+		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		$query = "SELECT ic.contactID,c.name
 				FROM IssueContact ic
-				LEFT JOIN Contact c ON c.contactID=ic.contactID 
+				LEFT JOIN `{$orgDB}`.Contact c ON c.contactID=ic.contactID 
 				WHERE ic.issueID=".$this->issueID;
 		$result = $this->db->processQuery($query, 'assoc');
-
 		$objects = array();
 
-		//need to do this since it could be that there's only one request and this is how the dbservice returns result
 		if (isset($result['contactID'])){
-			$object = new Contact(new NamedArguments(array('primaryKey' => $result['contactID'])));
-			array_push($objects, $object);
-		}else{
-			foreach ($result as $row) {
-				$object = new Contact(new NamedArguments(array('primaryKey' => $row['contactID'])));
-				array_push($objects, $object);
-			}
+			return array($result);
+		} else {
+			return $result;
 		}
-		return $objects;
 	}
 
 	public function getAssociatedOrganization() {
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index a72619a..51bcd79 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -22,10 +22,10 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	  		<dt>Contact(s):</dt> 
 	  		<dd>";
 	$contacts = $issue->getContacts();
-	if($contacts) {
+	if ($contacts) {
 		$html .= "<ul class=\"contactList\">";
 		foreach($contacts as $contact) {
-			$html .= "<li><a href=\"mailto:".urlencode($contact->emailAddress)."?Subject=RE: {$issue->subjectText}\">{$contact->name}</a></li>";
+			$html .= "<li><a href=\"mailto:".urlencode($contact->emailAddress)."?Subject=RE: {$issue->subjectText}\">{$contact['name']}</a></li>";
 		}
 		$html .= "</ul>";
 	}

From be86e592f546f16fc867581324505854a29b5014 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 10:24:35 -0500
Subject: [PATCH 078/159] get and display email address for issue contacts

---
 admin/classes/domain/Issue.php  | 2 +-
 ajax_htmldata/getIssuesList.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index 6f5558a..d66c3d7 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -8,7 +8,7 @@ protected function overridePrimaryKeyName() {}
 
 	public function getContacts() {
 		$orgDB = $this->db->config->settings->organizationsDatabaseName;
-		$query = "SELECT ic.contactID,c.name
+		$query = "SELECT ic.contactID,c.name,c.emailAddress
 				FROM IssueContact ic
 				LEFT JOIN `{$orgDB}`.Contact c ON c.contactID=ic.contactID 
 				WHERE ic.issueID=".$this->issueID;
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 51bcd79..5dd6a2d 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -25,7 +25,7 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	if ($contacts) {
 		$html .= "<ul class=\"contactList\">";
 		foreach($contacts as $contact) {
-			$html .= "<li><a href=\"mailto:".urlencode($contact->emailAddress)."?Subject=RE: {$issue->subjectText}\">{$contact['name']}</a></li>";
+			$html .= "<li><a href=\"mailto:".urlencode($contact['emailAddress'])."?Subject=RE: {$issue->subjectText}\">{$contact['name']}</a></li>";
 		}
 		$html .= "</ul>";
 	}

From 7bb3ef1944c6a00b6084f2c4e97c51e436839c35 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 10:52:14 -0500
Subject: [PATCH 079/159] require organization for adding new issue

---
 ajax_forms/getNewIssueForm.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 9d58166..a4a2fd9 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -7,11 +7,9 @@
 $organizationArray = $resource->getOrganizationArray();
 $organizationData = $organizationArray[0];
 
-if($organizationData['organizationID']) {
+if ($organizationData['organizationID']) {
 	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
 	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
-}
-
 ?>
 
 <form id='newIssueForm'>
@@ -92,11 +90,11 @@
 				</div>
 				<select multiple id="resourceIDs" name="resourceIDs[]">
 <?php
-if (!empty($organizationResourcesArray)) {
-	foreach ($organizationResourcesArray as $resource) {
-		echo "		<option value=\"{$resource['resourceID']}\">{$resource['titleText']}</option>";
+	if (!empty($organizationResourcesArray)) {
+		foreach ($organizationResourcesArray as $resource) {
+			echo "		<option value=\"{$resource['resourceID']}\">{$resource['titleText']}</option>";
+		}
 	}
-}
 ?>
 				</select>
 				<span id='span_error_resourceIDs' class='smallDarkRedText'>
@@ -119,4 +117,14 @@
 
 </form>
 
+<?php
+} else {
+	echo '
+		<p>
+			Opening an issue requires a resource to be associated with an organization.
+		</p>
+		<input type="button" value="cancel" onclick="tb_remove();">';
+}
+?>
+
 

From 208c5de7fc024cc3c7e0c3a5ae4e9cdd1f497cc2 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 11:25:05 -0500
Subject: [PATCH 080/159] use correct org name

---
 ajax_htmldata/getIssuesList.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 5dd6a2d..3cfdb36 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -61,13 +61,14 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	$issuedOrgs = array();
 	foreach ($organizationArray as $orgData) {
 		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
+// todo: create issues repo so we don't have to initialize an organization object from the wrong module
 			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
 
 			$orgIssues = $organization->getIssues($archivedFlag);
 
 			if(count($orgIssues) > 0) {
 				foreach ($orgIssues as $issue) {
-					echo generateIssueHTML($issue,array(array("name"=>$organization->shortName,"id"=>$organization->organizationID,"entityType"=>1)));
+					echo generateIssueHTML($issue,array(array("name"=>$orgData['organization'],"id"=>$organization->organizationID,"entityType"=>1)));
 				}
 			} else {
 				echo "<br><p>There are no organization level issues.</p><br>";

From c5d74d0ffc89f4ded46c34afa0fc227df28334ef Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 11:59:06 -0500
Subject: [PATCH 081/159] email CCs on issue creation

---
 ajax_forms/getNewIssueForm.php  |  3 ++-
 ajax_processing/insertIssue.php | 36 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index a4a2fd9..822e9f2 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -13,7 +13,8 @@
 ?>
 
 <form id='newIssueForm'>
-
+	<input type="hidden" name="sourceOrganizationID" value="<?php echo $organizationData['organizationID'];?>" />
+	<input type="hidden" name="sourceResourceID" value="<?php echo $resourceID;?>" />
 	<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
 		<tr>
 			<td colspan="2">
diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 2bccd87..8703bcd 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -4,6 +4,12 @@
 $contactIDs = $_POST['contactIDs'];
 $organizationID = $_POST['organizationID'];
 
+$sourceResourceID = $_POST['sourceResourceID'];
+$sourceOrganizationID = $_POST['sourceOrganizationID'];
+
+$sourceResource = new Resource(new NamedArguments(array('primaryKey' => $sourceResourceID))); 
+
+
 $issueEmails = array();
 
 if (!empty($_POST["ccEmails"])) {
@@ -29,12 +35,27 @@
 
 $newIssue->save();
 
+//start building the email body
+$emailMessage = "Subject: {$newIssue->subjectText}\r\n\r\n
+			Body: {$newIssue->bodyText}\r\n\r\n
+			Applies To: ";
+
 if ($organizationID) {
 	$newIssueRelationship = new IssueRelationship();
 	$newIssueRelationship->issueID = $newIssue->primaryKey;
 	$newIssueRelationship->entityID = $organizationID;
 	$newIssueRelationship->entityTypeID = 1;
 	$newIssueRelationship->save();
+
+	$organizationArray = $sourceResource->getOrganizationArray();
+
+	$issuedOrgs = array();
+	foreach ($organizationArray as $orgData) {
+		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
+			$emailMessage .= "{$orgData['organization']}\r\n";
+			$issuedOrgs[] = $orgData['organizationID'];
+		}
+	}
 } else {
 	foreach($resourceIDArray as $resourceID) {
 		$newIssueRelationship = new IssueRelationship();
@@ -43,6 +64,9 @@
 		$newIssueRelationship->entityTypeID = 2;
 		$newIssueRelationship->save();
 		unset($newIssueRelationship);
+
+		$tempResource = new Resource(new NamedArguments(array('primaryKey' => $resourceID))); 
+		$emailMessage .= "{$tempResource->titleText}\r\n";
 	}
 }
 
@@ -64,6 +88,18 @@
 		$newIssueContact->save();
 		unset($newIssueContact);
 	}
+	$organizationContactsArray = $sourceResource->organizationContactsArray($sourceOrganizationID);
+	$emailMessage .= "\r\n\r\nContacts: \r\n\r\n";
+	foreach ($organizationContactsArray as $contactData) {
+		if (in_array($contactData['contactID'],$contactIDs)) {
+			$emailMessage .= "{$contactData['name']} ({$contactData['emailAddress']})\r\n";
+		}
+	}
 }
 
+if (count($issueEmails) > 0) {
+	foreach ($issueEmails as $email) {
+		mail($email, "New Issue: {$newIssue->subjectText}",$emailMessage);
+	}
+}
 ?>
\ No newline at end of file

From cec6ab6b90f32d053957bd3b34f52c51d2f5238d Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 12:02:59 -0500
Subject: [PATCH 082/159] send emails to issue contacts

---
 ajax_processing/insertIssue.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 8703bcd..9f358b0 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -95,9 +95,16 @@
 			$emailMessage .= "{$contactData['name']} ({$contactData['emailAddress']})\r\n";
 		}
 	}
+	//send emails to contacts
+	foreach ($organizationContactsArray as $contactData) {
+		if (in_array($contactData['contactID'],$contactIDs)) {
+			mail($email, "New Issue: {$newIssue->subjectText}",$emailMessage);
+		}
+	}
 }
 
 if (count($issueEmails) > 0) {
+	//send emails to CCs
 	foreach ($issueEmails as $email) {
 		mail($email, "New Issue: {$newIssue->subjectText}",$emailMessage);
 	}

From 79960917c5b19304da1d717f5c431d4895754136 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 14:18:22 -0500
Subject: [PATCH 083/159] exportable issues

---
 ajax_htmldata/getIssues.php |  2 +-
 export_issues.php           | 62 +++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 export_issues.php

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 032cae0..0f5c85e 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -19,7 +19,7 @@
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issue</a> 
-				<a href=""><img src="images/xls.gif" /></a>
+				<a target="_blank" href="export_issues.php?resourceID=<?php echo $resourceID;?>"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>
 		</tr>
diff --git a/export_issues.php b/export_issues.php
new file mode 100644
index 0000000..8551c2b
--- /dev/null
+++ b/export_issues.php
@@ -0,0 +1,62 @@
+<?php
+session_start();
+
+include_once 'directory.php';
+
+$resourceID = $_GET['resourceID'];
+$archivedFlag = (!empty($_GET['archived']) && $_GET['archived'] == 1) ? true:false;
+
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$util = new Utility();
+
+$organizationArray = $resource->getOrganizationArray();
+
+$exportIssues = array();
+$issueIndex = 0;
+if (count($organizationArray) > 0) {
+	$issuedOrgs = array();
+	foreach ($organizationArray as $orgData) {
+		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
+// todo: create issues repo so we don't have to initialize an organization object from the wrong module
+			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+
+			$orgIssues = $organization->getIssues($archivedFlag);
+			if (count($orgIssues) > 0) {
+				foreach ($orgIssues as $issue) {
+					foreach ($issue->attributeNames as $field=>$value) {
+						$exportIssues[$issueIndex][$field] = $issue->attributes[$field];
+					}
+					$issueIndex++;
+				}
+			}
+		}
+	}
+}
+
+
+//display any resource level issues for the resource (shows any other resources associated with the issue, too)
+
+$resourceIssues = $resource->getIssues($archivedFlag);
+if (count($resourceIssues) > 0) {
+	foreach ($resourceIssues as $issue) {
+		foreach ($issue->attributeNames as $field=>$value) {
+			$exportIssues[$issueIndex][$field] = $issue->attributes[$field];
+		}
+		$issueIndex++;
+	}
+}
+
+header("Pragma: public");
+header("Content-type: text/csv");
+header("Content-Disposition: attachment; filename=\"issues.csv\"");
+
+$out = fopen('php://output', 'w');
+
+fputcsv($out,array_keys($exportIssues[0]));
+
+foreach ($exportIssues as $issue) {
+	fputcsv($out, $issue);
+}
+fclose($out);
+
+?>
\ No newline at end of file

From 49d794f7bf779760284effb6037cce20a7a6fe43 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 14:41:17 -0500
Subject: [PATCH 084/159] exportable archived issues

---
 ajax_htmldata/getIssues.php | 5 +++--
 export_issues.php           | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 0f5c85e..379e724 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -5,6 +5,7 @@
 
 	$util = new Utility();
 	$getIssuesFormData = "action=getIssuesList&resourceID=".$resourceID;
+	$exportUrl = "export_issues.php?resourceID={$resourceID}";
 
 
 ?>
@@ -19,14 +20,14 @@
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issue</a> 
-				<a target="_blank" href="export_issues.php?resourceID=<?php echo $resourceID;?>"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="{$exportUrl}"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData."&archived=1"; ?>" class="issuesBtn" id="archivedIssuesBtn">view archived issues</a> 
-				<a href=""><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportUrl;?>&archived=1"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="archivedIssues"></div>
 			</td>
 		</tr>
diff --git a/export_issues.php b/export_issues.php
index 8551c2b..203893f 100644
--- a/export_issues.php
+++ b/export_issues.php
@@ -29,13 +29,14 @@
 					$issueIndex++;
 				}
 			}
+			$orgIssues = null;
+			$issuedOrgs[] = $orgData['organizationID'];
 		}
 	}
 }
 
 
 //display any resource level issues for the resource (shows any other resources associated with the issue, too)
-
 $resourceIssues = $resource->getIssues($archivedFlag);
 if (count($resourceIssues) > 0) {
 	foreach ($resourceIssues as $issue) {

From 8f851ef496ee738d00bca00a3c6ae7e2a5fe0eaa Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 14:52:08 -0500
Subject: [PATCH 085/159] fix export url output

---
 ajax_htmldata/getIssues.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 379e724..b32453a 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -20,7 +20,7 @@
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issue</a> 
-				<a target="_blank" href="{$exportUrl}"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportUrl;?>"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>
 		</tr>

From 51ba81bd7c5c29979c13e99aa8d7305330b27a65 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 31 Jul 2015 15:53:59 -0500
Subject: [PATCH 086/159] provide exportable friendly format for issues

---
 admin/classes/domain/Organization.php | 33 +++++++++++++++++++++++++
 admin/classes/domain/Resource.php     | 35 +++++++++++++++++++++++++++
 export_issues.php                     | 25 +++----------------
 3 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index 0283660..a80d01e 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -75,6 +75,39 @@ public function getIssues($archivedOnly=false) {
 		}
 		return $objects;
 	}
+
+	public function getExportableIssues($archivedOnly=false) {
+		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
+								FROM IssueContact sic 
+								LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID
+								WHERE sic.issueID=i.issueID) AS `contacts`,
+							 (SELECT GROUP_CONCAT(se.name SEPARATOR ', ')
+								FROM IssueRelationship sir 
+								LEFT JOIN `{$orgDB}`.Organization se ON (se.organizationID=sir.entityID AND sir.entityTypeID=1)
+								WHERE sir.issueID=i.issueID) AS `appliesto`,
+							 (SELECT GROUP_CONCAT(sie.email SEPARATOR ', ')
+								FROM IssueEmail sie 
+								WHERE sie.issueID=i.issueID) AS `CCs`
+			  FROM Issue i
+			  LEFT JOIN IssueRelationship ir ON (ir.issueID=i.issueID AND ir.entityTypeID=1)
+			  WHERE ir.entityID={$this->primaryKey}";
+		if ($archivedOnly) {
+			$query .= " AND i.dateClosed IS NOT NULL";
+		} else {
+			$query .= " AND i.dateClosed IS NULL";
+		}
+		$query .= "	ORDER BY i.dateCreated DESC";
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])) {
+			return array($result);
+		} else {
+			return $result;
+		}
+	}
 }
 
 ?>
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 640ad6b..d169a18 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -800,6 +800,41 @@ public function getIssues($archivedOnly=false){
 		return $objects;
 	}
 
+	public function getExportableIssues($archivedOnly=false){
+		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
+								FROM IssueContact sic 
+								LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID
+								WHERE sic.issueID=i.issueID) AS `contacts`,
+							 (SELECT GROUP_CONCAT(se.titleText SEPARATOR ', ')
+								FROM IssueRelationship sir 
+								LEFT JOIN Resource se ON (se.resourceID=sir.entityID AND sir.entityTypeID=2)
+								WHERE sir.issueID=i.issueID) AS `appliesto`,
+							 (SELECT GROUP_CONCAT(sie.email SEPARATOR ', ')
+								FROM IssueEmail sie 
+								WHERE sie.issueID=i.issueID) AS `CCs`
+				  FROM Issue i
+				  LEFT JOIN IssueRelationship ir ON ir.issueID=i.issueID
+				  WHERE ir.entityID={$this->resourceID} AND ir.entityTypeID=2";
+		if ($archivedOnly) {
+			$query .= " AND i.dateClosed IS NOT NULL";
+		} else {
+			$query .= " AND i.dateClosed IS NULL";
+		}
+		$query .= "	ORDER BY i.dateCreated DESC";
+		
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+			return array($result);
+		}else{
+			return $result;
+		}
+	}
+
 	//returns array of attachments objects
 	public function getAttachments(){
 
diff --git a/export_issues.php b/export_issues.php
index 203893f..1fd95f1 100644
--- a/export_issues.php
+++ b/export_issues.php
@@ -12,7 +12,7 @@
 $organizationArray = $resource->getOrganizationArray();
 
 $exportIssues = array();
-$issueIndex = 0;
+
 if (count($organizationArray) > 0) {
 	$issuedOrgs = array();
 	foreach ($organizationArray as $orgData) {
@@ -20,32 +20,13 @@
 // todo: create issues repo so we don't have to initialize an organization object from the wrong module
 			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
 
-			$orgIssues = $organization->getIssues($archivedFlag);
-			if (count($orgIssues) > 0) {
-				foreach ($orgIssues as $issue) {
-					foreach ($issue->attributeNames as $field=>$value) {
-						$exportIssues[$issueIndex][$field] = $issue->attributes[$field];
-					}
-					$issueIndex++;
-				}
-			}
-			$orgIssues = null;
+			$exportIssues = array_merge($exportIssues,$organization->getExportableIssues($archivedFlag));
 			$issuedOrgs[] = $orgData['organizationID'];
 		}
 	}
 }
 
-
-//display any resource level issues for the resource (shows any other resources associated with the issue, too)
-$resourceIssues = $resource->getIssues($archivedFlag);
-if (count($resourceIssues) > 0) {
-	foreach ($resourceIssues as $issue) {
-		foreach ($issue->attributeNames as $field=>$value) {
-			$exportIssues[$issueIndex][$field] = $issue->attributes[$field];
-		}
-		$issueIndex++;
-	}
-}
+$exportIssues = array_merge($exportIssues,$resource->getExportableIssues($archivedFlag));
 
 header("Pragma: public");
 header("Content-type: text/csv");

From 72586ae59d537cddc82ae4cfb7981ae4d3d11d18 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Mon, 3 Aug 2015 11:35:43 -0500
Subject: [PATCH 087/159] Added a getAllAlertable method to Issue

---
 admin/classes/domain/Issue.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index d66c3d7..a0eefd7 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -60,6 +60,37 @@ public function getAssociatedResources() {
 		return $objects;
 	}
 
+	public function getAllAlertable() {
+		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+
+		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
+								FROM IssueContact sic 
+								LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID
+								WHERE sic.issueID=i.issueID) AS `contacts`,
+							 (SELECT GROUP_CONCAT(se.titleText SEPARATOR ', ')
+								FROM IssueRelationship sir 
+								LEFT JOIN Resource se ON (se.resourceID=sir.entityID AND sir.entityTypeID=2)
+								WHERE sir.issueID=i.issueID) AS `appliesto`,
+							 (SELECT GROUP_CONCAT(sie.email SEPARATOR ', ')
+								FROM IssueEmail sie 
+								WHERE sie.issueID=i.issueID) AS `CCs`
+				  FROM Issue i
+				  WHERE TIMESTAMPDIFF(DAY,i.dateCreated,CURDATE())%i.reminderInterval=0
+				  AND i.dateClosed IS NULL";
+		
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['issueID'])){
+			return array($result);
+		}else{
+			return $result;
+		}
+
+		return $objects;
+	}
+
 }
 
 ?>
\ No newline at end of file

From 30cd29335cd976ce97a175b6b9f82a9183a1a751 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Mon, 3 Aug 2015 11:37:02 -0500
Subject: [PATCH 088/159] Handling the sending of issue alerts

---
 sendAlerts.php | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/sendAlerts.php b/sendAlerts.php
index cefb618..186561e 100644
--- a/sendAlerts.php
+++ b/sendAlerts.php
@@ -25,7 +25,6 @@
 
 if ($config->settings->enableAlerts == 'Y'){
 	$alertDaysInAdvance = new AlertDaysInAdvance();
-
 	//returns array of all days in advance objects
 	$alertDaysArray = $alertDaysInAdvance->all();
 
@@ -34,7 +33,6 @@
 	//loop through each of the days, e.g. 30, 60, 90
 	foreach ($alertDaysArray as $alertDays){
 		//get resources that fit this criteria
-
 		if (is_numeric($alertDays->daysInAdvanceNumber)){
 			foreach($alertDays->getResourcesToAlert() as $resource){
 				$resourceIDArray[] = $resource->resourceID;
@@ -69,13 +67,40 @@
 			$email->message = $util->createMessageFromTemplate('Alert', $resourceID, $resource->titleText, '', '', '');
 			$email->subject		= "CORAL Alert: " . $resource->titleText;
 
-			$email->send();
+			//$email->send();
 
 		}
 	}else{
-		echo "No Resources found fitting alert day criteria";
+		echo "No Resources found fitting alert day criteria";		
 	}
 
+	//Get all Issues that should be alerted today
+	$Issue = new Issue();
+	$alertableIssuesArray = $Issue->getAllAlertable();
+
+	//If we have alertable issues then loop over them
+	if (count($alertableIssuesArray) > 0){
+		foreach($alertableIssuesArray as $alertableIssue) {
+
+			$sendToArray = array();
+
+			//start building the email body
+			$emailMessage = "Subject: {$alertableIssue['subjectText']}\r\n\r\n
+			Body: {$alertableIssue['bodyText']}\r\n\r\n
+			Applies To: {$alertableIssue['appliesto']}\r\n
+			\r\n\r\nContacts: \r\n\r\n
+			{$alertableIssue['contacts']}\r\n";
+
+			foreach(explode(",", $alertableIssue['CCs']) as $emailAddr) {
+				mail($emailAddr, "New Issue: {$alertableIssue['subjectText']}",$emailMessage);
+			}
+
+		}
+	} else {
+	 	echo "No Issues found fitting alert criteria";			
+	}
+
+
 
 }else{
 	echo "Alerts not enabled in configuration.ini file";

From 5e96953f0e6dcfe82b61373fb9eaf7bf7471264d Mon Sep 17 00:00:00 2001
From: jsavell <contact@shadowater.com>
Date: Mon, 3 Aug 2015 14:22:26 -0500
Subject: [PATCH 089/159] Really send all the emails

---
 sendAlerts.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sendAlerts.php b/sendAlerts.php
index 186561e..2eaf0e8 100644
--- a/sendAlerts.php
+++ b/sendAlerts.php
@@ -67,7 +67,7 @@
 			$email->message = $util->createMessageFromTemplate('Alert', $resourceID, $resource->titleText, '', '', '');
 			$email->subject		= "CORAL Alert: " . $resource->titleText;
 
-			//$email->send();
+			$email->send();
 
 		}
 	}else{
@@ -81,9 +81,6 @@
 	//If we have alertable issues then loop over them
 	if (count($alertableIssuesArray) > 0){
 		foreach($alertableIssuesArray as $alertableIssue) {
-
-			$sendToArray = array();
-
 			//start building the email body
 			$emailMessage = "Subject: {$alertableIssue['subjectText']}\r\n\r\n
 			Body: {$alertableIssue['bodyText']}\r\n\r\n
@@ -108,4 +105,4 @@
 
 
 
-?>
\ No newline at end of file
+?>

From 4859509b89a057ac4dc72cec781f03a2433b5181 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Mon, 3 Aug 2015 16:55:08 -0500
Subject: [PATCH 090/159] add contacts inline from resource issue form

---
 ajax_forms/getNewIssueForm.php | 11 +++++++-
 js/resource.js                 | 50 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index a4a2fd9..e8a7748 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -1,4 +1,5 @@
 <?php
+$util = new utility();
 
 $resourceID = $_GET["resourceID"];
 
@@ -42,6 +43,14 @@
 				<span id='span_error_contactName' class='smallDarkRedText'>
 			</td>
 		</tr>
+		<tr>
+			<td></td>
+			<td>
+				<input type="hidden" name="orgModuleUrl" id="orgModuleUrl" value="<?php echo $util->getCoralUrl();?>organizations/" />
+				<a id="getCreateContactForm" href="#">add contact</a>
+				<div id="inlineContact"></div>
+			</td>
+		</tr>
 		<tr>
 			<td><label>CC myself:</label></td>
 			<td>
@@ -83,7 +92,7 @@
 					<input type="checkbox" class="issueResources" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources" name="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+					<input type="checkbox" class="issueResources" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
 				</div>
 				<div>
 					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources</label>
diff --git a/js/resource.js b/js/resource.js
index 372be9a..45e1625 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -91,6 +91,21 @@ $(document).ready(function(){
 
 	});
 
+	$("#getCreateContactForm").live("click",function(e) {
+		e.preventDefault();
+		getInlineContactForm();
+	});
+
+	$("#createContact").live("click",function(e) {
+		e.preventDefault();
+		var roles = new Array();
+		$(".check_roles:checked").each(function() {
+			roles.push($(this).val());
+		});
+		//create the contact and update the contact list
+		createOrganizationContact({"organizationID":$("#organizationID").val(),"name":$("#contactName").val(),"emailAddress":$("#emailAddress").val(),"contactRoles":roles});
+	});
+
 	$("#addEmail").live("click", function(e) {
 		e.preventDefault();
 		$("#currentEmails").append($("#inputEmail").val()+", ");
@@ -270,6 +285,41 @@ function updateArchivedContacts(showArchivedPassed){
 
 }
 
+function createOrganizationContact(contact) {
+	var baseUrl = $("#orgModuleUrl").val();
+	contact.contactRoles = contact.contactRoles.join();
+	$.ajax({
+		type:       "POST",
+		url:        baseUrl+"ajax_processing.php?action=submitContact",
+		cache:      false,
+		data:       contact,
+		success:    function(res) {
+			$.ajax({
+				type:       "GET",
+				url:        baseUrl+"ajax_htmldata.php",
+				cache:      false,
+				data:       "action=getOrganizationContacts&organizationID="+contact.organizationID,
+				success:    function(html) {
+					$("#contactIDs").html(html);
+				}
+			});
+		}
+	});
+}
+
+function getInlineContactForm() {
+	var baseUrl = $("#orgModuleUrl").val();
+	$.ajax({
+		 type:       "GET",
+		 url:        baseUrl+"ajax_forms.php",
+		 cache:      false,
+		 data:       "action=getInlineContactForm",
+		 success:    function(html) {
+			$("#inlineContact").html(html)
+		 }
+	  });
+}
+
 function updateIssues(){
   
   $.ajax({

From d3fb92fddde048eda16e3230e65546d1368b15fb Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 4 Aug 2015 10:45:50 -0500
Subject: [PATCH 091/159] isolate contact box

---
 css/style.css  | 40 ++++++++++++++++++++++++++++++++++++++++
 js/resource.js |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/css/style.css b/css/style.css
index 5246167..677766e 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1014,11 +1014,51 @@ div#closeIssue .text-right {
 	text-align: right;
 }
 
+#inlineContact {
+	display: none;
+	border: 1px solid #dfdfdf;
+	padding: 10px;
+}
+
 form#newIssueForm #resourceIDs {
 	min-height: 140px;
 	display: none;
 }
 
+#newIssueForm table.thickboxTable {
+	width: 100%;
+	background-image:url('../images/title.gif');
+	background-repeat:no-repeat;
+}
+
+#newIssueForm table.thickboxTable td:first-child {
+	width: 25%;
+}
+
+#newIssueForm table.thickboxTable td:last-child {
+	width: 75%;
+}
+
+#newIssueForm .form-element {
+	margin: 2px;
+	padding: 4px;
+}
+
+#newIssueForm .form-element-tight {
+	display: inline-block;
+	margin: 2px;
+	padding: 4px;
+}
+
+#newIssueForm .form-element label, #newIssueForm .form-element input {
+	display: inline-block;
+	min-width: 20%;
+}
+
+#newIssueForm .form-element-tight label, #newIssueForm .form-element-tight input {
+	min-width: 10%;
+}
+
 table.noBorder td { border:0; }
 table.smallPadding td{ padding:1px; }
 
diff --git a/js/resource.js b/js/resource.js
index 45e1625..40a9cc9 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -315,7 +315,7 @@ function getInlineContactForm() {
 		 cache:      false,
 		 data:       "action=getInlineContactForm",
 		 success:    function(html) {
-			$("#inlineContact").html(html)
+			$("#inlineContact").html(html).fadeIn("fast");
 		 }
 	  });
 }

From e722d1bf670c889323ce22c8eb31c2698374f19c Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 14:49:57 -0500
Subject: [PATCH 092/159] Added ux to add add contacts inline on the issues
 form

---
 js/resource.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index 40a9cc9..b4a70c6 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -93,7 +93,9 @@ $(document).ready(function(){
 
 	$("#getCreateContactForm").live("click",function(e) {
 		e.preventDefault();
-		getInlineContactForm();
+		$(this).fadeOut(250, function() {
+			getInlineContactForm();
+		});
 	});
 
 	$("#createContact").live("click",function(e) {
@@ -300,6 +302,9 @@ function createOrganizationContact(contact) {
 				cache:      false,
 				data:       "action=getOrganizationContacts&organizationID="+contact.organizationID,
 				success:    function(html) {
+					$("#inlineContact").html(html).slideUp(250, function() {
+						$("#getCreateContactForm").fadeIn(250);
+					});
 					$("#contactIDs").html(html);
 				}
 			});
@@ -315,7 +320,7 @@ function getInlineContactForm() {
 		 cache:      false,
 		 data:       "action=getInlineContactForm",
 		 success:    function(html) {
-			$("#inlineContact").html(html).fadeIn("fast");
+			$("#inlineContact").html(html).slideDown(250);
 		 }
 	  });
 }

From 43ead6a06d1d2ee7b5d749189b4e7996331a9a40 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 15:01:14 -0500
Subject: [PATCH 093/159] Now sorting contacts

---
 admin/classes/domain/Resource.php | 2 +-
 ajax_htmldata/getIssues.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index d169a18..68246ad 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -1665,7 +1665,7 @@ public function organizationContactsArray($organizationID) {
 
 			$orgContactsArray = array();
 
-			$query = "SELECT * FROM {$dbName}.Contact WHERE organizationID = '" . $organizationID . "'";
+			$query = "SELECT * FROM {$dbName}.Contact WHERE organizationID = '" . $organizationID . "' ORDER BY `name`";
 
 			return $this->db->processQuery($query, 'assoc');
 
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index b32453a..c7774cd 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -19,7 +19,7 @@
 		</tr>
 		<tr>
 			<td>
-				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issue</a> 
+				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issues</a> 
 				<a target="_blank" href="<?php echo $exportUrl;?>"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>

From 20a655232b9bdbae966569e95aedd438e901d7d8 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 15:03:15 -0500
Subject: [PATCH 094/159] Removed commented code

---
 ajax_htmldata/getIssues.php | 213 ------------------------------------
 1 file changed, 213 deletions(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index c7774cd..6d0cd69 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -33,216 +33,3 @@
 		</tr>
 	</table>
 
-<?php
-	
-
-
-/*
-		$util = new Utility();
-
-		//these are used to display the header since the arrays have resource and organization level contacts combined
-		$resContactFlag = 0;
-		$orgContactFlag = 0;
-
-		//get contacts
-		$sanitizedInstance = array();
-		$contactArray = array();
-		$contactObjArray = array();
-
-		if ((isset($archiveInd)) && ($archiveInd == "1")){
-			//if we want archives to be displayed
-			if ($showArchivesInd == "1"){
-				if (count($resource->getArchivedContacts()) > 0){
-					echo "<i><b>The following are archived contacts:</b></i>";
-				}
-				$contactArray = $resource->getArchivedContacts();
-			}
-		}else{
-			$contactArray = $resource->getUnarchivedContacts();
-		}
-
-
-		if (count($contactArray) > 0){
-			foreach ($contactArray as $contact){
-				if (($resContactFlag == 0) && (!isset($contact['organizationName']))){
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Resource Specific:</div>";
-					$resContactFlag = 1;
-				}else if (($orgContactFlag == 0) && (isset($contact['organizationName']))){
-					if ($resContactFlag == 0){
-						echo "<i>No Resource Specific Contacts</i><br /><br />";
-					}
-
-					if ($user->canEdit() && ($archiveInd != 1) && ($showArchivesInd != 1)){ ?>
-						<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
-						<br /><br /><br />
-					<?php
-					}
-
-					echo "<div class='formTitle' style='padding:4px; font-weight:bold; margin-bottom:8px;'>Inherited:</div>";
-					$orgContactFlag = 1;
-				}else{
-					echo "<br />";
-				}
-
-				?>
-
-				<table class='linedFormTable'>
-				<tr>
-				<th style='background:#f5f8fa;'>
-					<?php echo $contact['contactRoles']; ?>
-				</th>
-				<th style='background:#f5f8fa;'>
-				<span style='float:left;vertical-align:bottom;'>
-					<?php if ($contact['name']) { echo $contact['name']; }else{ echo "&nbsp;"; } ?>
-				</span>
-				<span style='float:right;vertical-align:top;'>
-				<?php
-					if (($user->canEdit()) && (!isset($contact['organizationName']))){
-						echo "<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=" . $resourceID . "&contactID=" . $contact['contactID'] . "' class='thickbox'><img src='images/edit.gif' alt='edit' title='edit contact'></a>";
-						echo "&nbsp;&nbsp;<a href='javascript:void(0)' class='removeContact' id='" . $contact['contactID'] . "'><img src='images/cross.gif' alt='remove note' title='remove contact'></a>";
-					}else{
-						echo "&nbsp;";
-					}
-
-				?>
-				</span>
-				</th>
-				</tr>
-
-				<?php
-				if (isset($contact['organizationName'])){ ?>
-
-				<tr>
-				<td style='vertical-align:top;width:110px;'>Organization:</td>
-				<td><?php echo $contact['organizationName'] . "&nbsp;&nbsp;<a href='" . $util->getCORALURL() . "organizations/orgDetail.php?showTab=contacts&organizationID=" . $contact['organizationID'] . "' target='_blank'><img src='images/arrow-up-right.gif' alt='Visit Contact in Organizations Module' title='Visit Contact in Organizations Module' style='vertical-align:top;'></a>"; ?></td>
-				</tr>
-
-				<?php
-				}
-
-				if (($contact['archiveDate'] != '0000-00-00') && ($contact['archiveDate'])) { ?>
-				<tr>
-				<td style='vertical-align:top;background-color:#ebebeb; width:110px;'>No longer valid:</td>
-				<td style='background-color:#ebebeb'><i><?php echo format_date($contact['archiveDate']); ?></i></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['title']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Title:</td>
-				<td><?php echo $contact['title']; ?></td>
-				</tr>
-				<?php
-				}
-
-				if ((isset($contact['addressText'])) && ($contact['addressText'] != '')){ ?>
-					<tr>
-					<td style='vertical-align:top; width:110px;'>Address:</td>
-					<td><?php echo nl2br($contact['addressText']); ?></td>
-					</tr>
-				<?php
-				}
-
-				if ((isset($contact['state']) || (isset($contact['country']))) && (($contact['state'] != '') || ($contact['country'] != ''))){ ?>
-					<tr>
-					<td style='vertical-align:top; width:110px;'>Location:</td>
-					<td><?php
-						if (!($contact['state'])) {
-							echo $contact['country'];
-						}else if (!($contact['country'])) {
-							echo $contact['state'];
-						}else{
-							echo $contact['state'] . ", " . $contact['country'];
-						}
-						?>
-					</td>
-					</tr>
-				<?php
-				}
-
-				if ($contact['phoneNumber']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Phone:</td>
-				<td><?php echo $contact['phoneNumber']; ?></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['altPhoneNumber']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Alt Phone:</td>
-				<td><?php echo $contact['altPhoneNumber']; ?></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['faxNumber']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Fax:</td>
-				<td><?php echo $contact['faxNumber']; ?></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['emailAddress']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Email:</td>
-				<td><a href='mailto:<?php echo $contact['emailAddress']; ?>'><?php echo $contact['emailAddress']; ?></a></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['noteText']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Notes:</td>
-				<td><?php echo nl2br($contact['noteText']); ?></td>
-				</tr>
-				<?php
-				}
-
-				if ($contact['lastUpdateDate']) { ?>
-				<tr>
-				<td style='vertical-align:top; width:110px;'>Last Updated:</td>
-				<td><i><?php echo format_date($contact['lastUpdateDate']); ?></i></td>
-				</tr>
-				<?php
-				}
-
-				?>
-
-				</table>
-			<?php
-			}
-
-
-			if ($user->canEdit() && ($orgContactFlag == 0) && ($showArchivesInd != 1)){ ?>
-				<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
-				<br /><br /><br />
-			<?php
-			}
-
-
-		} else {
-			if (($archiveInd != 1) && ($showArchivesInd != 1)){
-				echo "<i>No contacts available</i><br /><br />";
-				if (($user->canEdit())){ ?>
-					<a href='ajax_forms.php?action=getContactForm&height=389&width=620&modal=true&type=named&resourceID=<?php echo $resourceID; ?>' class='thickbox' id='newNamedContact'>add contact</a>
-					<br /><br /><br />
-				<?php
-				}
-			}
-		}
-
-		if (($showArchivesInd == "0") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i>" . count($resource->getArchivedContacts()) . " archived contact(s) available.  <a href='javascript:updateArchivedContacts(1);'>show archived contacts</a></i><br />";
-		}
-
-		if (($showArchivesInd == "1") && ($archiveInd == "1") && (count($resource->getArchivedContacts()) > 0)){
-			echo "<i><a href='javascript:updateArchivedContacts(0);'>hide archived contacts</a></i><br />";
-		}
-
-		echo "<br /><br />";
-*/
-?>
-

From f0531079bdd6b3cf53748411e76234fb8d13bac0 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 15:11:46 -0500
Subject: [PATCH 095/159] Now returning sibling resources as an array in the
 case of one result

---
 admin/classes/domain/Resource.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 68246ad..724cf9e 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -1680,7 +1680,14 @@ public function getSiblingResourcesArray($organizationID) {
 					  LEFT JOIN Resource r ON r.resourceID=rol.resourceID
 					  WHERE rol.organizationID=".$organizationID." AND r.archiveDate IS NULL
 					  ORDER BY r.titleText";
-			return $this->db->processQuery($query, 'assoc');
+
+			$result = $this->db->processQuery($query, 'assoc');
+
+			if($result["resourceID"]) {
+				return array($result);
+			}
+					  
+			return $result;
 	}
 
 	//gets an array of distinct organizations set up for this resource (organizationID, organization)

From 0914813019e9fe371b060cce0d11d458b37e95d4 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 15:14:50 -0500
Subject: [PATCH 096/159] Added org name to the resource option

---
 ajax_forms/getNewIssueForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 4bded3f..9214c4f 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -96,7 +96,7 @@
 					<input type="checkbox" class="issueResources" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources</label>
+					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources of <?php echo $resource->titleText ?></label>
 				</div>
 				<select multiple id="resourceIDs" name="resourceIDs[]">
 <?php

From 0a4216fc7caaae185780044a7539b1960d2947b9 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 15:41:12 -0500
Subject: [PATCH 097/159] Now showing close date and resolution text

---
 ajax_htmldata/getIssuesList.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 3cfdb36..7840934 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -17,9 +17,16 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	$html .= "
 	  	<dl>
 	  		<dt>Date reported:</dt> 
-	  		<dd>{$issue->dateCreated}</dd>
+	  		<dd>{$issue->dateCreated}</dd>";
+	if ($issue->dateClosed) {
+	  	
+		$html .= "<dt>Date closed:</dt>
+	  		<dd>{$issue->dateClosed}</dd>
+	  		<dt>Resolution</dt>
+	  		<dd>{$issue->resolutionText}</dd>";
+	  	}
 	  		
-	  		<dt>Contact(s):</dt> 
+	$html .= "<dt>Contact(s):</dt> 
 	  		<dd>";
 	$contacts = $issue->getContacts();
 	if ($contacts) {
@@ -41,7 +48,8 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 		}
 		$html .= rtrim($temp,',');
 	}
-	$html .= "</dd> 
+
+	$html .= "</dd>
 	  		<dt>Subject:</dt> 
 	  		<dd>{$issue->subjectText}</dd> 
 	  		

From c8675dd3d844d439c493484a01235d81d8d0ef1b Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 16:13:17 -0500
Subject: [PATCH 098/159] auto select newly created contacts

---
 js/resource.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/resource.js b/js/resource.js
index b4a70c6..b7c91cf 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -296,11 +296,12 @@ function createOrganizationContact(contact) {
 		cache:      false,
 		data:       contact,
 		success:    function(res) {
+			console.log(res);
 			$.ajax({
 				type:       "GET",
 				url:        baseUrl+"ajax_htmldata.php",
 				cache:      false,
-				data:       "action=getOrganizationContacts&organizationID="+contact.organizationID,
+				data:       "action=getOrganizationContacts&organizationID="+contact.organizationID+"&contactID="+res,
 				success:    function(html) {
 					$("#inlineContact").html(html).slideUp(250, function() {
 						$("#getCreateContactForm").fadeIn(250);

From 11fe157f12f6461454d57da93f52fc3013f05169 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 16:34:28 -0500
Subject: [PATCH 099/159] Now preserving contact selection after contact
 addition

---
 js/resource.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index b7c91cf..53c29a6 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -296,12 +296,23 @@ function createOrganizationContact(contact) {
 		cache:      false,
 		data:       contact,
 		success:    function(res) {
-			console.log(res);
+			
+			var data = {};
+			data.contactIDs = [];
+
+			$("#contactIDs option:selected").each(function() {
+				data.contactIDs.push($(this).val());
+			});
+
+			data.action = "getOrganizationContacts";
+			data.organizationID = contact.organizationID;
+			data.contactIDs.push(res);
+
 			$.ajax({
 				type:       "GET",
 				url:        baseUrl+"ajax_htmldata.php",
 				cache:      false,
-				data:       "action=getOrganizationContacts&organizationID="+contact.organizationID+"&contactID="+res,
+				data:       $.param(data),
 				success:    function(html) {
 					$("#inlineContact").html(html).slideUp(250, function() {
 						$("#getCreateContactForm").fadeIn(250);

From f3c23e81fe449ed5e3360cce77caac28066f8c44 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 16:46:16 -0500
Subject: [PATCH 100/159] Added a default message for resource issues list

---
 ajax_htmldata/getIssuesList.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 7840934..efb8595 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -69,7 +69,6 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	$issuedOrgs = array();
 	foreach ($organizationArray as $orgData) {
 		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
-// todo: create issues repo so we don't have to initialize an organization object from the wrong module
 			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
 
 			$orgIssues = $organization->getIssues($archivedFlag);
@@ -91,13 +90,17 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 //display any resource level issues for the resource (shows any other resources associated with the issue, too)
 $resourceIssues = $resource->getIssues($archivedFlag);
 echo '<h3 class="text-center">Resources</h3>';
-foreach ($resourceIssues as $issue) {
-	$associatedEntities = array();
-	if ($associatedResources = $issue->getAssociatedResources()) {
-		foreach ($associatedResources as $resource) {
-			$associatedEntities[] = array("name"=>$resource->titleText,"id"=>$resource->resourceID,"entityType"=>2);
-		}
+if(count($resourceIssues) > 0) {
+	foreach ($resourceIssues as $issue) {
+		$associatedEntities = array();
+		if ($associatedResources = $issue->getAssociatedResources()) {
+			foreach ($associatedResources as $resource) {
+				$associatedEntities[] = array("name"=>$resource->titleText,"id"=>$resource->resourceID,"entityType"=>2);
+			}
+		} 
+		echo generateIssueHTML($issue,$associatedEntities);
 	}
-	echo generateIssueHTML($issue,$associatedEntities);
+} else {
+	echo "<br><p>There are no resource level issues.</p><br>";
 }
 ?>
\ No newline at end of file

From 40c6ab26c92ecfed1339ae6c33a279ae8c629217 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 4 Aug 2015 17:22:12 -0500
Subject: [PATCH 101/159] added styling to new issue form

---
 ajax_htmldata/getIssues.php | 2 +-
 css/style.css               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 6d0cd69..ffd3367 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -15,7 +15,7 @@
 			<th>Issues/Problems</th>
 		</tr>
 		<tr>
-			<td><a class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
+			<td><a id="createNewIssueBtn" class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
 		</tr>
 		<tr>
 			<td>
diff --git a/css/style.css b/css/style.css
index 677766e..35dae23 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1014,6 +1014,12 @@ div#closeIssue .text-right {
 	text-align: right;
 }
 
+#newIssueForm #contactIDs,
+#newIssueForm #bodyText {
+	min-width: 200px;
+	min-height: 50px;
+}
+
 #inlineContact {
 	display: none;
 	border: 1px solid #dfdfdf;

From 4fbe4a0130a2e9f73113116370ebb7d8f7ef7645 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 5 Aug 2015 09:01:23 -0500
Subject: [PATCH 102/159] Changed return false to preventDefault

---
 js/plugins/thickbox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/plugins/thickbox.js b/js/plugins/thickbox.js
index 32229a6..ac21af6 100644
--- a/js/plugins/thickbox.js
+++ b/js/plugins/thickbox.js
@@ -23,13 +23,13 @@ function tb_reinit() {
 
 //add thickbox to href & area elements that have a class of .thickbox
 function tb_init(domChunk){
-	$(domChunk).click(function(){
+	$(domChunk).click(function(e){
+	e.preventDefault();
 	var t = this.title || this.name || null;
 	var a = this.href || this.alt;
 	var g = this.rel || false;
 	tb_show(t,a,g);
 	this.blur();
-	return false;
 	});
 }
 

From 53eed1afcacbef28ddc87dfa053f1a53fab50a5a Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 5 Aug 2015 09:01:47 -0500
Subject: [PATCH 103/159] Now closing issue list when creating new issue

---
 ajax_htmldata/getIssues.php | 2 +-
 js/resource.js              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index ffd3367..c343ded 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -15,7 +15,7 @@
 			<th>Issues/Problems</th>
 		</tr>
 		<tr>
-			<td><a id="createNewIssueBtn" class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
+			<td><a id="createIssueBtn" class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
 		</tr>
 		<tr>
 			<td>
diff --git a/js/resource.js b/js/resource.js
index 53c29a6..08d426a 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -91,6 +91,10 @@ $(document).ready(function(){
 
 	});
 
+	$("#createIssueBtn").live("click", function() {
+		$(".issueList").slideUp(250);
+	});
+
 	$("#getCreateContactForm").live("click",function(e) {
 		e.preventDefault();
 		$(this).fadeOut(250, function() {

From 8b2b7b4dab54abd9fa60ec780bab74baaa064c48 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 5 Aug 2015 10:00:17 -0500
Subject: [PATCH 104/159] slight changes to the create form css

---
 css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/style.css b/css/style.css
index 35dae23..ff08122 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1015,7 +1015,8 @@ div#closeIssue .text-right {
 }
 
 #newIssueForm #contactIDs,
-#newIssueForm #bodyText {
+#newIssueForm #bodyText,
+#newIssueForm #resourceIDs {
 	min-width: 200px;
 	min-height: 50px;
 }
@@ -1027,7 +1028,6 @@ div#closeIssue .text-right {
 }
 
 form#newIssueForm #resourceIDs {
-	min-height: 140px;
 	display: none;
 }
 

From 43defcbb5fd9fcea5ba73019c2be487cd7d241f0 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Mon, 10 Aug 2015 15:53:58 -0500
Subject: [PATCH 105/159] Added install script for downtime tables

---
 install/protected/resource_downtime.sql | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 install/protected/resource_downtime.sql

diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
new file mode 100644
index 0000000..d73f950
--- /dev/null
+++ b/install/protected/resource_downtime.sql
@@ -0,0 +1,18 @@
+
+DROP TABLE IF EXISTS `Downtime`;
+CREATE TABLE IF NOT EXISTS `Downtime` (
+`downtimeID` int(11) NOT NULL,
+  	`issueID` int(11) DEFAULT NULL,
+  	`downtimeStartdate` date NOT NULL,
+  	`downtimeEnddate` date DEFAULT NULL,
+  	`downtimeType` int(11) NOT NULL,
+  	PRIMARY KEY (`downtimeID`),
+  	KEY `IssueID` (`IssueID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+DROP TABLE IF EXISTS `DowntimeType`;
+CREATE TABLE IF NOT EXISTS `DowntimeType` (
+	`downtimeTypeID` int(11) NOT NULL,
+	`downtimeTypeName` varchar(80) NOT NULL,
+	PRIMARY KEY (`downtimeTypeID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
\ No newline at end of file

From 078666f62c53822f56a89d2f48965300a50912e4 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 11 Aug 2015 13:42:55 -0500
Subject: [PATCH 106/159] changed date to datetime

---
 install/protected/resource_downtime.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
index d73f950..b178577 100644
--- a/install/protected/resource_downtime.sql
+++ b/install/protected/resource_downtime.sql
@@ -3,8 +3,8 @@ DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
 `downtimeID` int(11) NOT NULL,
   	`issueID` int(11) DEFAULT NULL,
-  	`downtimeStartdate` date NOT NULL,
-  	`downtimeEnddate` date DEFAULT NULL,
+  	`downtimeStartdate` datetime NOT NULL,
+  	`downtimeEnddate` datetime DEFAULT NULL,
   	`downtimeType` int(11) NOT NULL,
   	PRIMARY KEY (`downtimeID`),
   	KEY `IssueID` (`IssueID`)

From 0b5cb3617907bd245d27191b3f8d4a9ab5e71f99 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 12 Aug 2015 13:35:53 -0500
Subject: [PATCH 107/159] Listing downtimes

---
 admin/classes/domain/Organization.php | 29 +++++++++++++++++++++++++++
 admin/classes/domain/Resource.php     | 28 ++++++++++++++++++++++++++
 ajax_htmldata/getIssues.php           | 26 +++++++++++++++++++++++-
 css/style.css                         | 24 +++++++++++++++-------
 js/resource.js                        | 19 ++++++++++++++++++
 5 files changed, 118 insertions(+), 8 deletions(-)

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index a80d01e..7b2d976 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -76,6 +76,35 @@ public function getIssues($archivedOnly=false) {
 		return $objects;
 	}
 
+	public function getDowntime($archivedOnly=false) {
+		$query = "SELECT d.* 
+			  FROM Downtime d
+			  WHERE d.entityID={$this->primaryKey} 
+			  AND d.entityTypeID=1";
+
+		if ($archivedOnly) {
+			$query .= " AND d.endDate < CURDATE()";
+		} else {
+			$query .= " AND d.endDate >= CURDATE()";
+		}
+		$query .= "	ORDER BY d.dateCreated DESC";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['downtimeID'])) {
+			$object = new Downtime(new NamedArguments(array('primaryKey' => $result['downtimeID'])));
+			array_push($objects, $object);
+		} else {
+			foreach ($result as $row) {
+				$object = new Downtime(new NamedArguments(array('primaryKey' => $row['downtimeID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
+
 	public function getExportableIssues($archivedOnly=false) {
 		$orgDB = $this->db->config->settings->organizationsDatabaseName;
 		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 724cf9e..e4ecec6 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -800,6 +800,34 @@ public function getIssues($archivedOnly=false){
 		return $objects;
 	}
 
+	public function getDowntime($archivedOnly=false){
+		$query = "SELECT d.*
+				  FROM Downtime d
+				  WHERE d.entityID={$this->resourceID} AND d.entityTypeID=2";
+		if ($archivedOnly) {
+			$query .= " AND d.endDate < CURDATE()";
+		} else {
+			$query .= " AND d.endDate >= CURDATE()";
+		}
+		$query .= "	ORDER BY d.dateCreated DESC";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['downtimeID'])){
+			$object = new Downtime(new NamedArguments(array('primaryKey' => $result['downtimeID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new Downtime(new NamedArguments(array('primaryKey' => $row['downtimeID'])));
+				array_push($objects, $object);
+			}
+		}
+		return $objects;
+	}
+
 	public function getExportableIssues($archivedOnly=false){
 		$orgDB = $this->db->config->settings->organizationsDatabaseName;
 		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index c343ded..6ac18fe 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -5,12 +5,13 @@
 
 	$util = new Utility();
 	$getIssuesFormData = "action=getIssuesList&resourceID=".$resourceID;
+	$getDowntimeFormData = "action=getDowntimeList&resourceID=".$resourceID;
 	$exportUrl = "export_issues.php?resourceID={$resourceID}";
 
 
 ?>
 
-	<table class='linedFormTable issueTable'>
+	<table id="issueTable" class='linedFormTable issueTabTable'>
 		<tr>
 			<th>Issues/Problems</th>
 		</tr>
@@ -33,3 +34,26 @@
 		</tr>
 	</table>
 
+	<table id="downTimeTable" class='linedFormTable issueTabTable'>
+		<tr>
+			<th>Downtime</th>
+		</tr>
+		<tr>
+			<td><a id="createDowntimeBtn" class="thickbox" href="ajax_forms.php?action=getNewDowntimeForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new Downtime</a></td>
+		</tr>
+		<tr>
+			<td>
+				<a href="<?php echo $getDowntimeFormData; ?>" class="downtimeBtn" id="openDowntimeBtn">view current/upcoming downtime</a> 
+				<a target="_blank" href="<?php echo $exportUrl;?>"><img src="images/xls.gif" /></a>
+				<div class="downtimeList" id="currentDowntime" style="display:none;"></div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<a href="<?php echo $getDowntimeFormData."&archived=1"; ?>" class="downtimeBtn" id="archiveddowntimeBtn">view archived downtime</a> 
+				<a target="_blank" href="<?php echo $exportUrl;?>&archived=1"><img src="images/xls.gif" /></a>
+				<div class="downtimeList" id="archivedDowntime"></div>
+			</td>
+		</tr>
+	</table>
+
diff --git a/css/style.css b/css/style.css
index ff08122..ca84e8c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -966,11 +966,16 @@ table.borderedHeadTable tr {
 	vertical-align:middle;
 }
 
-table.issueTable tr th {
+table.issueTabTable tr th {
 	background:#f5f8fa;
 }
 
-div.issueList {
+table.issueTabTable#downTimeTable {
+	margin-top: 25px;
+}
+
+div.issueList,
+div.downtimeList {
 	display: none;
 	width: 85%;
 	padding: 0 10px 5px 25px;
@@ -984,25 +989,30 @@ div.issueList a.closeIssueBtn {
 	float: right;
 }
 
-div.issueList dl {
+div.issueList dl,
+div.downtimeList dl {
 	margin-top: 15px;
 }
 
-div.issueList dl dt {
+div.issueList dl dt,
+div.downtimeList dl dt {
 	margin-top: 5px; 
 	font-weight: bold;
 	display: inline;
 }
 
-div.issueList dl dd {
+div.issueList dl dd,
+div.downtimeList dl dd {
 	display: inline;
 }
 
-div.issueList dl dd:after { 
+div.issueList dl dd:after,
+div.downtimeList dl dd:after { 
 	content:"\A"; white-space:pre; 
 }
 
-div.issueList dl dt.block {
+div.issueList dl dt.block,
+div.downtimeList dl dt.block {
 	display: block;
 }
 
diff --git a/js/resource.js b/js/resource.js
index 08d426a..09ca143 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -69,6 +69,11 @@ $(document).ready(function(){
 		getIssues($(this));
 	});
 
+	$(".downtimeBtn").live("click", function(e) {
+		e.preventDefault();
+		getDowntime($(this));
+	});
+
 	$("#submitCloseIssue").live("click", function() {
 		submitCloseIssue();
 	});
@@ -392,6 +397,20 @@ function getIssues(element) {
 	
 }
 
+function getDowntime(element) {
+	var data = element.attr("href");
+	$.ajax({
+		url:        "ajax_htmldata.php",
+		data: 		data,
+		cache:      false,
+		success:    function(html) {
+			element.siblings(".downtimeList").html(html).slideToggle(250);
+			tb_reinit();
+		}
+	});
+	
+}
+
 function submitCloseIssue() {
 	$('#submitCloseIssue').attr("disabled", "disabled"); 
 	$.ajax({

From 03d63b660685003fe0a2db96826b89e18d137676 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Wed, 12 Aug 2015 13:36:31 -0500
Subject: [PATCH 108/159] Added downtime class and the get downtime html

---
 admin/classes/domain/Downtime.php | 53 ++++++++++++++++++++
 ajax_htmldata/getDowntimeList.php | 82 +++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 admin/classes/domain/Downtime.php
 create mode 100644 ajax_htmldata/getDowntimeList.php

diff --git a/admin/classes/domain/Downtime.php b/admin/classes/domain/Downtime.php
new file mode 100644
index 0000000..92c7bd7
--- /dev/null
+++ b/admin/classes/domain/Downtime.php
@@ -0,0 +1,53 @@
+<?php
+
+class Downtime extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+	public function load() {
+
+		//This is a custom load method that joins the downtime type name into the attributes
+
+		//if exists in the database
+		if (isset($this->primaryKey)) {	
+			$query = "SELECT d.*, dt.name, i.subjectText
+				  FROM Downtime d
+				  LEFT JOIN DowntimeType dt ON dt.downtimeTypeID=d.downtimeTypeID
+				  LEFT JOIN Issue i ON i.issueID=d.issueID
+				  WHERE d.downtimeID={$this->primaryKey}";
+			
+			$result = $this->db->processQuery($query, 'assoc');
+
+			foreach (array_keys($result) as $attributeName) {
+				$this->addAttribute($attributeName);
+				$this->attributes[$attributeName] = $result[$attributeName];
+			}
+
+		}else{
+			// Figure out attributes from existing database
+			$query = "SELECT COLUMN_NAME FROM information_schema.`COLUMNS` WHERE table_schema = '";
+			$query .= $this->db->config->database->name . "' AND table_name = '$this->tableName'";// MySQL-specific
+			foreach ($this->db->processQuery($query) as $result) {
+				$attributeName = $result[0];
+				$this->addAttribute($attributeName);
+			}
+		}
+	}
+
+	public function save() {
+
+		//We have added the name attribute after the fact, and here, we are cleaning it up
+		unset($this->attributes["name"]); 
+		unset($this->attributesNames["name"]);
+
+		unset($this->attributes["subjectText"]); 
+		unset($this->attributesNames["subjectText"]);
+
+		parent::save();
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/ajax_htmldata/getDowntimeList.php b/ajax_htmldata/getDowntimeList.php
new file mode 100644
index 0000000..62fb8a1
--- /dev/null
+++ b/ajax_htmldata/getDowntimeList.php
@@ -0,0 +1,82 @@
+<?php
+$resourceID = $_GET['resourceID'];
+$archivedFlag = (!empty($_GET['archived']) && $_GET['archived'] == 1) ? true:false;
+
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$util = new Utility();
+
+
+//shared html template for organization and resource downtimes
+function generateDowntimeHTML($downtime,$associatedEntities=null) {
+
+	$html = "
+	<div class=\"downtime\">";
+	
+	$html .= "
+	  	<dl>
+	  		<dt>Type:</dt> 
+	  		<dd>{$downtime->name}</dd>
+
+	  		<dt>Downtime Start:</dt> 
+	  		<dd>{$downtime->startDate}</dd>
+
+	  		<dt>Downtime Resolved:</dt> 
+	  		<dd>{$downtime->endDate}</dd>";
+
+	if($downtime->subjectText) {
+		$html .= "
+	  		<dt>Linked issue:</dt> 
+	  		<dd>{$downtime->subjectText}</dd>";
+	}
+
+	$html .= "		
+		</dl>
+	</div>";	
+	
+	return $html;
+}
+
+//display any organization level downtimes for the resource
+$organizationArray = $resource->getOrganizationArray();
+
+if (count($organizationArray) > 0) {
+	echo '<h3 class="text-center">Organizational</h3>';
+
+	$downtimedOrgs = array();
+	foreach ($organizationArray as $orgData) {
+		if (!in_array($orgData['organizationID'],$downtimedOrgs)) {
+			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+
+			$orgDowntimes = $organization->getDowntime($archivedFlag);
+
+			if(count($orgDowntimes) > 0) {
+				foreach ($orgDowntimes as $downtime) {
+					echo generateDowntimeHTML($downtime,array(array("name"=>$orgData['organization'],"id"=>$organization->organizationID,"entityType"=>1)));
+				}
+			} else {
+				echo "<br><p>There are no organization level downtimes.</p><br>";
+			}
+
+			$orgDowntimes = null;
+			$downtimedOrgs[] = $orgData['organizationID'];
+		}
+	}
+}
+
+//display any resource level downtimes for the resource (shows any other resources associated with the downtime, too)
+$resourceDowntimes = $resource->getDowntime($archivedFlag);
+echo '<h3 class="text-center">Resources</h3>';
+if(count($resourceDowntimes) > 0) {
+	foreach ($resourceDowntimes as $downtime) {
+		$associatedEntities = array();
+		if ($associatedResources = $downtime->getAssociatedResources()) {
+			foreach ($associatedResources as $resource) {
+				$associatedEntities[] = array("name"=>$resource->titleText,"id"=>$resource->resourceID,"entityType"=>2);
+			}
+		} 
+		echo generateDowntimeHTML($downtime,$associatedEntities);
+	}
+} else {
+	echo "<br><p>There are no resource level downtimes.</p><br>";
+}
+?>
\ No newline at end of file

From c0ae110a6b1d97c3ce3db299869c9420951ed77b Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Thu, 13 Aug 2015 16:09:13 -0500
Subject: [PATCH 109/159] Can create downtimes

---
 admin/classes/domain/Downtime.php  |  14 ++++
 ajax_forms/getNewDowntimeForm.php  | 102 +++++++++++++++++++++++++++++
 ajax_htmldata/getIssues.php        |   2 +-
 ajax_processing/insertDowntime.php |  16 +++++
 js/resource.js                     |  32 ++++++++-
 5 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 ajax_forms/getNewDowntimeForm.php
 create mode 100644 ajax_processing/insertDowntime.php

diff --git a/admin/classes/domain/Downtime.php b/admin/classes/domain/Downtime.php
index 92c7bd7..47276dc 100644
--- a/admin/classes/domain/Downtime.php
+++ b/admin/classes/domain/Downtime.php
@@ -48,6 +48,20 @@ public function save() {
 		parent::save();
 	}
 
+	public function getDowntimeTypesArray() {
+		$query = "SELECT dt.*
+				  FROM DowntimeType dt";
+
+		$result = $this->db->processQuery($query, "assoc");
+		$names = array();
+
+		foreach ($result as $name) {
+			array_push($names, $name);
+		}
+
+		return $names;
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
new file mode 100644
index 0000000..930dd8e
--- /dev/null
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -0,0 +1,102 @@
+<?php
+$util = new utility();
+
+$resourceID = $_GET["resourceID"];
+
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$issues = $resource->getIssues();
+
+$organizationArray = $resource->getOrganizationArray();
+$organizationData = $organizationArray[0];
+
+if ($organizationData['organizationID']) {
+
+	$organization = new Organization(new NamedArguments(array('primaryKey' => $organizationData['organizationID'])));
+
+	$orgIssues = $organization->getIssues();
+
+	foreach ($orgIssues as $issue) {
+		array_push($issues, $issue);
+	}
+
+	$downtimeObj = new Downtime();
+	$downtimeTypeNames = $downtimeObj->getDowntimeTypesArray();
+
+	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
+	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
+
+	$defaultStart = date("Y-m-d\TH:i");
+	$defaultEnd = date("Y-m-d\TH:i", strtotime("+1 day"));
+
+?>
+
+<form id='newDowntimeForm'>
+	<input type="hidden" name="sourceOrganizationID" value="<?php echo $organizationData['organizationID'];?>" />
+	<input type="hidden" name="sourceResourceID" value="<?php echo $resourceID;?>" />
+	<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
+		<tr>
+			<td colspan="2">
+				<h1> Resource Downtime Report</h1>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Downtime Start:</label></td>
+			<td>
+				<input value="<?php echo $defaultStart; ?>" type="datetime-local" name="startDate" id="startDate" />
+				<span id='span_error_contactName' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Downtime Resolution:</label></td>
+			<td>
+				<input value="<?php echo $defaultEnd; ?>"  type="datetime-local" name="endDate" id="endDate" />
+				<span id='span_error_contactName' class='smallDarkRedText'>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Problem Type:</label></td>
+			<td>
+				<select class="downtimeType" name="downtimeType">
+<?php
+			foreach ($downtimeTypeNames as $downtimeType) {
+				echo "<option value=".$downtimeType["downtimeTypeID"].">".$downtimeType["name"]."</option>";
+			}
+?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td><label>Link to open issue:</label></td>
+			<td>
+				<select class="issueID" name="issueID">
+					<option value="">none</option>
+<?php
+			foreach ($issues as $issue) {
+				echo "<option value=".$issue->issueID.">".$issue->subjectText."</option>";
+			}
+?>
+				</select>
+			</td>
+		</tr>
+	</table>
+
+	<table class='noBorderTable' style='width:125px;'>
+		<tr>
+			<td style='text-align:left'><input type='button' value='submit' name='submitNewDowntime' id='submitNewDowntime'></td>
+			<td style='text-align:right'><input type='button' value='cancel' onclick="tb_remove();"></td>
+		</tr>
+	</table>
+
+</form>
+
+<?php
+} else {
+	echo '
+		<p>
+			Opening an issue requires a resource to be associated with an organization.
+		</p>
+		<input type="button" value="cancel" onclick="tb_remove();">';
+}
+?>
+
+
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 6ac18fe..686e627 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -39,7 +39,7 @@
 			<th>Downtime</th>
 		</tr>
 		<tr>
-			<td><a id="createDowntimeBtn" class="thickbox" href="ajax_forms.php?action=getNewDowntimeForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new Downtime</a></td>
+			<td><a id="createDowntimeBtn" class="thickbox" href="ajax_forms.php?action=getNewDowntimeForm&resourceID=<?php echo $resourceID; ?>&height=160&width=390&modal=true">report new Downtime</a></td>
 		</tr>
 		<tr>
 			<td>
diff --git a/ajax_processing/insertDowntime.php b/ajax_processing/insertDowntime.php
new file mode 100644
index 0000000..a094f44
--- /dev/null
+++ b/ajax_processing/insertDowntime.php
@@ -0,0 +1,16 @@
+<?php
+
+$newDowntime = new Downtime();
+$newDowntime->entityID = $_POST['sourceResourceID'];
+$newDowntime->creatorID = $user->loginID;
+$newDowntime->downtimeTypeID = $_POST['downtimeType'];
+$newDowntime->issueID = $_POST['issueID'];
+$newDowntime->startDate = date('Y-m-d H:i:s', strtotime($_POST['startDate']));
+$newDowntime->endDate = date('Y-m-d H:i:s', strtotime($_POST['endDate']));
+
+$newDowntime->dateCreated = date( 'Y-m-d H:i:s');
+$newDowntime->entityTypeID = 2;
+
+$newDowntime->save();
+
+?>
\ No newline at end of file
diff --git a/js/resource.js b/js/resource.js
index 09ca143..6a4bc9e 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -83,6 +83,11 @@ $(document).ready(function(){
 		submitNewIssue();
 	});
 
+	$("#submitNewDowntime").live("click", function(e) {
+		e.preventDefault();
+		submitNewDowntime();
+	});
+
 	$(".issueResources").live("click", function() {
 
 		$(".issueResources").attr("checked", false);
@@ -100,6 +105,10 @@ $(document).ready(function(){
 		$(".issueList").slideUp(250);
 	});
 
+	$("#createDowntimeBtn").live("click", function() {
+		$(".downtimeList").slideUp(250);
+	});
+
 	$("#getCreateContactForm").live("click",function(e) {
 		e.preventDefault();
 		$(this).fadeOut(250, function() {
@@ -372,7 +381,28 @@ function submitNewIssue() {
 		 cache:      false,
 		 data:       $("#newIssueForm").serialize(),
 		 success:    function(res) {
-			console.log(res);
+			updateIssues();
+			tb_remove()
+		 }
+
+
+	  });
+
+
+}
+
+function submitNewDowntime() {
+	
+	var data = $("#newDowntimeForm").serialize();
+	data += "&startDate="+$("#startDate").val();
+	data += "&endDate="+$("#endDate").val();
+
+	$.ajax({
+		 type:       "POST",
+		 url:        "ajax_processing.php?action=insertDowntime",
+		 cache:      false,
+		 data:       data,
+		 success:    function(res) {
 			updateIssues();
 			tb_remove()
 		 }

From 3a53a58d35bf3233825a9cc35296f62be1669b79 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 14 Aug 2015 09:10:02 -0500
Subject: [PATCH 110/159] Exporting downtimes

---
 admin/classes/domain/Organization.php | 24 +++++++++++++++
 admin/classes/domain/Resource.php     | 24 +++++++++++++++
 ajax_htmldata/getIssues.php           | 11 +++----
 export_downtimes.php                  | 43 +++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 export_downtimes.php

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index 7b2d976..22d255c 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -137,6 +137,30 @@ public function getExportableIssues($archivedOnly=false) {
 			return $result;
 		}
 	}
+
+	public function getExportableDowntimes($archivedOnly=false){
+		
+		$query = "SELECT d.*
+				  FROM Downtime d
+				  WHERE d.entityID={$this->primaryKey} AND d.entityTypeID=1";
+		if ($archivedOnly) {
+			$query .= " AND d.endDate < CURDATE()";
+		} else {
+			$query .= " AND d.endDate >= CURDATE()";
+		}
+		$query .= "	ORDER BY d.dateCreated DESC";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['downtimeID'])){
+			return array($result);
+		}else{
+			return $result;
+		}
+	}
 }
 
 ?>
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index e4ecec6..5596268 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -863,6 +863,30 @@ public function getExportableIssues($archivedOnly=false){
 		}
 	}
 
+	public function getExportableDowntimes($archivedOnly=false){
+		
+		$query = "SELECT d.*
+				  FROM Downtime d
+				  WHERE d.entityID={$this->resourceID} AND d.entityTypeID=2";
+		if ($archivedOnly) {
+			$query .= " AND d.endDate < CURDATE()";
+		} else {
+			$query .= " AND d.endDate >= CURDATE()";
+		}
+		$query .= "	ORDER BY d.dateCreated DESC";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['downtimeID'])){
+			return array($result);
+		}else{
+			return $result;
+		}
+	}
+
 	//returns array of attachments objects
 	public function getAttachments(){
 
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index 686e627..8ce38fc 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -6,7 +6,8 @@
 	$util = new Utility();
 	$getIssuesFormData = "action=getIssuesList&resourceID=".$resourceID;
 	$getDowntimeFormData = "action=getDowntimeList&resourceID=".$resourceID;
-	$exportUrl = "export_issues.php?resourceID={$resourceID}";
+	$exportIssuesUrl = "export_issues.php?resourceID={$resourceID}";
+	$exportDowntimesUrl = "export_downtimes.php?resourceID={$resourceID}";
 
 
 ?>
@@ -21,14 +22,14 @@
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData; ?>" class="issuesBtn" id="openIssuesBtn">view open issues</a> 
-				<a target="_blank" href="<?php echo $exportUrl;?>"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportIssuesUrl;?>"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="openIssues" style="display:none;"></div>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<a href="<?php echo $getIssuesFormData."&archived=1"; ?>" class="issuesBtn" id="archivedIssuesBtn">view archived issues</a> 
-				<a target="_blank" href="<?php echo $exportUrl;?>&archived=1"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportIssuesUrl;?>&archived=1"><img src="images/xls.gif" /></a>
 				<div class="issueList" id="archivedIssues"></div>
 			</td>
 		</tr>
@@ -44,14 +45,14 @@
 		<tr>
 			<td>
 				<a href="<?php echo $getDowntimeFormData; ?>" class="downtimeBtn" id="openDowntimeBtn">view current/upcoming downtime</a> 
-				<a target="_blank" href="<?php echo $exportUrl;?>"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportDowntimesUrl;?>"><img src="images/xls.gif" /></a>
 				<div class="downtimeList" id="currentDowntime" style="display:none;"></div>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<a href="<?php echo $getDowntimeFormData."&archived=1"; ?>" class="downtimeBtn" id="archiveddowntimeBtn">view archived downtime</a> 
-				<a target="_blank" href="<?php echo $exportUrl;?>&archived=1"><img src="images/xls.gif" /></a>
+				<a target="_blank" href="<?php echo $exportDowntimesUrl;?>&archived=1"><img src="images/xls.gif" /></a>
 				<div class="downtimeList" id="archivedDowntime"></div>
 			</td>
 		</tr>
diff --git a/export_downtimes.php b/export_downtimes.php
new file mode 100644
index 0000000..e64b894
--- /dev/null
+++ b/export_downtimes.php
@@ -0,0 +1,43 @@
+<?php
+session_start();
+
+include_once 'directory.php';
+
+$resourceID = $_GET['resourceID'];
+$archivedFlag = (!empty($_GET['archived']) && $_GET['archived'] == 1) ? true:false;
+
+$resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
+$util = new Utility();
+
+$organizationArray = $resource->getOrganizationArray();
+
+$exportDowntimes = array();
+
+if (count($organizationArray) > 0) {
+	$downtimedOrgs = array();
+	foreach ($organizationArray as $orgData) {
+		if (!in_array($orgData['organizationID'],$downtimedOrgs)) {
+// todo: create downtimes repo so we don't have to initialize an organization object from the wrong module
+			$organization = new Organization(new NamedArguments(array('primaryKey' => $orgData['organizationID'])));
+			$exportDowntimes = array_merge($exportDowntimes,$organization->getExportableDowntimes($archivedFlag));
+			$downtimedOrgs[] = $orgData['organizationID'];
+		}
+	}
+}
+
+$exportDowntimes = array_merge($exportDowntimes,$resource->getExportableDowntimes($archivedFlag));
+
+header("Pragma: public");
+header("Content-type: text/csv");
+header("Content-Disposition: attachment; filename=\"downtimes.csv\"");
+
+$out = fopen('php://output', 'w');
+
+fputcsv($out,array_keys($exportDowntimes[0]));
+
+foreach ($exportDowntimes as $downtime) {
+	fputcsv($out, $downtime);
+}
+fclose($out);
+
+?>
\ No newline at end of file

From 691807c927e4bd855edd8e62bc331f35f2e78fe2 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Fri, 14 Aug 2015 09:17:23 -0500
Subject: [PATCH 111/159] Updated the intall sql

---
 install/protected/resource_downtime.sql | 29 ++++++++++++++-----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
index b178577..5f0076a 100644
--- a/install/protected/resource_downtime.sql
+++ b/install/protected/resource_downtime.sql
@@ -1,18 +1,21 @@
-
 DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
-`downtimeID` int(11) NOT NULL,
-  	`issueID` int(11) DEFAULT NULL,
-  	`downtimeStartdate` datetime NOT NULL,
-  	`downtimeEnddate` datetime DEFAULT NULL,
-  	`downtimeType` int(11) NOT NULL,
-  	PRIMARY KEY (`downtimeID`),
-  	KEY `IssueID` (`IssueID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+  `downtimeID` int(11) NOT NULL,
+  `entityID` int(11) NOT NULL,
+  `issueID` int(11) DEFAULT NULL,
+  `creatorID` varchar(80) NOT NULL,
+  `dateCreated` datetime NOT NULL,
+  `startDate` datetime NOT NULL,
+  `endDate` datetime NOT NULL,
+  `downtimeTypeID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL DEFAULT '2',
+   PRIMARY KEY (`downtimeID`),
+   KEY `IssueID` (`IssueID`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 
 DROP TABLE IF EXISTS `DowntimeType`;
 CREATE TABLE IF NOT EXISTS `DowntimeType` (
-	`downtimeTypeID` int(11) NOT NULL,
-	`downtimeTypeName` varchar(80) NOT NULL,
-	PRIMARY KEY (`downtimeTypeID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
\ No newline at end of file
+  `downtimeTypeID` int(11) NOT NULL,
+  `name` varchar(80) NOT NULL,
+  PRIMARY KEY (`downtimeTypeID`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file

From 4b6929e9eb92a1ff314c99f1e437a8a02a54171a Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Mon, 17 Aug 2015 13:40:35 -0500
Subject: [PATCH 112/159] changed myisam to innodb

---
 install/protected/resource_issues.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/protected/resource_issues.sql b/install/protected/resource_issues.sql
index d18278c..5cfe83c 100644
--- a/install/protected/resource_issues.sql
+++ b/install/protected/resource_issues.sql
@@ -21,7 +21,7 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
   `entityTypeID` int(11) NOT NULL,
   PRIMARY KEY (`issueRelationshipID`),
   KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
@@ -29,7 +29,7 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
   `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `entityName` varchar(80) NOT NULL,
   PRIMARY KEY (`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
@@ -38,7 +38,7 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
   `issueID` int(11) NOT NULL,
   `contactID` int(11) NOT NULL,
   PRIMARY KEY (`issueContactID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEmail`;
@@ -48,4 +48,4 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueEmail` (
   `email` varchar(120) NOT NULL,
   PRIMARY KEY (`IssueEmailID`),
   KEY `IssueID` (`IssueID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;

From db7a255943af5471d36a331db29971f869635db5 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Mon, 17 Aug 2015 16:09:48 -0500
Subject: [PATCH 113/159] form validation complete on create new issues

---
 ajax_forms/getNewIssueForm.php |  33 ++++++-----
 js/common.js                   |   6 ++
 js/resource.js                 | 103 +++++++++++++++++++++++++--------
 3 files changed, 103 insertions(+), 39 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 9214c4f..76fdede 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -14,23 +14,24 @@
 ?>
 
 <form id='newIssueForm'>
-	<input type="hidden" name="sourceOrganizationID" value="<?php echo $organizationData['organizationID'];?>" />
+	<input type="hidden" id="sourceOrganizationID" name="sourceOrganizationID" value="<?php echo $organizationData['organizationID'];?>" />
 	<input type="hidden" name="sourceResourceID" value="<?php echo $resourceID;?>" />
 	<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
 		<tr>
 			<td colspan="2">
 				<h1> Report New Problem</h1>
+				<span class='smallDarkRedText'>* required fields</span>
 			</td>
 		</tr>
 		<tr>
-			<td><label>Organization:</label></td>
+			<td><label>Organization:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<p><?php echo $organizationData['organization']; ?></p>
-				<span id='span_error_organizationId' class='smallDarkRedText'>
+				<span id='span_error_organizationId' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
-			<td><label>Contact:</label></td>
+			<td><label>Contact:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<select multiple style="min-height: 60px;" type='text' id='contactIDs' name='contactIDs[]'>
 <?php 
@@ -41,7 +42,7 @@
 
 ?>
 				</select>
-				<span id='span_error_contactName' class='smallDarkRedText'>
+				<span id='span_error_contactName' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -56,7 +57,7 @@
 			<td><label>CC myself:</label></td>
 			<td>
 				<input type='checkbox' id='ccCreator' name='ccCreator' class='changeInput' />
-				<span id='span_error_ccCreator' class='smallDarkRedText'>
+				<span id='span_error_ccCreator' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -68,37 +69,37 @@
 					Current CCs: <span id="currentEmails"></span>
 				</p>
 				<input type="hidden" id='ccEmails' name='ccEmails' value='' class='changeInput' />
-				<span id='span_error_contactIDs' class='smallDarkRedText'>
+				<span id='span_error_contactIDs' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
-			<td><label>Subject:</label></td>
+			<td><label>Subject:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<input type='text' id='subjectText' name='issue[subjectText]' value='' class='changeInput' />
-				<span id='span_error_subjectText' class='smallDarkRedText'>
+				<span id='span_error_subjectText' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
-			<td><label>Body:</label></td>
+			<td><label>Body:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<textarea id='bodyText' name='issue[bodyText]' value='' />
-				<span id='span_error_bodyText' class='smallDarkRedText'>
+				<span id='span_error_bodyText' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
-			<td><label>Applies to:</label></td>
+			<td><label>Applies to:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 
 				<div>
-					<input type="checkbox" class="issueResources" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
+					<input type="checkbox" class="issueResources resourcesArray" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+					<input type="checkbox" class="issueResources resourceArray" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
 				</div>
 				<div>
 					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources of <?php echo $resource->titleText ?></label>
 				</div>
-				<select multiple id="resourceIDs" name="resourceIDs[]">
+				<select multiple id="resourceIDs" class="resourcesArray" name="resourceIDs[]">
 <?php
 	if (!empty($organizationResourcesArray)) {
 		foreach ($organizationResourcesArray as $resource) {
@@ -107,7 +108,7 @@
 	}
 ?>
 				</select>
-				<span id='span_error_resourceIDs' class='smallDarkRedText'>
+				<span id='span_error_resourceIDs' class='smallDarkRedText'></span>
 			</td>
 		</tr>
 	</table>
diff --git a/js/common.js b/js/common.js
index 9dd429c..e05330e 100644
--- a/js/common.js
+++ b/js/common.js
@@ -185,6 +185,12 @@ function getCheckboxValue(field){
 	}
 }
 
+function validateEmail(email) {
+	console.log("Validating email.");
+  var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+  return regex.test(email);
+}
+
 function validateRequired(field,alerttxt){
 	fieldValue=$("#" + field).val();
 
diff --git a/js/resource.js b/js/resource.js
index 08d426a..4b5135c 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -114,14 +114,24 @@ $(document).ready(function(){
 
 	$("#addEmail").live("click", function(e) {
 		e.preventDefault();
-		$("#currentEmails").append($("#inputEmail").val()+", ");
-		currentVal = $("#ccEmails").val();
-		if (!currentVal) {
-			$("#ccEmails").val($("#inputEmail").val());
+		var inputEmail = $("#inputEmail").val();		
+		var valid = validateEmail(inputEmail);
+		if (valid) {
+			var currentVal = $("#ccEmails").val();
+
+			$("#currentEmails").append(inputEmail+", ");
+		
+			if (!currentVal) {
+				$("#ccEmails").val(inputEmail);
+			} else {
+				$("#ccEmails").val(currentVal+','+inputEmail);
+			}
+
+			$("#inputEmail").val('');
+			$('#span_error_contactIDs').html('');	
 		} else {
-			$("#ccEmails").val(currentVal+','+$("#inputEmail").val());
+			$('#span_error_contactIDs').html('CC must be a valid email.');
 		}
-		$("#inputEmail").val('');
 	});
 
 	$(".showAccounts").click(function () {
@@ -353,29 +363,76 @@ function updateIssues(){
 		bind_removes();
 		tb_reinit();
 	 }
-
-
   });
+}
 
+function validateNewIssue (){
+ 	myReturn=0;
+
+	var organization = $('#sourceOrganizationID').val();
+	var contact = $('#contactIDs').val();
+	var subject = $('#subjectText').val();
+	var body = $('#bodyText').val();
+	var appliesTo = false;
+
+	//also perform same checks on the current record in case add button wasn't clicked
+	// if (title == '' || title == null){
+	// 	$('#span_error_titleText').html('A title must be entered to continue.');
+	// 	myReturn=1;		
+	// }
+
+	if (organization == '' || organization == null) {
+		$('#span_error_organizationId').html('Opening an issue requires a resource to be associated with an organization. Please contact your IT department.');
+		myReturn=1;
+	}
+
+	if (contact == null || contact.length == 0) {
+		$('#span_error_contactName').html('A contact must be selected to continue.');
+		myReturn=1;
+	}
+
+	if (subject == '' || subject == null) {
+		$('#span_error_subjectText').html('A subject must be entered to continue.');
+		myReturn=1;
+	}
+
+	if (body == '' || body == null) {
+		$('#span_error_bodyText').html('A body must be entered to continue.');
+		myReturn=1;
+	}
+
+	$('.resourcesArray').each(function() {
+		if($(this).is(':checked') || $(this).is(':selected')) {
+			appliesTo = true;
+		}
+	});
+
+	if(!appliesTo) {
+		myReturn=1;
+	}
+	
+ 	if (myReturn == 1){
+		return false; 	
+ 	}else{
+ 		return true;
+ 	}
 }
 
 function submitNewIssue() {
 	
-	$.ajax({
-		 type:       "POST",
-		 url:        "ajax_processing.php?action=insertIssue",
-		 cache:      false,
-		 data:       $("#newIssueForm").serialize(),
-		 success:    function(res) {
-			console.log(res);
-			updateIssues();
-			tb_remove()
-		 }
-
-
-	  });
-
-
+	if(validateNewIssue()) {
+		$.ajax({
+			type:       "POST",
+			url:        "ajax_processing.php?action=insertIssue",
+			cache:      false,
+			data:       $("#newIssueForm").serialize(),
+			success:    function(res) {
+				console.log(res);
+				updateIssues();
+				tb_remove()
+			}
+		});
+	}
 }
 
 function getIssues(element) {

From 15f8e0bd307da0a1bbcdbc28b96535a206d38195 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 08:16:32 -0500
Subject: [PATCH 114/159] Added default size to modal.

---
 ajax_htmldata/getIssues.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index c343ded..d03f312 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -15,7 +15,7 @@
 			<th>Issues/Problems</th>
 		</tr>
 		<tr>
-			<td><a id="createIssueBtn" class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true">report new issue</a></td>
+			<td><a id="createIssueBtn" class="thickbox" href="ajax_forms.php?action=getNewIssueForm&resourceID=<?php echo $resourceID; ?>&modal=true&height=425&width=500">report new issue</a></td>
 		</tr>
 		<tr>
 			<td>

From c67e83be43a8f29b10520a5de33010561ce94cfe Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 08:16:46 -0500
Subject: [PATCH 115/159] Added validation to new contact form.

---
 js/resource.js | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index 4b5135c..aca372f 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -104,12 +104,40 @@ $(document).ready(function(){
 
 	$("#createContact").live("click",function(e) {
 		e.preventDefault();
-		var roles = new Array();
-		$(".check_roles:checked").each(function() {
-			roles.push($(this).val());
-		});
-		//create the contact and update the contact list
-		createOrganizationContact({"organizationID":$("#organizationID").val(),"name":$("#contactName").val(),"emailAddress":$("#emailAddress").val(),"contactRoles":roles});
+		
+		var errors = [];
+
+		if($("#contactAddName").val() == "") {	
+			errors.push({
+				message: "New contact must have a name.",
+				target: '#span_error_contactAddName'
+			});
+		} 
+
+		if(!validateEmail($(emailAddress).val())) {	
+			errors.push({
+				message: "CC must be a valid email.",
+				target: '#span_error_contactEmailAddress'
+			});
+		} 
+
+		if(errors.length == 0) {
+			var roles = new Array();
+			$(".check_roles:checked").each(function() {
+				roles.push($(this).val());
+			});
+			//create the contact and update the contact list
+			createOrganizationContact({"organizationID":$("#organizationID").val(),"name":$("#contactAddName").val(),"emailAddress":$("#emailAddress").val(),"contactRoles":roles});
+		} else {
+
+			$(".addContactError").html("");
+
+			for(var index in errors) {
+				error = errors[index];
+				$(error.target).html(error.message);
+			}
+		}	 
+			
 	});
 
 	$("#addEmail").live("click", function(e) {

From 00c7cfafb21a6193acc971bcf6f30329ed28cf9f Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 13:28:25 -0500
Subject: [PATCH 116/159] removed merge marks

---
 js/resource.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index eb44cc4..afb906e 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -493,9 +493,6 @@ function submitNewDowntime() {
 
 
 	  });
-
-
->>>>>>> cf8fb6556b7099c9338c18b7d64c292b76a9631f
 }
 
 function getIssues(element) {

From caaee508ac2695746e44ebbc380bd00d64e3c207 Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 13:29:22 -0500
Subject: [PATCH 117/159] Fixed broken function syntax

---
 js/resource.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/resource.js b/js/resource.js
index afb906e..9ce664e 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -474,6 +474,7 @@ function submitNewIssue() {
 			}
 		});
 	}
+}
 
 function submitNewDowntime() {
 	

From 61b90b8547a9e12a8624189025c358d6175f428d Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 13:57:42 -0500
Subject: [PATCH 118/159] added in proper selector

---
 js/resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/resource.js b/js/resource.js
index 9ce664e..43d11ce 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -128,7 +128,7 @@ $(document).ready(function(){
 			});
 		} 
 
-		if(!validateEmail($(emailAddress).val())) {	
+		if(!validateEmail($("#emailAddress").val())) {	
 			errors.push({
 				message: "CC must be a valid email.",
 				target: '#span_error_contactEmailAddress'

From 0c2edae396956d4d06e4e968baf2905bd9f269ba Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 14:14:33 -0500
Subject: [PATCH 119/159] added validation to the downtime form

---
 ajax_forms/getNewDowntimeForm.php |  4 ++--
 js/resource.js                    | 32 ++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index 930dd8e..3f3d2f1 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -43,14 +43,14 @@
 			<td><label>Downtime Start:</label></td>
 			<td>
 				<input value="<?php echo $defaultStart; ?>" type="datetime-local" name="startDate" id="startDate" />
-				<span id='span_error_contactName' class='smallDarkRedText'>
+				<span id='span_error_startDate' class='smallDarkRedText addDowntimeError'>
 			</td>
 		</tr>
 		<tr>
 			<td><label>Downtime Resolution:</label></td>
 			<td>
 				<input value="<?php echo $defaultEnd; ?>"  type="datetime-local" name="endDate" id="endDate" />
-				<span id='span_error_contactName' class='smallDarkRedText'>
+				<span id='span_error_endDate' class='smallDarkRedText addDowntimeError'>
 			</td>
 		</tr>
 		<tr>
diff --git a/js/resource.js b/js/resource.js
index 43d11ce..a6d4c5e 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -85,7 +85,37 @@ $(document).ready(function(){
 
 	$("#submitNewDowntime").live("click", function(e) {
 		e.preventDefault();
-		submitNewDowntime();
+		
+		var errors = [];
+
+		console.log($("#startDate").val());
+
+		if($("#startDate").val()=="") {	
+			errors.push({
+				message: "Must set a date.",
+				target: '#span_error_startDate'
+			});
+		} 
+
+		if($("#endDate").val()=="") {	
+			errors.push({
+				message: "Must set a date.",
+				target: '#span_error_endDate'
+			});
+		} 
+
+		if(errors.length == 0) {
+			//submitNewDowntime();
+		} else {
+
+			$(".addDowntimeError").html("");
+
+			for(var index in errors) {
+				error = errors[index];
+				$(error.target).html(error.message);
+			}
+		}
+	
 	});
 
 	$(".issueResources").live("click", function() {

From 6dd86eecb1f101574cdabe3e1c3a07616582c3fe Mon Sep 17 00:00:00 2001
From: jeremythuff <jeremythuff@gmail.com>
Date: Tue, 18 Aug 2015 15:45:03 -0500
Subject: [PATCH 120/159] uncommented a function call

---
 js/resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/resource.js b/js/resource.js
index a6d4c5e..bf23a31 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -105,7 +105,7 @@ $(document).ready(function(){
 		} 
 
 		if(errors.length == 0) {
-			//submitNewDowntime();
+			submitNewDowntime();
 		} else {
 
 			$(".addDowntimeError").html("");

From 2da98bd8394ce9cfd8140ad26de0710637fc47b3 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 09:45:12 -0500
Subject: [PATCH 121/159] add auto increment property to tables in sql script

---
 install/protected/resource_downtime.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
index 5f0076a..66a9b78 100644
--- a/install/protected/resource_downtime.sql
+++ b/install/protected/resource_downtime.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
-  `downtimeID` int(11) NOT NULL,
+  `downtimeID` int(11) NOT NULL AUTO_INCREMENT,
   `entityID` int(11) NOT NULL,
   `issueID` int(11) DEFAULT NULL,
   `creatorID` varchar(80) NOT NULL,
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `Downtime` (
 
 DROP TABLE IF EXISTS `DowntimeType`;
 CREATE TABLE IF NOT EXISTS `DowntimeType` (
-  `downtimeTypeID` int(11) NOT NULL,
+  `downtimeTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(80) NOT NULL,
   PRIMARY KEY (`downtimeTypeID`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file

From 3f330e40b31815e21269fefd20f8b949cd453ef0 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 09:53:01 -0500
Subject: [PATCH 122/159] add note field to sql script and rearrange entity
 fields

---
 install/protected/resource_downtime.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
index 66a9b78..00857e4 100644
--- a/install/protected/resource_downtime.sql
+++ b/install/protected/resource_downtime.sql
@@ -1,14 +1,15 @@
 DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
   `downtimeID` int(11) NOT NULL AUTO_INCREMENT,
-  `entityID` int(11) NOT NULL,
   `issueID` int(11) DEFAULT NULL,
+  `entityID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL DEFAULT '2',
   `creatorID` varchar(80) NOT NULL,
   `dateCreated` datetime NOT NULL,
   `startDate` datetime NOT NULL,
   `endDate` datetime NOT NULL,
   `downtimeTypeID` int(11) NOT NULL,
-  `entityTypeID` int(11) NOT NULL DEFAULT '2',
+  `note` TEXT DEFAULT NULL,
    PRIMARY KEY (`downtimeID`),
    KEY `IssueID` (`IssueID`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;

From ef3b5b04d4ad42d3db7e9de0ab20c2de1f309280 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 10:08:12 -0500
Subject: [PATCH 123/159] add note field to new downtime form

---
 ajax_forms/getNewDowntimeForm.php  | 6 ++++++
 ajax_htmldata/getIssues.php        | 2 +-
 ajax_processing/insertDowntime.php | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index 3f3d2f1..8e46184 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -78,6 +78,12 @@
 				</select>
 			</td>
 		</tr>
+		<tr>
+			<td><label>Note:</label></td>
+			<td>
+				<textarea name="note"></textarea>
+			</td>
+		</tr>
 	</table>
 
 	<table class='noBorderTable' style='width:125px;'>
diff --git a/ajax_htmldata/getIssues.php b/ajax_htmldata/getIssues.php
index bc52975..e9a9fc7 100644
--- a/ajax_htmldata/getIssues.php
+++ b/ajax_htmldata/getIssues.php
@@ -40,7 +40,7 @@
 			<th>Downtime</th>
 		</tr>
 		<tr>
-			<td><a id="createDowntimeBtn" class="thickbox" href="ajax_forms.php?action=getNewDowntimeForm&resourceID=<?php echo $resourceID; ?>&height=160&width=390&modal=true">report new Downtime</a></td>
+			<td><a id="createDowntimeBtn" class="thickbox" href="ajax_forms.php?action=getNewDowntimeForm&resourceID=<?php echo $resourceID; ?>&height=200&width=390&modal=true">report new Downtime</a></td>
 		</tr>
 		<tr>
 			<td>
diff --git a/ajax_processing/insertDowntime.php b/ajax_processing/insertDowntime.php
index a094f44..10ea445 100644
--- a/ajax_processing/insertDowntime.php
+++ b/ajax_processing/insertDowntime.php
@@ -10,6 +10,7 @@
 
 $newDowntime->dateCreated = date( 'Y-m-d H:i:s');
 $newDowntime->entityTypeID = 2;
+$newDowntime->note = ($_POST['note']) ? $_POST['note']:null;
 
 $newDowntime->save();
 

From dd37f1a350598871ee9235b843a4359355eb3a58 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 10:10:20 -0500
Subject: [PATCH 124/159] show note field when present on downtime

---
 ajax_htmldata/getDowntimeList.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ajax_htmldata/getDowntimeList.php b/ajax_htmldata/getDowntimeList.php
index 62fb8a1..317b00b 100644
--- a/ajax_htmldata/getDowntimeList.php
+++ b/ajax_htmldata/getDowntimeList.php
@@ -29,6 +29,12 @@ function generateDowntimeHTML($downtime,$associatedEntities=null) {
 	  		<dd>{$downtime->subjectText}</dd>";
 	}
 
+	if ($downtime->note) {
+		$html .= "
+	  		<dt>Note:</dt> 
+	  		<dd>{$downtime->note}</dd>";
+	}
+
 	$html .= "		
 		</dl>
 	</div>";	

From 00f6872f9bb9d20998987fade56a1e2488b9d6cc Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 15:14:03 -0500
Subject: [PATCH 125/159] hide issue in downtime form when there are no issues

---
 ajax_forms/getNewDowntimeForm.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index 8e46184..54238e6 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -66,6 +66,9 @@
 			</td>
 		</tr>
 		<tr>
+<?php
+if ($issues) {
+?>
 			<td><label>Link to open issue:</label></td>
 			<td>
 				<select class="issueID" name="issueID">
@@ -78,6 +81,9 @@
 				</select>
 			</td>
 		</tr>
+<?php
+}
+?>
 		<tr>
 			<td><label>Note:</label></td>
 			<td>

From 0e2b6e7efe1260f5133cf1e55196becf0e725f8a Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 15:27:35 -0500
Subject: [PATCH 126/159] create downtime from issue list

---
 ajax_forms/getNewDowntimeForm.php | 3 ++-
 ajax_htmldata/getIssuesList.php   | 3 ++-
 css/style.css                     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index 54238e6..f7c9dbd 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -2,6 +2,7 @@
 $util = new utility();
 
 $resourceID = $_GET["resourceID"];
+$issueID = $_GET['issueID'];
 
 $resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
 $issues = $resource->getIssues();
@@ -75,7 +76,7 @@
 					<option value="">none</option>
 <?php
 			foreach ($issues as $issue) {
-				echo "<option value=".$issue->issueID.">".$issue->subjectText."</option>";
+				echo "<option".(($issueID) ? ' selected':'')." value=".$issue->issueID.">".$issue->subjectText."</option>";
 			}
 ?>
 				</select>
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index efb8595..1a7144b 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -12,7 +12,8 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	<div class=\"issue\">";
 	if (!$issue->dateClosed) {
 		$html .= "
-		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>";
+		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>
+		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getNewDowntimeForm&resourceID={$GLOBALS['resourceID']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
 	}
 	$html .= "
 	  	<dl>
diff --git a/css/style.css b/css/style.css
index ca84e8c..4f41e2b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -987,6 +987,7 @@ div.issueList .issue {
 
 div.issueList a.closeIssueBtn {
 	float: right;
+	margin-right: 6px;
 }
 
 div.issueList dl,

From 87b0c7b30312216c24454126c5659419f04fa942 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 16:36:51 -0500
Subject: [PATCH 127/159] new issue validation bug fixes

---
 ajax_forms/getNewIssueForm.php | 22 +++++++++++-----------
 js/resource.js                 | 34 +++++++++++++++-------------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 76fdede..a8570bc 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -27,7 +27,7 @@
 			<td><label>Organization:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<p><?php echo $organizationData['organization']; ?></p>
-				<span id='span_error_organizationId' class='smallDarkRedText'></span>
+				<span id='span_error_organizationId' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -42,7 +42,7 @@
 
 ?>
 				</select>
-				<span id='span_error_contactName' class='smallDarkRedText'></span>
+				<span id='span_error_contactName' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -57,7 +57,7 @@
 			<td><label>CC myself:</label></td>
 			<td>
 				<input type='checkbox' id='ccCreator' name='ccCreator' class='changeInput' />
-				<span id='span_error_ccCreator' class='smallDarkRedText'></span>
+				<span id='span_error_ccCreator' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -69,21 +69,21 @@
 					Current CCs: <span id="currentEmails"></span>
 				</p>
 				<input type="hidden" id='ccEmails' name='ccEmails' value='' class='changeInput' />
-				<span id='span_error_contactIDs' class='smallDarkRedText'></span>
+				<span id='span_error_contactIDs' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
 			<td><label>Subject:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<input type='text' id='subjectText' name='issue[subjectText]' value='' class='changeInput' />
-				<span id='span_error_subjectText' class='smallDarkRedText'></span>
+				<span id='span_error_subjectText' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
 			<td><label>Body:&nbsp;&nbsp;<span class='bigDarkRedText'>*</span></label></td>
 			<td>
 				<textarea id='bodyText' name='issue[bodyText]' value='' />
-				<span id='span_error_bodyText' class='smallDarkRedText'></span>
+				<span id='span_error_bodyText' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 		<tr>
@@ -91,24 +91,24 @@
 			<td>
 
 				<div>
-					<input type="checkbox" class="issueResources resourcesArray" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
+					<input type="checkbox" class="issueResources entityArray" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources resourceArray" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+					<input type="checkbox" class="issueResources entityArray" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
 				</div>
 				<div>
 					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources of <?php echo $resource->titleText ?></label>
 				</div>
-				<select multiple id="resourceIDs" class="resourcesArray" name="resourceIDs[]">
+				<select multiple id="resourceIDs" name="resourceIDs[]">
 <?php
 	if (!empty($organizationResourcesArray)) {
 		foreach ($organizationResourcesArray as $resource) {
-			echo "		<option value=\"{$resource['resourceID']}\">{$resource['titleText']}</option>";
+			echo "		<option class=\"entityArray\" value=\"{$resource['resourceID']}\">{$resource['titleText']}</option>";
 		}
 	}
 ?>
 				</select>
-				<span id='span_error_resourceIDs' class='smallDarkRedText'></span>
+				<span id='span_error_entities' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
 	</table>
diff --git a/js/resource.js b/js/resource.js
index bf23a31..12ec6af 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -438,8 +438,9 @@ function updateIssues(){
   });
 }
 
-function validateNewIssue (){
- 	myReturn=0;
+function validateNewIssue () {
+	$(".error").html("");
+ 	errorFlag = 0;
 
 	var organization = $('#sourceOrganizationID').val();
 	var contact = $('#contactIDs').val();
@@ -447,47 +448,42 @@ function validateNewIssue (){
 	var body = $('#bodyText').val();
 	var appliesTo = false;
 
-	//also perform same checks on the current record in case add button wasn't clicked
-	// if (title == '' || title == null){
-	// 	$('#span_error_titleText').html('A title must be entered to continue.');
-	// 	myReturn=1;		
-	// }
-
 	if (organization == '' || organization == null) {
 		$('#span_error_organizationId').html('Opening an issue requires a resource to be associated with an organization. Please contact your IT department.');
-		myReturn=1;
+		errorFlag=1;
 	}
 
 	if (contact == null || contact.length == 0) {
 		$('#span_error_contactName').html('A contact must be selected to continue.');
-		myReturn=1;
+		errorFlag=1;
 	}
 
 	if (subject == '' || subject == null) {
 		$('#span_error_subjectText').html('A subject must be entered to continue.');
-		myReturn=1;
+		errorFlag=1;
 	}
 
 	if (body == '' || body == null) {
 		$('#span_error_bodyText').html('A body must be entered to continue.');
-		myReturn=1;
+		errorFlag=1;
 	}
 
-	$('.resourcesArray').each(function() {
+	$('.entityArray').each(function() {
 		if($(this).is(':checked') || $(this).is(':selected')) {
 			appliesTo = true;
+			return false;
 		}
 	});
 
 	if(!appliesTo) {
-		myReturn=1;
+		errorFlag=1;
+		$('#span_error_entities').html('An issue must be associated with an organization or resource(s).');
 	}
 	
- 	if (myReturn == 1){
-		return false; 	
- 	}else{
- 		return true;
- 	}
+ 	if (errorFlag == 0){
+		return true; 	
+	}
+	return false;
 }
 
 function submitNewIssue() {

From e8b8b51547b563e0c0c37aea3f7b2162b5ba7424 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Thu, 20 Aug 2015 16:45:16 -0500
Subject: [PATCH 128/159] localize error flag scope

---
 js/resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/resource.js b/js/resource.js
index 12ec6af..362261b 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -440,8 +440,8 @@ function updateIssues(){
 
 function validateNewIssue () {
 	$(".error").html("");
- 	errorFlag = 0;
 
+ 	var errorFlag = 0;
 	var organization = $('#sourceOrganizationID').val();
 	var contact = $('#contactIDs').val();
 	var subject = $('#subjectText').val();

From 88048decb4aaee9dadf012d1a3871e7905f638c1 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 09:23:32 -0500
Subject: [PATCH 129/159] select the right issue when pre-defined

---
 ajax_forms/getNewDowntimeForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index f7c9dbd..7ee2873 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -76,7 +76,7 @@
 					<option value="">none</option>
 <?php
 			foreach ($issues as $issue) {
-				echo "<option".(($issueID) ? ' selected':'')." value=".$issue->issueID.">".$issue->subjectText."</option>";
+				echo "<option".(($issueID == $issue->issueID) ? ' selected':'')." value=".$issue->issueID.">".$issue->subjectText."</option>";
 			}
 ?>
 				</select>

From 69ce9f9c45a762c85b2d2894c60cb8720bc52736 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 09:33:43 -0500
Subject: [PATCH 130/159] refactor css

---
 ajax_htmldata/getIssuesList.php | 4 ++--
 css/style.css                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index 1a7144b..a0c1e94 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -12,8 +12,8 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	<div class=\"issue\">";
 	if (!$issue->dateClosed) {
 		$html .= "
-		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>
-		<a class=\"thickbox closeIssueBtn\" href=\"ajax_forms.php?action=getNewDowntimeForm&resourceID={$GLOBALS['resourceID']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
+		<a class=\"thickbox action closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>
+		<a class=\"thickbox action\" href=\"ajax_forms.php?action=getNewDowntimeForm&resourceID={$GLOBALS['resourceID']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
 	}
 	$html .= "
 	  	<dl>
diff --git a/css/style.css b/css/style.css
index 4f41e2b..f0edee0 100644
--- a/css/style.css
+++ b/css/style.css
@@ -985,7 +985,7 @@ div.issueList .issue {
 	width: 85%;
 }
 
-div.issueList a.closeIssueBtn {
+div.issue a.action {
 	float: right;
 	margin-right: 6px;
 }

From 2f78bb1dcd4aa1826fdf059eb96be8ea8b0b2aed Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 10:20:56 -0500
Subject: [PATCH 131/159] refactor db field name to accommodate admin system

---
 admin/classes/domain/Downtime.php       | 6 +++---
 ajax_forms/getNewDowntimeForm.php       | 2 +-
 ajax_htmldata/getDowntimeList.php       | 2 +-
 install/protected/resource_downtime.sql | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/classes/domain/Downtime.php b/admin/classes/domain/Downtime.php
index 47276dc..5309bea 100644
--- a/admin/classes/domain/Downtime.php
+++ b/admin/classes/domain/Downtime.php
@@ -12,7 +12,7 @@ public function load() {
 
 		//if exists in the database
 		if (isset($this->primaryKey)) {	
-			$query = "SELECT d.*, dt.name, i.subjectText
+			$query = "SELECT d.*, dt.shortName, i.subjectText
 				  FROM Downtime d
 				  LEFT JOIN DowntimeType dt ON dt.downtimeTypeID=d.downtimeTypeID
 				  LEFT JOIN Issue i ON i.issueID=d.issueID
@@ -39,8 +39,8 @@ public function load() {
 	public function save() {
 
 		//We have added the name attribute after the fact, and here, we are cleaning it up
-		unset($this->attributes["name"]); 
-		unset($this->attributesNames["name"]);
+		unset($this->attributes["shortName"]); 
+		unset($this->attributesNames["shortName"]);
 
 		unset($this->attributes["subjectText"]); 
 		unset($this->attributesNames["subjectText"]);
diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index 7ee2873..f7666d3 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -60,7 +60,7 @@
 				<select class="downtimeType" name="downtimeType">
 <?php
 			foreach ($downtimeTypeNames as $downtimeType) {
-				echo "<option value=".$downtimeType["downtimeTypeID"].">".$downtimeType["name"]."</option>";
+				echo "<option value=".$downtimeType["downtimeTypeID"].">".$downtimeType["shortName"]."</option>";
 			}
 ?>
 				</select>
diff --git a/ajax_htmldata/getDowntimeList.php b/ajax_htmldata/getDowntimeList.php
index 317b00b..e58aeb9 100644
--- a/ajax_htmldata/getDowntimeList.php
+++ b/ajax_htmldata/getDowntimeList.php
@@ -15,7 +15,7 @@ function generateDowntimeHTML($downtime,$associatedEntities=null) {
 	$html .= "
 	  	<dl>
 	  		<dt>Type:</dt> 
-	  		<dd>{$downtime->name}</dd>
+	  		<dd>{$downtime->shortName}</dd>
 
 	  		<dt>Downtime Start:</dt> 
 	  		<dd>{$downtime->startDate}</dd>
diff --git a/install/protected/resource_downtime.sql b/install/protected/resource_downtime.sql
index 00857e4..a8a2ccb 100644
--- a/install/protected/resource_downtime.sql
+++ b/install/protected/resource_downtime.sql
@@ -17,6 +17,6 @@ CREATE TABLE IF NOT EXISTS `Downtime` (
 DROP TABLE IF EXISTS `DowntimeType`;
 CREATE TABLE IF NOT EXISTS `DowntimeType` (
   `downtimeTypeID` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(80) NOT NULL,
+  `shortName` varchar(80) NOT NULL,
   PRIMARY KEY (`downtimeTypeID`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file

From 3313f2533da96bfff134064702e80e9bbb0f2e69 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 11:06:03 -0500
Subject: [PATCH 132/159] admins can manage downtime types

---
 admin.php                             |  1 +
 admin/classes/domain/DowntimeType.php | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 admin/classes/domain/DowntimeType.php

diff --git a/admin.php b/admin.php
index 04538f6..bb9dcb2 100644
--- a/admin.php
+++ b/admin.php
@@ -68,6 +68,7 @@
 					<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='CostDetails' class='AdminLink'>Cost Details</div></td></tr>
 				<?php } ?>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='CurrencyLink'>Currency</div></td></tr>
+				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' class='AdminLink' id="DowntimeType">Downtime Types</div></td></tr>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='LicenseStatus' class='AdminLink'>License Status</div></td></tr>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='NoteType' class='AdminLink'>Note Type</div></td></tr>
 				<tr><td><div class='adminMenuLink'><a href='javascript:void(0);' id='OrderType' class='AdminLink'>Order Type</div></td></tr>
diff --git a/admin/classes/domain/DowntimeType.php b/admin/classes/domain/DowntimeType.php
new file mode 100644
index 0000000..80370da
--- /dev/null
+++ b/admin/classes/domain/DowntimeType.php
@@ -0,0 +1,11 @@
+<?php
+
+class DowntimeType extends DatabaseObject {
+
+	protected function defineRelationships() {}
+
+	protected function overridePrimaryKeyName() {}
+
+}
+
+?>
\ No newline at end of file

From f57546f140494a5efe26a984916344151571972f Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 15:41:24 -0500
Subject: [PATCH 133/159] downtime and issues work without org module

---
 admin/classes/domain/Issue.php    |  8 ++++++--
 admin/classes/domain/Resource.php | 16 ----------------
 ajax_forms/getNewIssueForm.php    |  5 +++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/admin/classes/domain/Issue.php b/admin/classes/domain/Issue.php
index a0eefd7..31cfdfb 100644
--- a/admin/classes/domain/Issue.php
+++ b/admin/classes/domain/Issue.php
@@ -7,10 +7,14 @@ protected function defineRelationships() {}
 	protected function overridePrimaryKeyName() {}
 
 	public function getContacts() {
-		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		if ($this->db->config->settings->organizationsModule == 'Y' && $this->db->config->settings->organizationsDatabaseName) {
+			$contactsDB = $this->db->config->settings->organizationsDatabaseName;
+		} else {
+			$contactsDB = $this->db->config->database->name;
+		}
 		$query = "SELECT ic.contactID,c.name,c.emailAddress
 				FROM IssueContact ic
-				LEFT JOIN `{$orgDB}`.Contact c ON c.contactID=ic.contactID 
+				LEFT JOIN `{$contactsDB}`.Contact c ON c.contactID=ic.contactID 
 				WHERE ic.issueID=".$this->issueID;
 		$result = $this->db->processQuery($query, 'assoc');
 		$objects = array();
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 5596268..71d25da 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -1710,22 +1710,6 @@ public function getOrganizationArray(){
 		return $resourceOrgArray;
 	}
 
-	public function organizationContactsArray($organizationID) {
-
-		if($this->db->config->settings->organizationsModule == 'Y') {
-			$dbName = $this->db->config->settings->organizationsDatabaseName;
-
-			$orgContactsArray = array();
-
-			$query = "SELECT * FROM {$dbName}.Contact WHERE organizationID = '" . $organizationID . "' ORDER BY `name`";
-
-			return $this->db->processQuery($query, 'assoc');
-
-		} else {
-			return false;
-		} 	
-	}
-
 	public function getSiblingResourcesArray($organizationID) {
 
 			$query = "SELECT DISTINCT r.resourceID, r.titleText FROM ResourceOrganizationLink rol 
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index a8570bc..33bd1ad 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -8,8 +8,9 @@
 $organizationArray = $resource->getOrganizationArray();
 $organizationData = $organizationArray[0];
 
+$contactsArray = $resource->getUnarchivedContacts();
 if ($organizationData['organizationID']) {
-	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
+//	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
 	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
 ?>
 
@@ -36,7 +37,7 @@
 				<select multiple style="min-height: 60px;" type='text' id='contactIDs' name='contactIDs[]'>
 <?php 
 
-	foreach ($organizationContactsArray as $contact) {
+	foreach ($contactsArray as $contact) {
 		echo "		<option value=\"{$contact['contactID']}\">{$contact['name']}</option>";
 	}
 

From e5f4467ee1f97f2ef5fb88cf9792862c3a7c0104 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 16:10:49 -0500
Subject: [PATCH 134/159] add org downtimes from resource module

---
 ajax_forms/getNewDowntimeForm.php  | 45 ++++++++++++++++++++----------
 ajax_forms/getNewIssueForm.php     |  1 -
 ajax_htmldata/getIssuesList.php    |  8 ++++--
 ajax_processing/insertDowntime.php | 11 ++++++--
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/ajax_forms/getNewDowntimeForm.php b/ajax_forms/getNewDowntimeForm.php
index f7666d3..246eb2d 100644
--- a/ajax_forms/getNewDowntimeForm.php
+++ b/ajax_forms/getNewDowntimeForm.php
@@ -1,39 +1,56 @@
 <?php
 $util = new utility();
 
+$organizationID = $_GET["organizationID"];
+
 $resourceID = $_GET["resourceID"];
 $issueID = $_GET['issueID'];
 
 $resource = new Resource(new NamedArguments(array('primaryKey' => $resourceID)));
-$issues = $resource->getIssues();
 
-$organizationArray = $resource->getOrganizationArray();
-$organizationData = $organizationArray[0];
+$isOrgDowntime = false;
+if ($organizationID) {
+	$organization = new Organization(new NamedArguments(array('primaryKey' => $organizationID)));
+	$issues = $organization->getIssues();
+	$isOrgDowntime = true;
+} else {
+	$issues = $resource->getIssues();
+
+	$organizationArray = $resource->getOrganizationArray();
+	$organizationData = $organizationArray[0];
 
-if ($organizationData['organizationID']) {
+	if ($organizationData['organizationID']) {
+		$organizationID = $organizationData['organizationID'];
 
-	$organization = new Organization(new NamedArguments(array('primaryKey' => $organizationData['organizationID'])));
+		$organization = new Organization(new NamedArguments(array('primaryKey' => $organizationID)));
 
-	$orgIssues = $organization->getIssues();
+		$orgIssues = $organization->getIssues();
 
-	foreach ($orgIssues as $issue) {
-		array_push($issues, $issue);
+		foreach ($orgIssues as $issue) {
+			array_push($issues, $issue);
+		}
+		$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationID);
 	}
+}
 
+//our $organizationID could have come from the $_GET or through the resource
+if ($organizationID) {
 	$downtimeObj = new Downtime();
 	$downtimeTypeNames = $downtimeObj->getDowntimeTypesArray();
 
-	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
-	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
-
 	$defaultStart = date("Y-m-d\TH:i");
 	$defaultEnd = date("Y-m-d\TH:i", strtotime("+1 day"));
 
 ?>
 
 <form id='newDowntimeForm'>
-	<input type="hidden" name="sourceOrganizationID" value="<?php echo $organizationData['organizationID'];?>" />
-	<input type="hidden" name="sourceResourceID" value="<?php echo $resourceID;?>" />
+<?php
+if ($isOrgDowntime) {
+	echo '<input type="hidden" name="sourceOrganizationID" value="'.$organizationID.'" />';
+} else {
+	echo '<input type="hidden" name="sourceResourceID" value="'.$resourceID.'" />';
+}
+?>
 	<table class="thickboxTable" style="width:98%;background-image:url('images/title.gif');background-repeat:no-repeat;">
 		<tr>
 			<td colspan="2">
@@ -106,7 +123,7 @@
 } else {
 	echo '
 		<p>
-			Opening an issue requires a resource to be associated with an organization.
+			Creating downtime requires an organization or a resource to be associated with an organization.
 		</p>
 		<input type="button" value="cancel" onclick="tb_remove();">';
 }
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 33bd1ad..989c5fc 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -10,7 +10,6 @@
 
 $contactsArray = $resource->getUnarchivedContacts();
 if ($organizationData['organizationID']) {
-//	$organizationContactsArray = $resource->organizationContactsArray($organizationData['organizationID']);
 	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
 ?>
 
diff --git a/ajax_htmldata/getIssuesList.php b/ajax_htmldata/getIssuesList.php
index a0c1e94..4e566e8 100644
--- a/ajax_htmldata/getIssuesList.php
+++ b/ajax_htmldata/getIssuesList.php
@@ -12,8 +12,12 @@ function generateIssueHTML($issue,$associatedEntities=null) {
 	<div class=\"issue\">";
 	if (!$issue->dateClosed) {
 		$html .= "
-		<a class=\"thickbox action closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>
-		<a class=\"thickbox action\" href=\"ajax_forms.php?action=getNewDowntimeForm&resourceID={$GLOBALS['resourceID']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
+		<a class=\"thickbox action closeIssueBtn\" href=\"ajax_forms.php?action=getCloseIssueForm&issueID={$issue->issueID}&height=120&width=345&modal=true\">close</a>";
+		if ($associatedEntities && $associatedEntities[0]['entityType']==1) {
+			$html .= "<a class=\"thickbox action\" href=\"ajax_forms.php?action=getNewDowntimeForm&organizationID={$associatedEntities[0]['id']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
+		} else {
+			$html .= "<a class=\"thickbox action\" href=\"ajax_forms.php?action=getNewDowntimeForm&resourceID={$GLOBALS['resourceID']}&issueID={$issue->issueID}&height=200&width=390&modal=true\">downtime</a>";
+		}
 	}
 	$html .= "
 	  	<dl>
diff --git a/ajax_processing/insertDowntime.php b/ajax_processing/insertDowntime.php
index 10ea445..7b1299c 100644
--- a/ajax_processing/insertDowntime.php
+++ b/ajax_processing/insertDowntime.php
@@ -1,7 +1,15 @@
 <?php
 
 $newDowntime = new Downtime();
-$newDowntime->entityID = $_POST['sourceResourceID'];
+
+if ($_POST['sourceOrganizationID']) {
+	$newDowntime->entityID = $_POST['sourceOrganizationID'];
+	$newDowntime->entityTypeID = 1;
+} else {
+	$newDowntime->entityID = $_POST['sourceResourceID'];
+	$newDowntime->entityTypeID = 2;
+}
+
 $newDowntime->creatorID = $user->loginID;
 $newDowntime->downtimeTypeID = $_POST['downtimeType'];
 $newDowntime->issueID = $_POST['issueID'];
@@ -9,7 +17,6 @@
 $newDowntime->endDate = date('Y-m-d H:i:s', strtotime($_POST['endDate']));
 
 $newDowntime->dateCreated = date( 'Y-m-d H:i:s');
-$newDowntime->entityTypeID = 2;
 $newDowntime->note = ($_POST['note']) ? $_POST['note']:null;
 
 $newDowntime->save();

From 39514b40d477903a6eb5b14cac80950019f5de93 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 21 Aug 2015 16:37:38 -0500
Subject: [PATCH 135/159] export issues when org module is turned off

---
 admin/classes/domain/Organization.php | 11 +++++++++--
 admin/classes/domain/Resource.php     |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/admin/classes/domain/Organization.php b/admin/classes/domain/Organization.php
index 22d255c..18d78ee 100644
--- a/admin/classes/domain/Organization.php
+++ b/admin/classes/domain/Organization.php
@@ -106,12 +106,19 @@ public function getDowntime($archivedOnly=false) {
 	}
 
 	public function getExportableIssues($archivedOnly=false) {
-		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		if ($this->db->config->settings->organizationsModule == 'Y' && $this->db->config->settings->organizationsDatabaseName) {
+			$orgDB = $this->db->config->settings->organizationsDatabaseName;
+			$orgField = 'name';
+		} else {
+			$orgDB = $this->db->config->database->name;
+			$orgField = 'shortName';
+		}
+
 		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
 								FROM IssueContact sic 
 								LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID
 								WHERE sic.issueID=i.issueID) AS `contacts`,
-							 (SELECT GROUP_CONCAT(se.name SEPARATOR ', ')
+							 (SELECT GROUP_CONCAT(se.{$orgField} SEPARATOR ', ')
 								FROM IssueRelationship sir 
 								LEFT JOIN `{$orgDB}`.Organization se ON (se.organizationID=sir.entityID AND sir.entityTypeID=1)
 								WHERE sir.issueID=i.issueID) AS `appliesto`,
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 71d25da..56d8bbe 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -829,10 +829,15 @@ public function getDowntime($archivedOnly=false){
 	}
 
 	public function getExportableIssues($archivedOnly=false){
-		$orgDB = $this->db->config->settings->organizationsDatabaseName;
+		if ($this->db->config->settings->organizationsModule == 'Y' && $this->db->config->settings->organizationsDatabaseName) {
+			$contactsDB = $this->db->config->settings->organizationsDatabaseName;
+		} else {
+			$contactsDB = $this->db->config->database->name;
+		}
+
 		$query = "SELECT i.*,(SELECT GROUP_CONCAT(CONCAT(sc.name,' - ',sc.emailAddress) SEPARATOR ', ')
 								FROM IssueContact sic 
-								LEFT JOIN `{$orgDB}`.Contact sc ON sc.contactID=sic.contactID
+								LEFT JOIN `{$contactsDB}`.Contact sc ON sc.contactID=sic.contactID
 								WHERE sic.issueID=i.issueID) AS `contacts`,
 							 (SELECT GROUP_CONCAT(se.titleText SEPARATOR ', ')
 								FROM IssueRelationship sir 

From ab9a9aca8affbc615b1eb4a2c0cd622812765109 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Mon, 24 Aug 2015 09:16:31 -0500
Subject: [PATCH 136/159] only show inline contact create form if org module is
 active

---
 ajax_forms/getNewIssueForm.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 989c5fc..cc691f1 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -45,6 +45,9 @@
 				<span id='span_error_contactName' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
+<?php
+if ($config->settings->organizationsModule == 'Y') {
+?>
 		<tr>
 			<td></td>
 			<td>
@@ -53,6 +56,9 @@
 				<div id="inlineContact"></div>
 			</td>
 		</tr>
+<?php
+}
+?>
 		<tr>
 			<td><label>CC myself:</label></td>
 			<td>

From 322506440168d92536dc0ab64c973e9a14759522 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Mon, 24 Aug 2015 13:57:33 -0500
Subject: [PATCH 137/159] source module contacts should be either/or, not
 merged

---
 admin/classes/domain/Resource.php | 56 +++++++++++++++----------------
 ajax_forms/getNewIssueForm.php    |  4 ++-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 56d8bbe..932a269 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -397,49 +397,49 @@ public function getAliases(){
 
 
 	//returns array of contact objects
-	public function getUnarchivedContacts(){
-
-
+	public function getUnarchivedContacts($moduleFilter=false){
 		$config = new Configuration;
+		$resultArray = array();
 		$contactsArray = array();
 
-		//get resource specific contacts first
-		$query = "SELECT C.*, GROUP_CONCAT(CR.shortName SEPARATOR '<br /> ') contactRoles
-			FROM Contact C, ContactRole CR, ContactRoleProfile CRP
-			WHERE (archiveDate = '0000-00-00' OR archiveDate is null)
-			AND C.contactID = CRP.contactID
-			AND CRP.contactRoleID = CR.contactRoleID
-			AND resourceID = '" . $this->resourceID . "'
-			GROUP BY C.contactID
-			ORDER BY C.name";
-
-		$result = $this->db->processQuery($query, 'assoc');
-
+		if (!$moduleFilter || $moduleFilter == 'resources') {
+			//get resource specific contacts first
+			$query = "SELECT C.*, GROUP_CONCAT(CR.shortName SEPARATOR '<br /> ') contactRoles
+				FROM Contact C, ContactRole CR, ContactRoleProfile CRP
+				WHERE (archiveDate = '0000-00-00' OR archiveDate is null)
+				AND C.contactID = CRP.contactID
+				AND CRP.contactRoleID = CR.contactRoleID
+				AND resourceID = '" . $this->resourceID . "'
+				GROUP BY C.contactID
+				ORDER BY C.name";
 
-		//need to do this since it could be that there's only one request and this is how the dbservice returns result
-		if (isset($result['contactID'])){
+			$result = $this->db->processQuery($query, 'assoc');
 
-			foreach (array_keys($result) as $attributeName) {
-				$resultArray[$attributeName] = $result[$attributeName];
-			}
 
-			array_push($contactsArray, $resultArray);
+			//need to do this since it could be that there's only one request and this is how the dbservice returns result
+			if (isset($result['contactID'])){
 
-		}else{
-			foreach ($result as $row) {
-				$resultArray = array();
-				foreach (array_keys($row) as $attributeName) {
-					$resultArray[$attributeName] = $row[$attributeName];
+				foreach (array_keys($result) as $attributeName) {
+					$resultArray[$attributeName] = $result[$attributeName];
 				}
 
 				array_push($contactsArray, $resultArray);
+
+			}else{
+				foreach ($result as $row) {
+					$resultArray = array();
+					foreach (array_keys($row) as $attributeName) {
+						$resultArray[$attributeName] = $row[$attributeName];
+					}
+
+					array_push($contactsArray, $resultArray);
+				}
 			}
 		}
 
 
-
 		//if the org module is installed also get the org contacts from org database
-		if ($config->settings->organizationsModule == 'Y'){
+		if ($config->settings->organizationsModule == 'Y' && (!$moduleFilter || $moduleFilter == 'organizations')) {
 			$dbName = $config->settings->organizationsDatabaseName;
 
 			$query = "SELECT distinct OC.*, O.name organizationName, GROUP_CONCAT(DISTINCT CR.shortName SEPARATOR '<br /> ') contactRoles
diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index cc691f1..5655a24 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -8,7 +8,9 @@
 $organizationArray = $resource->getOrganizationArray();
 $organizationData = $organizationArray[0];
 
-$contactsArray = $resource->getUnarchivedContacts();
+//the issues feature currently support org or resource contacts, but not both
+$moduleFilter = ($config->settings->organizationsModule == 'Y') ? 'organizations':'resources';
+$contactsArray = $resource->getUnarchivedContacts($moduleFilter);
 if ($organizationData['organizationID']) {
 	$organizationResourcesArray = $resource->getSiblingResourcesArray($organizationData['organizationID']);
 ?>

From 694360e73f21e14768436e59fcfb5352b3f64cbb Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 10:21:47 -0500
Subject: [PATCH 138/159] package issues/downtime feature as 1.4 upgrade

---
 install/protected/update_1.4.sql | 74 ++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 install/protected/update_1.4.sql

diff --git a/install/protected/update_1.4.sql b/install/protected/update_1.4.sql
new file mode 100644
index 0000000..9c27727
--- /dev/null
+++ b/install/protected/update_1.4.sql
@@ -0,0 +1,74 @@
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
+CREATE TABLE `_DATABASE_NAME_`.`Issue` (
+  `issueID` int(11) NOT NULL AUTO_INCREMENT,
+  `creatorID` varchar(20) NOT NULL,
+  `subjectText` varchar(80) NOT NULL,
+  `bodyText` text NOT NULL,
+  `reminderInterval` int(11) DEFAULT NULL,
+  `dateCreated` datetime NOT NULL,
+  `dateClosed` datetime DEFAULT NULL,
+  `resolutionText` text,
+  PRIMARY KEY (`issueID`),
+  KEY `creatorID` (`creatorID`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueRelationship`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
+  `issueRelationshipID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `entityID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL,
+  PRIMARY KEY (`issueRelationshipID`),
+  KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
+  `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `entityName` varchar(80) NOT NULL,
+  PRIMARY KEY (`entityTypeID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
+  `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `contactID` int(11) NOT NULL,
+  PRIMARY KEY (`issueContactID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+
+
+DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEmail`;
+CREATE TABLE `_DATABASE_NAME_`.`IssueEmail` (
+  `issueEmailID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) NOT NULL,
+  `email` varchar(120) NOT NULL,
+  PRIMARY KEY (`IssueEmailID`),
+  KEY `IssueID` (`IssueID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+DROP TABLE IF EXISTS `Downtime`;
+CREATE TABLE IF NOT EXISTS `Downtime` (
+  `downtimeID` int(11) NOT NULL AUTO_INCREMENT,
+  `issueID` int(11) DEFAULT NULL,
+  `entityID` int(11) NOT NULL,
+  `entityTypeID` int(11) NOT NULL DEFAULT '2',
+  `creatorID` varchar(80) NOT NULL,
+  `dateCreated` datetime NOT NULL,
+  `startDate` datetime NOT NULL,
+  `endDate` datetime NOT NULL,
+  `downtimeTypeID` int(11) NOT NULL,
+  `note` TEXT DEFAULT NULL,
+   PRIMARY KEY (`downtimeID`),
+   KEY `IssueID` (`IssueID`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `DowntimeType`;
+CREATE TABLE IF NOT EXISTS `DowntimeType` (
+  `downtimeTypeID` int(11) NOT NULL AUTO_INCREMENT,
+  `shortName` varchar(80) NOT NULL,
+  PRIMARY KEY (`downtimeTypeID`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file

From ec87e70d2090c8c32bcf7fc28c3f6191c3c827c6 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 13:22:08 -0500
Subject: [PATCH 139/159] actually commit the installer change

---
 install/CORALInstaller.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/install/CORALInstaller.php b/install/CORALInstaller.php
index b391a13..ce2d2b5 100644
--- a/install/CORALInstaller.php
+++ b/install/CORALInstaller.php
@@ -59,6 +59,16 @@ class CORALInstaller {
 		<li>Add year, subscriptionStartDate, subscriptionEndDate, costDetailsID, costNote, and invoiceNum columns to the ResourcePayment table</li>
     	</ul>
       <p>After upgrading, you must change the <b>enhancedCostHistory</b> setting in the configuration file in order to turn on the new cost history features."
+    ),
+    "1.4" => array(
+      "privileges" => array("ALTER","CREATE"),
+      "installedTablesCheck" => array("Issue"),
+      "description" => "<p>The 1.4 update to the CORAL Resources module includes the new Issue and Downtime tracking features.</p>
+      <p>This upgrade will connect to MySQL and run the CORAL Resources structure changes. Database structure changes include:</p>
+      <ul>
+        <li>Create the Issue and associated tables</li>
+        <li>Create the Downtime and associated tables</li>
+      </ul>"
     )	
   );
   

From 7f25ed018463ce6ac7e1187fa40809160f9c503c Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 13:31:30 -0500
Subject: [PATCH 140/159] adjust new issue form

---
 ajax_forms/getNewIssueForm.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ajax_forms/getNewIssueForm.php b/ajax_forms/getNewIssueForm.php
index 5655a24..7402b37 100644
--- a/ajax_forms/getNewIssueForm.php
+++ b/ajax_forms/getNewIssueForm.php
@@ -64,7 +64,7 @@
 		<tr>
 			<td><label>CC myself:</label></td>
 			<td>
-				<input type='checkbox' id='ccCreator' name='ccCreator' class='changeInput' />
+				<input type='checkbox' id='ccCreator' name='ccCreator' class='changeInput' checked />
 				<span id='span_error_ccCreator' class='error smallDarkRedText'></span>
 			</td>
 		</tr>
@@ -102,10 +102,10 @@
 					<input type="checkbox" class="issueResources entityArray" name="resourceIDs[]" value="<?php echo $resourceID;?>" checked /> <label for="thisResources">Applies only to <?php echo $resource->titleText ?></label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources entityArray" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all resources of <?php echo $organizationData['organization']; ?></label>
+					<input type="checkbox" class="issueResources entityArray" name="organizationID" id="organizationID" value="<?php echo $organizationData['organizationID'];?>" /> <label for="allResources">Applies to all <?php echo $organizationData['organization']; ?> resources.</label>
 				</div>
 				<div>
-					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to other Resources of <?php echo $resource->titleText ?></label>
+					<input type="checkbox" class="issueResources" id="otherResources" /><label for="otherResources"> Applies to selected <?php echo $organizationData['organization'] ?> resources.</label>
 				</div>
 				<select multiple id="resourceIDs" name="resourceIDs[]">
 <?php
@@ -123,7 +123,7 @@
 
 	<p> Send me a reminder every 
 		<select name="issue[reminderInterval]">
-			<?php for ($i = 1; $i <= 31; $i++) echo "<option>{$i}</option>"; ?>
+			<?php for ($i = 1; $i <= 31; $i++) echo "<option".(($i==7) ? ' selected':'').">{$i}</option>"; ?>
 		</select> day(s) 
 	</p>
 

From 21a47f5b1f64a1c3fcadd3749b01bcdaed012371 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 13:48:10 -0500
Subject: [PATCH 141/159] adjust reminder email content

---
 sendAlerts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sendAlerts.php b/sendAlerts.php
index 2eaf0e8..054196d 100644
--- a/sendAlerts.php
+++ b/sendAlerts.php
@@ -82,14 +82,14 @@
 	if (count($alertableIssuesArray) > 0){
 		foreach($alertableIssuesArray as $alertableIssue) {
 			//start building the email body
-			$emailMessage = "Subject: {$alertableIssue['subjectText']}\r\n\r\n
+			$emailMessage = "This is a reminder that this issue needs to be revisited.\r\n\r\n
 			Body: {$alertableIssue['bodyText']}\r\n\r\n
 			Applies To: {$alertableIssue['appliesto']}\r\n
 			\r\n\r\nContacts: \r\n\r\n
 			{$alertableIssue['contacts']}\r\n";
 
 			foreach(explode(",", $alertableIssue['CCs']) as $emailAddr) {
-				mail($emailAddr, "New Issue: {$alertableIssue['subjectText']}",$emailMessage);
+				mail($emailAddr, "Reminder: {$alertableIssue['subjectText']}",$emailMessage);
 			}
 
 		}

From 971fd77082c10324da41a9285fa7e31fcf8e89c7 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 13:55:41 -0500
Subject: [PATCH 142/159] adjust new issue emailer

---
 ajax_processing/insertIssue.php | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 9f358b0..9ffad3b 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -36,9 +36,7 @@
 $newIssue->save();
 
 //start building the email body
-$emailMessage = "Subject: {$newIssue->subjectText}\r\n\r\n
-			Body: {$newIssue->bodyText}\r\n\r\n
-			Applies To: ";
+$emailMessage = "{$newIssue->bodyText}\r\n\r\n";
 
 if ($organizationID) {
 	$newIssueRelationship = new IssueRelationship();
@@ -52,7 +50,6 @@
 	$issuedOrgs = array();
 	foreach ($organizationArray as $orgData) {
 		if (!in_array($orgData['organizationID'],$issuedOrgs)) {
-			$emailMessage .= "{$orgData['organization']}\r\n";
 			$issuedOrgs[] = $orgData['organizationID'];
 		}
 	}
@@ -64,9 +61,6 @@
 		$newIssueRelationship->entityTypeID = 2;
 		$newIssueRelationship->save();
 		unset($newIssueRelationship);
-
-		$tempResource = new Resource(new NamedArguments(array('primaryKey' => $resourceID))); 
-		$emailMessage .= "{$tempResource->titleText}\r\n";
 	}
 }
 
@@ -88,17 +82,13 @@
 		$newIssueContact->save();
 		unset($newIssueContact);
 	}
+
 	$organizationContactsArray = $sourceResource->organizationContactsArray($sourceOrganizationID);
-	$emailMessage .= "\r\n\r\nContacts: \r\n\r\n";
-	foreach ($organizationContactsArray as $contactData) {
-		if (in_array($contactData['contactID'],$contactIDs)) {
-			$emailMessage .= "{$contactData['name']} ({$contactData['emailAddress']})\r\n";
-		}
-	}
+
 	//send emails to contacts
 	foreach ($organizationContactsArray as $contactData) {
 		if (in_array($contactData['contactID'],$contactIDs)) {
-			mail($email, "New Issue: {$newIssue->subjectText}",$emailMessage);
+			mail($email, "{$newIssue->subjectText}",$emailMessage);
 		}
 	}
 }
@@ -106,7 +96,8 @@
 if (count($issueEmails) > 0) {
 	//send emails to CCs
 	foreach ($issueEmails as $email) {
-		mail($email, "New Issue: {$newIssue->subjectText}",$emailMessage);
+		mail($email, "{$newIssue->subjectText}",$emailMessage);
 	}
 }
+echo $emailMessage;
 ?>
\ No newline at end of file

From 7ef535055abcb9806fb515a77ab2409f260e8f07 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 13:56:07 -0500
Subject: [PATCH 143/159] remove debug line

---
 ajax_processing/insertIssue.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 9ffad3b..54325a7 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -99,5 +99,4 @@
 		mail($email, "{$newIssue->subjectText}",$emailMessage);
 	}
 }
-echo $emailMessage;
 ?>
\ No newline at end of file

From 9760f14b33a8bfd3a77ace74141e4a3120b0d49b Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Fri, 2 Oct 2015 14:10:07 -0500
Subject: [PATCH 144/159] have initial issue email come from issue creator

---
 ajax_processing/insertIssue.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ajax_processing/insertIssue.php b/ajax_processing/insertIssue.php
index 54325a7..d177914 100644
--- a/ajax_processing/insertIssue.php
+++ b/ajax_processing/insertIssue.php
@@ -88,7 +88,7 @@
 	//send emails to contacts
 	foreach ($organizationContactsArray as $contactData) {
 		if (in_array($contactData['contactID'],$contactIDs)) {
-			mail($email, "{$newIssue->subjectText}",$emailMessage);
+			mail($email, "{$newIssue->subjectText}",$emailMessage,"From: {$user->emailAddress}\r\nReply-To: {$user->emailAddress}");
 		}
 	}
 }
@@ -96,7 +96,7 @@
 if (count($issueEmails) > 0) {
 	//send emails to CCs
 	foreach ($issueEmails as $email) {
-		mail($email, "{$newIssue->subjectText}",$emailMessage);
+		mail($email, "{$newIssue->subjectText}",$emailMessage,"From: {$user->emailAddress}\r\nReply-To: {$user->emailAddress}");
 	}
 }
 ?>
\ No newline at end of file

From e53397dfc71de62d6013b6a5874e1e8de4d07da1 Mon Sep 17 00:00:00 2001
From: jcraitz <jcraitz@ncsu.edu>
Date: Mon, 13 Jul 2015 08:49:22 -0400
Subject: [PATCH 145/159] added editing of user group for resource steps in
 routing and user deleting of resource steps. also rebased to current CORAL
 version

---
 admin/classes/domain/ResourceStep.php  |  77 +++++++++----
 admin/emails/DeletedPriorStep.txt      |   5 +
 admin/emails/ReassignedStep.txt        |   5 +
 ajax_forms/getResourceStepForm.php     |  75 ++++++++++++
 ajax_htmldata/getOutstandingQueue.php  |   4 +-
 ajax_htmldata/getRoutingDetails.php    |  11 ++
 ajax_processing/deleteResourceStep.php |  14 +++
 ajax_processing/updateResourceStep.php |  34 ++++++
 js/forms/resourceStepForm.js           | 151 +++++++++++++++++++++++++
 js/resource.js                         |  19 +++-
 user.php                               |   2 +-
 11 files changed, 370 insertions(+), 27 deletions(-)
 create mode 100644 admin/emails/DeletedPriorStep.txt
 create mode 100644 admin/emails/ReassignedStep.txt
 create mode 100644 ajax_forms/getResourceStepForm.php
 create mode 100644 ajax_processing/deleteResourceStep.php
 create mode 100644 ajax_processing/updateResourceStep.php
 create mode 100644 js/forms/resourceStepForm.js

diff --git a/admin/classes/domain/ResourceStep.php b/admin/classes/domain/ResourceStep.php
index 5022f2c..0fde07c 100644
--- a/admin/classes/domain/ResourceStep.php
+++ b/admin/classes/domain/ResourceStep.php
@@ -35,32 +35,32 @@ public function completeStep(){
 		$this->endLoginID = $_SESSION['loginID'];
 		$this->save;
 
-		//if there are next steps, start them
-		$nextStepArray = $this->getNextSteps();
+        $this->startNextStepsOrComplete();
 
-		if (count($nextStepArray) > 0){
-			foreach ($nextStepArray as $nextResourceStep){
+	}
 
-				$nextResourceStep->startStep();
+    public function startNextStepsOrComplete(){
+        //if there are next steps, start them
+        $nextStepArray = $this->getNextSteps();
 
-			}
+        if (count($nextStepArray) > 0){
+            foreach ($nextStepArray as $nextResourceStep){
 
+                $nextResourceStep->startStep();
 
-		}else{
+            }
+        }
 
-			//check if it just means that this branch is complete and there are still other steps open
-			if ($this->getNumberOfOpenSteps() == 0){
+        //check if this branch is complete or if there are still other steps open
+        if ($this->getNumberOfOpenSteps() == 0){
 
-				//otherwise if there are no more steps then we can mark the resource complete
-				$resource = new Resource(new NamedArguments(array('primaryKey' => $this->resourceID)));
-				$resource->completeWorkflow();
+            //if there are no more steps then we can mark the resource complete
+            $resource = new Resource(new NamedArguments(array('primaryKey' => $this->resourceID)));
+            $resource->completeWorkflow();
 
-			}
-		}
-
-
-	}
+        }
 
+    }
 
 	public function startStep(){
 
@@ -71,9 +71,16 @@ public function startStep(){
 		//send notifications
 		$this->sendApprovalNotification();
 
-
 	}
 
+    public function restartReassignedStep(){
+        //restart step
+        $this->stepStartDate = date( 'Y-m-d' );
+        $this->save;
+
+        //send notification to new step user group
+        $this->sendReassignedStepNotification();
+    }
 
 	//returns array of resource step objects
 	public function getNextSteps(){
@@ -101,9 +108,6 @@ public function getNextSteps(){
 		return $objects;
 	}
 
-
-
-
 	//returns prior resource step object (resource step can only have one prior step)
 	public function getPriorStep(){
 
@@ -158,7 +162,13 @@ public function sendApprovalNotification(){
 			if (($this->priorStepID) && ($this->priorStepID != '0')){
 				$priorResourceStep = $this->getPriorStep();
 				$priorStepName = $priorResourceStep->stepName;
-				$messageType='ResourceQueue';
+                if ($priorResourceStep){
+                    $priorStepName = $priorResourceStep->stepName;
+                    $messageType='ResourceQueue';
+                }else{
+                    $messageType='DeletedPriorStep';
+                }
+
 			}else{
 				$messageType='NewResource';
 				$priorStepName = '';
@@ -178,6 +188,29 @@ public function sendApprovalNotification(){
 
 	}
 
+    //sends email to the reassigned user group
+    public function sendReassignedStepNotification(){
+
+        $util = new Utility();
+
+        $userGroup = new UserGroup(new NamedArguments(array('primaryKey' => $this->userGroupID)));
+        $resource = new Resource(new NamedArguments(array('primaryKey' => $this->resourceID)));
+
+        //only send if there is an email address set up for this group
+        if ($userGroup->emailAddress){
+
+            //formulate emil to be sent
+            $email = new Email();
+            $email->message = $util->createMessageFromTemplate('ReassignedStep', $this->resourceID, $resource->titleText, $this->stepName, '','');
+            $email->to 			= $userGroup->emailAddress;
+            $email->subject		= "CORAL Alert: " . $resource->titleText;
+
+            $email->send();
+        }
+
+
+    }
+
 }
 
 ?>
\ No newline at end of file
diff --git a/admin/emails/DeletedPriorStep.txt b/admin/emails/DeletedPriorStep.txt
new file mode 100644
index 0000000..fc0a27c
--- /dev/null
+++ b/admin/emails/DeletedPriorStep.txt
@@ -0,0 +1,5 @@
+For resource: <ResourceTitle>
+
+The prior step has been deleted and now the resource is in your queue.
+
+Visit the record at <ResourceRecordURL><ResourceID>
\ No newline at end of file
diff --git a/admin/emails/ReassignedStep.txt b/admin/emails/ReassignedStep.txt
new file mode 100644
index 0000000..beea9e4
--- /dev/null
+++ b/admin/emails/ReassignedStep.txt
@@ -0,0 +1,5 @@
+For resource: <ResourceTitle>
+
+The step '<StepName>' has been reassigned to you. It is now in your queue.
+
+Visit the record at <ResourceRecordURL><ResourceID>
\ No newline at end of file
diff --git a/ajax_forms/getResourceStepForm.php b/ajax_forms/getResourceStepForm.php
new file mode 100644
index 0000000..374b562
--- /dev/null
+++ b/ajax_forms/getResourceStepForm.php
@@ -0,0 +1,75 @@
+<?php
+if (!isset($_GET['resourceStepID'])){
+    echo "<div><p>You must supply a valid resource step ID.</p></div>";
+}else{
+    $resourceStepID = $_GET['resourceStepID'];
+    $resourceStep = new ResourceStep(new NamedArguments(array('primaryKey' => $resourceStepID)));
+    //get step name & group
+    $stepName = $resourceStep->attributes['stepName'];
+    $stepGroupID = $resourceStep->attributes['userGroupID'];
+    $orderNum = $resourceStep->attributes['displayOrderSequence'];
+    $remainingSteps = $resourceStep->getNumberOfOpenSteps();
+    //echo "the step name is ".$stepName.", and the group id is ". $stepGroup.".<br>\n";
+    //get possible groups
+    $userGroupArray = array();
+    $userGroupObj = new UserGroup();
+    $userGroupArray = $userGroupObj->allAsArray();
+
+    //make form
+    ?>
+    <div id='div_resourceStepForm'>
+        <form id='resourceStepForm'>
+            <input type='hidden' name='editRSID' id='editRSID' value='<?php echo $resourceStepID; ?>'>
+            <input type='hidden' name='orderNum' id='orderNum' value='<?php echo $orderNum; ?>'>
+            <input type='hidden' name='currentGroupID' id='currentGroupID' value='<?php echo $stepGroupID; ?>'>
+            <div class='formTitle' style='width:705px; margin-bottom:5px;position:relative;'><span class='headerText'>Edit Resource Step</span></div>
+
+            <span class='smallDarkRedText' id='span_errors'></span>
+
+            <table class='noBorder' style='width:100%;'>
+                <tr style='vertical-align:top;'>
+                    <td style='vertical-align:top;position:relative;'>
+                        <span class='surroundBoxTitle'>&nbsp;&nbsp;<label for='rule'><b>Reassign Resource Step</b></label>&nbsp;&nbsp;</span>
+
+                        <table class='surroundBox' style='width:700px;'>
+                            <tr>
+                                <td>
+                                    <table class='noBorder' style='width:660px; margin:15px 20px 10px 20px;'>
+                                        <tr>
+                                            <!--                                                <td>Step name: <pre>--><?php //var_dump($resourceStep); ?><!--</pre></td>-->
+                                            <td>Step name: <?php echo $stepName; ?></td>
+                                            <td style='vertical-align:top;text-align:left;'>
+                                                <label for='userGroupID'>Group: </label>
+                                                <select name='userGroupID' id='userGroupID' style='width:150px;' class='changeSelect userGroupID'>
+                                                    <?php
+
+                                                    foreach ($userGroupArray as $userGroup){
+                                                        $selected = ($userGroup['userGroupID']==$stepGroupID)? 'selected':'';
+                                                        echo "<option value='" . $userGroup['userGroupID'] . "' ".$selected.">" . $userGroup['groupName'] . "</option>\n";
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </td>
+                                            <td><input name="applyToAll" id='applyToAll' type="checkbox">Apply to all later steps?</input></td>
+                                        </tr>
+                                    </table>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+
+            <table class='noBorderTable' style='width:125px;'>
+                <tr>
+                    <td style='text-align:left'><input type='button' value='submit' name='submitResourceStepForm' id ='submitResourceStepForm'></td>
+                    <td style='text-align:right'><input type='button' value='cancel' onclick="kill(); tb_remove();"></td>
+                </tr>
+            </table>
+
+            <script type="text/javascript" src="js/forms/resourceStepForm.js"></script>
+        </form>
+    </div>
+
+    <?php
+
+}
\ No newline at end of file
diff --git a/ajax_htmldata/getOutstandingQueue.php b/ajax_htmldata/getOutstandingQueue.php
index a80035b..b0f600b 100644
--- a/ajax_htmldata/getOutstandingQueue.php
+++ b/ajax_htmldata/getOutstandingQueue.php
@@ -14,7 +14,7 @@
 		?>
 
 
-			<table class='dataTable' style='width:646px;padding:0x;margin:0px;height:100%;'>
+			<table class='dataTable' style='width:646px;padding:0px;margin:0px;height:100%;'>
 			<tr>
 				<th style='width:45px;'>ID</th>
 				<th style='width:300px;'>Name</th>
@@ -43,7 +43,7 @@
 				$status = new Status(new NamedArguments(array('primaryKey' => $resource['statusID'])));
 
 		?>
-				<tr id='tr_<?php echo $resource['resourceID']; ?>' style='padding:0x;margin:0px;height:100%;'>
+				<tr id='tr_<?php echo $resource['resourceID']; ?>' style='padding:0px;margin:0px;height:100%;'>
 					<td <?php echo $classAdd; ?>><a href='resource.php?resourceID=<?php echo $resource['resourceID']; ?>'><?php echo $resource['resourceID']; ?></a></td>
 					<td <?php echo $classAdd; ?>><a href='resource.php?resourceID=<?php echo $resource['resourceID']; ?>'><?php echo $resource['titleText']; ?></a></td>
 					<td <?php echo $classAdd; ?>><?php echo $acquisitionType->shortName; ?></td>
diff --git a/ajax_htmldata/getRoutingDetails.php b/ajax_htmldata/getRoutingDetails.php
index dc8b12f..c8da0a4 100644
--- a/ajax_htmldata/getRoutingDetails.php
+++ b/ajax_htmldata/getRoutingDetails.php
@@ -19,9 +19,11 @@
 			<table class='linedDataTable' style='width:100%;margin-bottom:5px;'>
 				<tr>
 				<th style='background-color:#dad8d8;width:350px;'>Step</th>
+				<th style='background-color:#dad8d8;'>&nbsp;</th>
 				<th style='background-color:#dad8d8;width:150px;'>Group</th>
 				<th style='background-color:#dad8d8;width:120px;'>Start Date</th>
 				<th style='background-color:#dad8d8;width:250px;'>Complete</th>
+				<th style='background-color:#dad8d8;'>Delete</th>
 				</tr>
 			<?php
 			$openStep=0;
@@ -39,6 +41,9 @@
 				?>
 				<tr>
 				<td <?php echo $classAdd; ?>><?php echo $resourceStep->stepName; ?></td>
+				<td <?php echo $classAdd; ?>><?php if (is_null_date($resourceStep->stepEndDate)){
+						echo '<a href="ajax_forms.php?action=getResourceStepForm&amp;resourceStepID='.$resourceStep->resourceStepID.'&amp;height=250&amp;width=750&amp;modal=true" class="thickbox"><img src="images/edit.gif" alt="edit" title="edit"></a>';
+					} ?></td>
 				<td <?php echo $classAdd; ?>><?php echo $userGroup->groupName; ?></td>
 				<td <?php echo $classAdd; ?>><?php if ($resourceStep->stepStartDate) { echo format_date($resourceStep->stepStartDate); } ?></td>
 				<td <?php echo $classAdd; ?>>
@@ -58,6 +63,12 @@
 						$openStep++;
 					}?>
 				</td>
+				<td style="text-align:center;"> <?php
+					//add a delete step option, there will be a modal confirmation before delete.
+					if (!$resourceStep->stepEndDate){
+						echo '<a href="javascript:void(0);" class="removeResourceStep" id="'. $resourceStep->resourceStepID .'"><img src="images/cross.gif" alt="delete" title="delete"></a>';
+					} ?>
+				</td>
 				</tr>
 				<?php
 
diff --git a/ajax_processing/deleteResourceStep.php b/ajax_processing/deleteResourceStep.php
new file mode 100644
index 0000000..18a8e59
--- /dev/null
+++ b/ajax_processing/deleteResourceStep.php
@@ -0,0 +1,14 @@
+<?php
+$resourceStepID = $_GET['resourceStepID'];
+$resourceStep = new ResourceStep(new NamedArguments(array('primaryKey' => $resourceStepID)));
+
+try {
+    $resourceStep->delete();
+    $resourceStep->startNextStepsOrComplete();
+
+    //TODO fix the display order sequence if there are later steps
+
+
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
diff --git a/ajax_processing/updateResourceStep.php b/ajax_processing/updateResourceStep.php
new file mode 100644
index 0000000..f2a201a
--- /dev/null
+++ b/ajax_processing/updateResourceStep.php
@@ -0,0 +1,34 @@
+<?php
+$resourceStepID = $_POST['resourceStepID'];
+$userGroupID = $_POST['userGroupID'];
+$applyToAll = ($_POST['applyToAll'] == "true")? true:false;
+
+
+if($resourceStepID != ''){
+    $step = new ResourceStep(new NamedArguments(array('primaryKey' => $resourceStepID)));
+
+    //business logic
+    $step->userGroupID = $userGroupID;
+
+    //if apply to all selected, we need to cycle through later steps.
+
+    try {
+        $step->restartReassignedStep();
+
+        if ($applyToAll){
+            //get later open steps and restart those.
+            $laterSteps = $step->getLaterOpenSteps();
+            if (count($laterSteps) > 0){
+                foreach($laterSteps as $laterStep){
+                    $laterStep->userGroupID = $userGroupID;
+                    $laterStep->restartReassignedStep();
+                }
+            }
+        }
+    } catch (Exception $e) {
+        echo $e->getMessage();
+    }
+}else{
+    //do something for empty result
+    echo "There was an error. Invalid or missing step.";
+}
diff --git a/js/forms/resourceStepForm.js b/js/forms/resourceStepForm.js
new file mode 100644
index 0000000..173699b
--- /dev/null
+++ b/js/forms/resourceStepForm.js
@@ -0,0 +1,151 @@
+/*
+ **************************************************************************************************************************
+ ** CORAL Resources Module v. 1.2
+ **
+ ** Copyright (c) 2015 North Carolina State University
+ **
+ ** This file is part of CORAL.
+ **
+ ** CORAL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ **
+ ** CORAL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License along with CORAL.  If not, see <http://www.gnu.org/licenses/>.
+ **
+ **************************************************************************************************************************
+ */
+
+$(document).ready(function(){
+
+
+    $("#submitResourceStepForm").click(function () {
+        updateResourceStep();
+
+        //# sourceURL=js/forms/resourceStepForm.js
+    });
+    //# sourceURL=js/forms/resourceStepForm.js
+
+
+    //do submit if enter is hit
+    $('#userGroupID').keyup(function(e) {
+        if(e.keyCode == 13) {
+            $('#submitResourceStepForm').click();
+        }
+    });
+
+
+    //the following are all to change the look of the inputs when they're clicked
+    $('.changeDefaultWhite').live('focus', function(e) {
+        if (this.value == this.defaultValue){
+            this.value = '';
+        }
+    });
+
+    $('.changeDefaultWhite').live('blur', function() {
+        if(this.value == ''){
+            this.value = this.defaultValue;
+        }
+    });
+
+
+    $('.changeInput').addClass("idleField");
+
+    $('.changeInput').live('focus', function() {
+
+
+        $(this).removeClass("idleField").addClass("focusField");
+
+        if(this.value != this.defaultValue){
+            this.select();
+        }
+
+    });
+
+
+    $('.changeInput').live('blur', function() {
+        $(this).removeClass("focusField").addClass("idleField");
+    });
+
+
+    $('.changeAutocomplete').live('focus', function() {
+        if (this.value == this.defaultValue){
+            this.value = '';
+        }
+
+    });
+
+
+    $('.changeAutocomplete').live('blur', function() {
+        if(this.value == ''){
+            this.value = this.defaultValue;
+        }
+    });
+
+
+
+
+    $('select').addClass("idleField");
+    $('select').live('focus', function() {
+        $(this).removeClass("idleField").addClass("focusField");
+
+    });
+
+    $('select').live('blur', function() {
+        $(this).removeClass("focusField").addClass("idleField");
+    });
+
+});
+
+function validateStep (){
+    //needs work
+    return true;
+}
+
+function updateResourceStep(){
+
+    if (validateStep() === true) {
+        $('#submitResourceStepForm').attr("disabled", "disabled");
+        $.ajax({
+            type:       "POST",
+            url:        "ajax_processing.php?action=updateResourceStep",
+            cache:      false,
+            data:       { resourceStepID: $("#editRSID").val(), userGroupID: $("#userGroupID").val(), applyToAll: $('#applyToAll').val(), orderNum: $('#orderNum').val() },
+            success:    function(html) {
+                if (html){
+                    $("#span_errors").html(html);
+                }else{
+                    tb_remove();
+                    //eval("window.parent.update" + $("#tab").val() + "();");
+                    return false;
+                }
+
+            }
+
+
+        });
+        tb_remove();
+
+        updateRouting();
+        return false;
+
+    }
+
+}
+
+//kill all binds done by jquery live
+function kill(){
+
+    $('.addPayment').die('click');
+    $('.remove').die('click');
+    $('.changeAutocomplete').die('blur');
+    $('.changeAutocomplete').die('focus');
+    $('.changeDefault').die('blur');
+    $('.changeDefault').die('focus');
+    $('.changeInput').die('blur');
+    $('.changeInput').die('focus');
+    $('.select').die('blur');
+    $('.select').die('focus');
+
+}
+
+//# sourceURL=js/forms/resourceStepForm.js
\ No newline at end of file
diff --git a/js/resource.js b/js/resource.js
index 16840d1..7999657 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -496,7 +496,6 @@ function bind_removes(){
    });
 
 
-
 }
 
 
@@ -552,7 +551,23 @@ function bind_routing(){
 	 }
    });
 
-   
+   $(".removeResourceStep").unbind('click').click(function () {
+        if (confirm("Do you really want to delete this step? If other steps depended on this one, they will be started upon deletion. This action cannot be undone") == true) {
+            $.ajax({
+                type:       "GET",
+                url:        "ajax_processing.php",
+                cache:      false,
+                data:       "action=deleteResourceStep&resourceStepID=" + $(this).attr("id"),
+                success:    function(html) {
+                    updateRouting();
+                }
+
+
+            });
+        }
+
+   });
+
 }
 
 
diff --git a/user.php b/user.php
index 1b209a2..9930ccb 100644
--- a/user.php
+++ b/user.php
@@ -77,7 +77,7 @@
 		list ($loginID,$restofAddr) = explode("@", $remoteAuth);
 
 
-
+        $loginID = 'jcraitz';
 		session_start();
 		$_SESSION['loginID'] = $loginID;
 

From c515338a859fd29c58f0d61dc2cd02e7ed3afca3 Mon Sep 17 00:00:00 2001
From: jcraitz <jcraitz@ncsu.edu>
Date: Fri, 17 Jul 2015 13:55:59 -0400
Subject: [PATCH 146/159] made it so that submitting the resourceStepForm
 without changing the usergroup doesn't do anything.  changing the usergroup
 for a resourcestep does not start steps that are not yet active.

---
 admin/classes/domain/ResourceStep.php | 15 ++++++++-------
 js/forms/resourceStepForm.js          | 14 +++++++++-----
 user.php                              |  1 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/admin/classes/domain/ResourceStep.php b/admin/classes/domain/ResourceStep.php
index 0fde07c..1c8be5d 100644
--- a/admin/classes/domain/ResourceStep.php
+++ b/admin/classes/domain/ResourceStep.php
@@ -33,7 +33,7 @@ public function completeStep(){
 		//mark this step complete
 		$this->stepEndDate = date( 'Y-m-d' );
 		$this->endLoginID = $_SESSION['loginID'];
-		$this->save;
+		$this->save();
 
         $this->startNextStepsOrComplete();
 
@@ -66,7 +66,7 @@ public function startStep(){
 
 		//start this step
 		$this->stepStartDate = date( 'Y-m-d' );
-		$this->save;
+		$this->save();
 
 		//send notifications
 		$this->sendApprovalNotification();
@@ -74,12 +74,13 @@ public function startStep(){
 	}
 
     public function restartReassignedStep(){
-        //restart step
-        $this->stepStartDate = date( 'Y-m-d' );
-        $this->save;
+        //restart step if it's active
+		if (!is_null($this->stepStartDate)){
+			$this->stepStartDate = date( 'Y-m-d' );
 
-        //send notification to new step user group
-        $this->sendReassignedStepNotification();
+			$this->sendReassignedStepNotification();
+		}
+        $this->save();
     }
 
 	//returns array of resource step objects
diff --git a/js/forms/resourceStepForm.js b/js/forms/resourceStepForm.js
index 173699b..98f7039 100644
--- a/js/forms/resourceStepForm.js
+++ b/js/forms/resourceStepForm.js
@@ -97,7 +97,11 @@ $(document).ready(function(){
 });
 
 function validateStep (){
-    //needs work
+    //don't submit the form if it has the same usergroup.
+    if ($("#userGroupID").val() == $("#currentGroupID").val()){
+        return false;
+    };
+
     return true;
 }
 
@@ -115,6 +119,7 @@ function updateResourceStep(){
                     $("#span_errors").html(html);
                 }else{
                     tb_remove();
+                    window.parent.updateRouting();
                     //eval("window.parent.update" + $("#tab").val() + "();");
                     return false;
                 }
@@ -123,11 +128,10 @@ function updateResourceStep(){
 
 
         });
-        tb_remove();
-
-        updateRouting();
-        return false;
 
+    }else{
+        tb_remove();
+        return true;
     }
 
 }
diff --git a/user.php b/user.php
index 9930ccb..e2ffd82 100644
--- a/user.php
+++ b/user.php
@@ -77,7 +77,6 @@
 		list ($loginID,$restofAddr) = explode("@", $remoteAuth);
 
 
-        $loginID = 'jcraitz';
 		session_start();
 		$_SESSION['loginID'] = $loginID;
 

From ea1eaa82db5c591dbc45d138b0342dfd58b30067 Mon Sep 17 00:00:00 2001
From: jcraitz <jcraitz@ncsu.edu>
Date: Tue, 21 Jul 2015 17:04:09 -0400
Subject: [PATCH 147/159] finished apply all feature to the resource step user
 group edit form.  it now can apply the new user group to all later steps.

fixed the applyToAll form to actually check the checkbox before applying to all
---
 admin/classes/domain/ResourceStep.php | 27 +++++++++++++++++++++++++++
 js/forms/resourceStepForm.js          |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/admin/classes/domain/ResourceStep.php b/admin/classes/domain/ResourceStep.php
index 1c8be5d..3d78fa8 100644
--- a/admin/classes/domain/ResourceStep.php
+++ b/admin/classes/domain/ResourceStep.php
@@ -149,6 +149,33 @@ public function getNumberOfOpenSteps(){
 
 
 
+	//returns an array of later open step objects
+	public function getLaterOpenSteps(){
+		$query = "SELECT * FROM ResourceStep
+					WHERE resourceID = '" . $this->resourceID . "'
+					AND displayOrderSequence > " . $this->displayOrderSequence . "
+					AND (stepEndDate IS NULL OR stepEndDate = '0000-00-00')
+					ORDER BY resourceStepID";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['resourceStepID'])){
+			$object = new ResourceStep(new NamedArguments(array('primaryKey' => $result['resourceStepID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new ResourceStep(new NamedArguments(array('primaryKey' => $row['resourceStepID'])));
+				array_push($objects, $object);
+			}
+		}
+
+		return $objects;
+	}
+
+
 
 	//sends email to the approval user group for this step
 	public function sendApprovalNotification(){
diff --git a/js/forms/resourceStepForm.js b/js/forms/resourceStepForm.js
index 98f7039..6cf406f 100644
--- a/js/forms/resourceStepForm.js
+++ b/js/forms/resourceStepForm.js
@@ -113,7 +113,7 @@ function updateResourceStep(){
             type:       "POST",
             url:        "ajax_processing.php?action=updateResourceStep",
             cache:      false,
-            data:       { resourceStepID: $("#editRSID").val(), userGroupID: $("#userGroupID").val(), applyToAll: $('#applyToAll').val(), orderNum: $('#orderNum').val() },
+            data:       { resourceStepID: $("#editRSID").val(), userGroupID: $("#userGroupID").val(), applyToAll: $('#applyToAll').is(':checked'), orderNum: $('#orderNum').val() },
             success:    function(html) {
                 if (html){
                     $("#span_errors").html(html);

From f20494936e862b57db23593b74887f63c0a797c1 Mon Sep 17 00:00:00 2001
From: Douglas Hahn <dhahn@tamu.edu>
Date: Mon, 14 Dec 2015 15:11:19 -0600
Subject: [PATCH 148/159] update version tweaks to installer

---
 admin/configuration_sample.ini   | 18 +++++++++---------
 install/CORALInstaller.php       |  2 +-
 install/protected/update_1.4.sql | 20 ++++++++++----------
 templates/footer.php             |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/admin/configuration_sample.ini b/admin/configuration_sample.ini
index 1378425..a7fc310 100644
--- a/admin/configuration_sample.ini
+++ b/admin/configuration_sample.ini
@@ -1,20 +1,20 @@
 [settings]
-licensingModule=
+licensingModule=N
 licensingDatabaseName=
-organizationsModule=
+organizationsModule=N
 organizationsDatabaseName=
-usageModule=
+usageModule=N
 enhancedCostHistory=N
-authModule=
+authModule=N
 authDatabaseName=
 remoteAuthVariableName="_SERVER['REMOTE_USER']"
 defaultCurrency="USD"
-enableAlerts=""
-catalogURL=""
-feedbackEmailAddress=""
+enableAlerts=
+catalogURL=
+feedbackEmailAddress=
 testMode=N
-testModeEmailAddress=""
-defaultsort=""
+testModeEmailAddress=
+defaultsort=
 importISBNDedupingColumns="ISSN,ISBN"
 
 [database]
diff --git a/install/CORALInstaller.php b/install/CORALInstaller.php
index a6b2ec7..1e99136 100644
--- a/install/CORALInstaller.php
+++ b/install/CORALInstaller.php
@@ -209,7 +209,7 @@ public function hasPermission($permission) {
       $grants = array();
       $permission = "(ALL PRIVILEGES|".strtoupper($permission).")";
       foreach ($this->query("SHOW GRANTS FOR CURRENT_USER()") as $row) {
-        $grant = $row[0];
+        $grant = array_values($row)[0];
         if (strpos(str_replace('\\', '', $grant), $this->config->database->name) || strpos($grant, "ON *.*")) {
           if (preg_match("/(GRANT|,) $permission(,| ON)/i",$grant)) {
             return true;
diff --git a/install/protected/update_1.4.sql b/install/protected/update_1.4.sql
index 9c27727..8b0e13a 100644
--- a/install/protected/update_1.4.sql
+++ b/install/protected/update_1.4.sql
@@ -1,5 +1,5 @@
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`Issue`;
-CREATE TABLE `_DATABASE_NAME_`.`Issue` (
+DROP TABLE IF EXISTS `Issue`;
+CREATE TABLE `Issue` (
   `issueID` int(11) NOT NULL AUTO_INCREMENT,
   `creatorID` varchar(20) NOT NULL,
   `subjectText` varchar(80) NOT NULL,
@@ -13,8 +13,8 @@ CREATE TABLE `_DATABASE_NAME_`.`Issue` (
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueRelationship`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
+DROP TABLE IF EXISTS `IssueRelationship`;
+CREATE TABLE `IssueRelationship` (
   `issueRelationshipID` int(11) NOT NULL AUTO_INCREMENT,
   `issueID` int(11) NOT NULL,
   `entityID` int(11) NOT NULL,
@@ -24,16 +24,16 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueRelationship` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEntityType`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueEntityType` (
+DROP TABLE IF EXISTS `IssueEntityType`;
+CREATE TABLE `IssueEntityType` (
   `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `entityName` varchar(80) NOT NULL,
   PRIMARY KEY (`entityTypeID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueContact`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
+DROP TABLE IF EXISTS `IssueContact`;
+CREATE TABLE `IssueContact` (
   `issueContactID` int(11) NOT NULL AUTO_INCREMENT,
   `issueID` int(11) NOT NULL,
   `contactID` int(11) NOT NULL,
@@ -41,8 +41,8 @@ CREATE TABLE `_DATABASE_NAME_`.`IssueContact` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
 
 
-DROP TABLE IF EXISTS `_DATABASE_NAME_`.`IssueEmail`;
-CREATE TABLE `_DATABASE_NAME_`.`IssueEmail` (
+DROP TABLE IF EXISTS `IssueEmail`;
+CREATE TABLE `IssueEmail` (
   `issueEmailID` int(11) NOT NULL AUTO_INCREMENT,
   `issueID` int(11) NOT NULL,
   `email` varchar(120) NOT NULL,
diff --git a/templates/footer.php b/templates/footer.php
index ae8bc30..1f3eb4a 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -28,6 +28,6 @@
 <div class="push">&nbsp;</div>
 </div>
 
-<div class="footer">Copyright &copy; 2015. Resources Module version 1.3<br/><a href="http://coral-erm.org/">CORAL Project Website</a> | <a href="https://github.com/ndlibersa/resources">GitHub Site</a></div>
+<div class="footer">Copyright &copy; 2015. Resources Module version 1.4<br/><a href="http://coral-erm.org/">CORAL Project Website</a> | <a href="https://github.com/ndlibersa/resources">GitHub Site</a></div>
 </body>
 </html>

From f0379a53473a975ceed89280c4231ed8e46ba7a0 Mon Sep 17 00:00:00 2001
From: Douglas Hahn <dhahn@tamu.edu>
Date: Wed, 16 Dec 2015 08:11:43 -0600
Subject: [PATCH 149/159] Update Readme

---
 install/UPGRADE_README.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/install/UPGRADE_README.txt b/install/UPGRADE_README.txt
index 72969ca..85f644a 100644
--- a/install/UPGRADE_README.txt
+++ b/install/UPGRADE_README.txt
@@ -1,3 +1,12 @@
+1.4 The 1.4 update to the CORAL Resources module includes the following enhancements:
+
+	-Added Issue tracker feature that allows tracking of down resources.
+	-Integrates closely with the Orginization module.
+	-Sends email alerts.
+
+	Database structure changes include:
+	- Create Issue, IssueRelationship, IssueEntityType, IssueContact, IssueEmail, Downtime, DowntimeType
+	
 1.3 The 1.3 update to the CORAL Resources module includes the following enhancements:
 
 	-Cost history tracking

From 7b53fa5ad2ac096aa472f2c8efe9853ee3a2edc1 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 3 Jun 2015 14:44:14 +0200
Subject: [PATCH 150/159] Validated forms in Administration tab

---
 js/admin.js | 78 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 27 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 25df295..87544c2 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -226,22 +226,31 @@ function updateSubjectsTable(){
 
 
 
- function submitData(){
-
-	$.ajax({
-          type:       "POST",
-          url:        "ajax_processing.php?action=updateData",
-          cache:      false,
-          data:       { className: $("#editClassName").val(), updateID: $("#editUpdateID").val(), shortName: $('#updateVal').val(), stats: $('#stats').attr('checked') },
-          success:    function(html) {
-          	updateTable($("#editClassName").val());
-          	window.parent.tb_remove();
-          }
-       });
-
- }
-
-
+function submitData(){
+    if (validateAdminForms() === true) {
+        $.ajax({
+              type:       "POST",
+              url:        "ajax_processing.php?action=updateData",
+              cache:      false,
+              data:       { className: $("#editClassName").val(), updateID: $("#editUpdateID").val(), shortName: $('#updateVal').val(), stats: $('#stats').attr('checked') },
+              success:    function(html) {
+                updateTable($("#editClassName").val());
+                window.parent.tb_remove();
+              }
+           });
+    }
+}
+
+// Validate admin forms
+function validateAdminForms() {
+    if ($("#updateVal").val() == ''){
+        $("#span_errors").html('Error - Please enter a value');
+        $("#updateVal").focus();
+        return false;
+    }else{
+        return true;
+    }
+}
  function submitUserData(){
 	$.ajax({
           type:       "POST",
@@ -261,19 +270,34 @@ function updateSubjectsTable(){
 
 
  function submitCurrencyData(){
-	$.ajax({
-          type:       "POST",
-          url:        "ajax_processing.php?action=updateCurrency",
-          cache:      false,
-          data:       { editCurrencyCode: $('#editCurrencyCode').val(), currencyCode: $('#currencyCode').val(), shortName: $('#shortName').val() },
-          success:    function(html) { 
-		  updateCurrencyTable();
-		  window.parent.tb_remove();
-          }
-       });
-
+     if(validateCurrency() === true){
+        $.ajax({
+              type:       "POST",
+              url:        "ajax_processing.php?action=updateCurrency",
+              cache:      false,
+              data:       { editCurrencyCode: $('#editCurrencyCode').val(), currencyCode: $('#currencyCode').val(), shortName: $('#shortName').val() },
+              success:    function(html) { 
+              updateCurrencyTable();
+              window.parent.tb_remove();
+              }
+           });
+     }
  }
 
+// Validate currency form
+function validateCurrency() {
+    if ($("#currencyCode").val() == ''){
+        $("#span_errors").html('Error - Please enter the currency code');
+        $("#currencyCode").focus();
+        return false;
+    }else if($("#shortName").val() == ''){
+        $("#span_errors").html('Error - Please enter a short name for the currency');
+        $("#shortName").focus();
+        return false;
+    }else{
+        return true;
+    }	
+}
 
  function submitAdminAlertEmail(){
 	$.ajax({

From 115fafdb239fef959d0872d7761b24a18476be07 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Wed, 3 Jun 2015 14:53:00 +0200
Subject: [PATCH 151/159] Realigned code in admin.js

---
 js/admin.js | 1020 +++++++++++++++++++++++++--------------------------
 1 file changed, 492 insertions(+), 528 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 87544c2..3a059a0 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -15,229 +15,213 @@
 **************************************************************************************************************************
 */
 
- $(document).ready(function(){
-
-      	 updateUserTable();
-      
-	 $(".AdminLink").click(function () {
-		updateTable($(this).attr("id"));
-	 });
-
-	 $(".UserAdminLink").click(function () {
-		  updateUserTable();
-	 });
-
-	 $(".AlertAdminLink").click(function () {
-		  updateAlertTable();
-	 });
-
-
-	 $(".WorkflowAdminLink").click(function () {
-		  updateWorkflowTable();
-	 });
-
-	 $(".SubjectsAdminLink").click(function () {
-		  updateSubjectsTable();
-	 });	 
-
-	 
-	 $(".CurrencyLink").click(function () {
-		  updateCurrencyTable();
-	 });
-	 
-	 
- 	 $('.removeData').live('click', function () {
- 		  deleteData($(this).attr("cn"), $(this).attr("id"));
- 	 });
-
- 
- 
-      
- });
- 
-
-
- function updateTable(className){
-
-	$(".UserAdminLink").parent().parent().removeClass('selected');
-	$(".AlertAdminLink").parent().parent().removeClass('selected');
-	$(".WorkflowAdminLink").parent().parent().removeClass('selected');
-	$(".AdminLink").parent().parent().removeClass('selected');
-	$(".CurrencyLink").parent().parent().removeClass('selected');
-	$(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
-	$("#" + className).parent().parent().addClass('selected');
-
-	  $.ajax({
-		  type:       "GET",
-		  url:        "ajax_htmldata.php",
-		  cache:      false,
-		  data:       "action=getAdminDisplay&className=" + className,
-		  success:    function(html) { 
-			$('#div_AdminContent').html(html);
-			tb_reinit();
-		  }
-	   });
-	   
-	   //make sure error is empty
-	   $('#div_error').html("");
-	   
-      
- }
-
-
-
-
-
- function updateCurrencyTable(){
-
-  $(".AlertAdminLink").parent().parent().removeClass('selected'); 
-  $(".AdminLink").parent().parent().removeClass('selected'); 
-  $(".WorkflowAdminLink").parent().parent().removeClass('selected');
-  $(".UserAdminLink").parent().parent().removeClass('selected');
-  $(".CurrencyLink").parent().parent().addClass('selected');
-  $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
-  
-       $.ajax({
-          type:       "GET",
-          url:        "ajax_htmldata.php",
-          cache:      false,
-          data:       "action=getAdminCurrencyDisplay",
-          success:    function(html) { 
-          	$('#div_AdminContent').html(html);
-          	tb_reinit();
-          }
-	});
-
-   //make sure error is empty
-   $('#div_error').html("");      
-            
- }
-
-
-
- function updateUserTable(){
-
-  $(".AlertAdminLink").parent().parent().removeClass('selected'); 
-  $(".AdminLink").parent().parent().removeClass('selected'); 
-  $(".WorkflowAdminLink").parent().parent().removeClass('selected');
-  $(".CurrencyLink").parent().parent().removeClass('selected');
-  $(".UserAdminLink").parent().parent().addClass('selected');
-  $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
-  
-       $.ajax({
-          type:       "GET",
-          url:        "ajax_htmldata.php",
-          cache:      false,
-          data:       "action=getAdminUserDisplay",
-          success:    function(html) { 
-          	$('#div_AdminContent').html(html);
-          	tb_reinit();
-          }
-	});
-
-   //make sure error is empty
-   $('#div_error').html("");      
-            
- }
-
-
-
- function updateAlertTable(){
-
-  $(".UserAdminLink").parent().parent().removeClass('selected'); 
-  $(".AdminLink").parent().parent().removeClass('selected'); 
-  $(".WorkflowAdminLink").parent().parent().removeClass('selected'); 
-  $(".CurrencyLink").parent().parent().removeClass('selected'); 
-  $(".AlertAdminLink").parent().parent().addClass('selected');
-  $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
-
-       $.ajax({
-          type:       "GET",
-          url:        "ajax_htmldata.php",
-          cache:      false,
-          data:       "action=getAdminAlertDisplay",
-          success:    function(html) { 
-          	$('#div_AdminContent').html(html);
-          	tb_reinit();
-          }
-	});
-
-   //make sure error is empty
-   $('#div_error').html("");      
-            
- }
-
-
-
-
- function updateWorkflowTable(){
-
-  $(".UserAdminLink").parent().parent().removeClass('selected'); 
-  $(".AdminLink").parent().parent().removeClass('selected'); 
-  $(".AlertAdminLink").parent().parent().removeClass('selected');
-  $(".CurrencyLink").parent().parent().removeClass('selected');
-  $(".WorkflowAdminLink").parent().parent().addClass('selected');
-  $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
-  
-       $.ajax({
-          type:       "GET",
-          url:        "ajax_htmldata.php",
-          cache:      false,
-          data:       "action=getAdminWorkflowDisplay",
-          success:    function(html) { 
-          	$('#div_AdminContent').html(html);
-          	tb_reinit();
-          }
-	});
-
-   //make sure error is empty
-   $('#div_error').html("");      
-            
- }
+$(document).ready(function(){
 
-function updateSubjectsTable(){
+    updateUserTable();
+
+    $(".AdminLink").click(function () {
+        updateTable($(this).attr("id"));
+    });
+
+    $(".UserAdminLink").click(function () {
+        updateUserTable();
+    });
+
+    $(".AlertAdminLink").click(function () {
+        updateAlertTable();
+    });
+
+
+    $(".WorkflowAdminLink").click(function () {
+        updateWorkflowTable();
+    });
+
+    $(".SubjectsAdminLink").click(function () {
+        updateSubjectsTable();
+    });	 
+
+
+    $(".CurrencyLink").click(function () {
+        updateCurrencyTable();
+    });
+
+
+    $('.removeData').live('click', function () {
+        deleteData($(this).attr("cn"), $(this).attr("id"));
+    });
+
+});
+
+
+function updateTable(className){
+
+    $(".UserAdminLink").parent().parent().removeClass('selected');
+    $(".AlertAdminLink").parent().parent().removeClass('selected');
+    $(".WorkflowAdminLink").parent().parent().removeClass('selected');
+    $(".AdminLink").parent().parent().removeClass('selected');
+    $(".CurrencyLink").parent().parent().removeClass('selected');
+    $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
+    $("#" + className).parent().parent().addClass('selected');
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminDisplay&className=" + className,
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
+
+    //make sure error is empty
+    $('#div_error').html("");
 
-  $(".UserAdminLink").parent().parent().removeClass('selected'); 
-  $(".AdminLink").parent().parent().removeClass('selected'); 
-  $(".AlertAdminLink").parent().parent().removeClass('selected');
-  $(".CurrencyLink").parent().parent().removeClass('selected');
-  $(".WorkflowAdminLink").parent().parent().removeClass('selected');
-  $(".SubjectsAdminLink").parent().parent().addClass('selected');  
 
-       $.ajax({
-          type:       "GET",
-          url:        "ajax_htmldata.php",
-          cache:      false,
-          data:       "action=getAdminSubjectDisplay",
-          success:    function(html) { 
-          	$('#div_AdminContent').html(html);
-          	tb_reinit();
-          }
-	});
+}
 
-   //make sure error is empty
-   $('#div_error').html("");      
-            
- }
 
+function updateCurrencyTable(){
+
+    $(".AlertAdminLink").parent().parent().removeClass('selected'); 
+    $(".AdminLink").parent().parent().removeClass('selected'); 
+    $(".WorkflowAdminLink").parent().parent().removeClass('selected');
+    $(".UserAdminLink").parent().parent().removeClass('selected');
+    $(".CurrencyLink").parent().parent().addClass('selected');
+    $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminCurrencyDisplay",
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
 
+    //make sure error is empty
+    $('#div_error').html("");      
 
+}
 
 
+function updateUserTable(){
+
+    $(".AlertAdminLink").parent().parent().removeClass('selected'); 
+    $(".AdminLink").parent().parent().removeClass('selected'); 
+    $(".WorkflowAdminLink").parent().parent().removeClass('selected');
+    $(".CurrencyLink").parent().parent().removeClass('selected');
+    $(".UserAdminLink").parent().parent().addClass('selected');
+    $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminUserDisplay",
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
+
+    //make sure error is empty
+    $('#div_error').html("");      
+
+}
+
+
+function updateAlertTable(){
+
+    $(".UserAdminLink").parent().parent().removeClass('selected'); 
+    $(".AdminLink").parent().parent().removeClass('selected'); 
+    $(".WorkflowAdminLink").parent().parent().removeClass('selected'); 
+    $(".CurrencyLink").parent().parent().removeClass('selected'); 
+    $(".AlertAdminLink").parent().parent().addClass('selected');
+    $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminAlertDisplay",
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
+
+    //make sure error is empty
+    $('#div_error').html("");      
+
+}
+
+
+function updateWorkflowTable(){
+
+    $(".UserAdminLink").parent().parent().removeClass('selected'); 
+    $(".AdminLink").parent().parent().removeClass('selected'); 
+    $(".AlertAdminLink").parent().parent().removeClass('selected');
+    $(".CurrencyLink").parent().parent().removeClass('selected');
+    $(".WorkflowAdminLink").parent().parent().addClass('selected');
+    $(".SubjectsAdminLink").parent().parent().removeClass('selected'); 
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminWorkflowDisplay",
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
+
+    //make sure error is empty
+    $('#div_error').html("");      
+
+}
+
+function updateSubjectsTable(){
+
+    $(".UserAdminLink").parent().parent().removeClass('selected'); 
+    $(".AdminLink").parent().parent().removeClass('selected'); 
+    $(".AlertAdminLink").parent().parent().removeClass('selected');
+    $(".CurrencyLink").parent().parent().removeClass('selected');
+    $(".WorkflowAdminLink").parent().parent().removeClass('selected');
+    $(".SubjectsAdminLink").parent().parent().addClass('selected');  
+
+    $.ajax({
+        type:       "GET",
+        url:        "ajax_htmldata.php",
+        cache:      false,
+        data:       "action=getAdminSubjectDisplay",
+        success:    function(html) { 
+            $('#div_AdminContent').html(html);
+            tb_reinit();
+        }
+    });
+
+    //make sure error is empty
+    $('#div_error').html("");      
+
+}
 
 
 function submitData(){
     if (validateAdminForms() === true) {
         $.ajax({
-              type:       "POST",
-              url:        "ajax_processing.php?action=updateData",
-              cache:      false,
-              data:       { className: $("#editClassName").val(), updateID: $("#editUpdateID").val(), shortName: $('#updateVal').val(), stats: $('#stats').attr('checked') },
-              success:    function(html) {
+            type:       "POST",
+            url:        "ajax_processing.php?action=updateData",
+            cache:      false,
+            data:       { className: $("#editClassName").val(), updateID: $("#editUpdateID").val(), shortName: $('#updateVal').val(), stats: $('#stats').attr('checked') },
+            success:    function(html) {
                 updateTable($("#editClassName").val());
                 window.parent.tb_remove();
-              }
-           });
+            }
+        });
     }
 }
 
@@ -251,38 +235,35 @@ function validateAdminForms() {
         return true;
     }
 }
- function submitUserData(){
-	$.ajax({
-          type:       "POST",
-          url:        "ajax_processing.php?action=updateUserData",
-          cache:      false,
-          data:       { orgloginID: $('#editLoginID').val(), loginID: $('#loginID').val(), firstName: $('#firstName').val(), lastName: $('#lastName').val(), emailAddress: $('#emailAddress').val(), privilegeID: $('#privilegeID').val(), accountTabIndicator: getCheckboxValue('accountTab') },
-          success:    function(html) { 
-		  updateUserTable();
-		  window.parent.tb_remove();
-          }
-       });
-
- }
-
-
+function submitUserData(){
+    $.ajax({
+        type:       "POST",
+        url:        "ajax_processing.php?action=updateUserData",
+        cache:      false,
+        data:       { orgloginID: $('#editLoginID').val(), loginID: $('#loginID').val(), firstName: $('#firstName').val(), lastName: $('#lastName').val(), emailAddress: $('#emailAddress').val(), privilegeID: $('#privilegeID').val(), accountTabIndicator: getCheckboxValue('accountTab') },
+        success:    function(html) { 
+            updateUserTable();
+            window.parent.tb_remove();
+        }
+    });
 
+}
 
 
- function submitCurrencyData(){
-     if(validateCurrency() === true){
+function submitCurrencyData(){
+    if(validateCurrency() === true){
         $.ajax({
-              type:       "POST",
-              url:        "ajax_processing.php?action=updateCurrency",
-              cache:      false,
-              data:       { editCurrencyCode: $('#editCurrencyCode').val(), currencyCode: $('#currencyCode').val(), shortName: $('#shortName').val() },
-              success:    function(html) { 
-              updateCurrencyTable();
-              window.parent.tb_remove();
-              }
-           });
-     }
- }
+            type:       "POST",
+            url:        "ajax_processing.php?action=updateCurrency",
+            cache:      false,
+            data:       { editCurrencyCode: $('#editCurrencyCode').val(), currencyCode: $('#currencyCode').val(), shortName: $('#shortName').val() },
+            success:    function(html) { 
+                updateCurrencyTable();
+                window.parent.tb_remove();
+            }
+        });
+    }
+}
 
 // Validate currency form
 function validateCurrency() {
@@ -299,299 +280,282 @@ function validateCurrency() {
     }	
 }
 
- function submitAdminAlertEmail(){
-	$.ajax({
-          type:       "POST",
-          url:        "ajax_processing.php?action=updateAdminAlertEmail",
-          cache:      false,
-          data:       { alertEmailAddressID: $('#editAlertEmailAddressID').val(), emailAddress: $('#emailAddress').val() },
-          success:    function(html) { 
-		  updateAlertTable();
-		  window.parent.tb_remove();
-          }
-       });
-
- }
-
-
-
-
-
- function submitAdminAlertDays(){
- 
- 	numberOfDays = $('#daysInAdvanceNumber').val();
- 	
- 	if (parseInt(numberOfDays) != numberOfDays-0){
- 		$('#div_form_error').html(_("Number of days must be a number"));
- 		return false;
- 	}else if ((numberOfDays < 1) || (numberOfDays > 365)){
- 		$('#div_form_error').html(_("Number of days should be between 1 and 365"));
- 		return false;
- 	}else{
- 		$('#div_form_error').html("&nbsp;");
-		$.ajax({
-		  type:       "POST",
-		  url:        "ajax_processing.php?action=updateAdminAlertDays",
-		  cache:      false,
-		  data:       { alertDaysInAdvanceID: $('#editAlertDaysInAdvanceID').val(), daysInAdvanceNumber: $('#daysInAdvanceNumber').val() },
-		  success:    function(html) { 
-			  updateAlertTable();
-			  window.parent.tb_remove();
-		  }
-	       });
-	}
- }
-
-
-
- function deleteData(className, deleteID){
- 
- 	if (confirm(_("Do you really want to delete this data?")) == true) {
-
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateTable(className);  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
-
-   function deleteGeneralSubject(className, deleteID){
- 
- 	if (confirm(_("Do you really want to remove this data?")) == true) {
-	   
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteGeneralSubject&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateSubjectsTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
- 
- 
-   function deleteDetailedSubject(className, deleteID){
- 
- 	if (confirm(_("Do you really want to remove this data?")) == true) {
-	   
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteDetailedSubject&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateSubjectsTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
-
- 
-  function deleteGeneralDetailSubject(className, deleteID){
- 
- 	if (confirm(_("Do you really want to remove this data?")) == true) {
-	   
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateSubjectsTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
- 
- 
-
-
- function deleteUser(deleteId){
- 
- 	if (confirm(_("Do you really want to delete this user?")) == true) {
-
-	       $('#span_User_response').html('<img src = "images/circle.gif">&nbsp;&nbsp;Processing...');
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=User&id=" + deleteId,
-		  success:    function(html) { 
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateUserTable();  
-				tb_reinit();
-			}
-		  }
-	      });
-
-	}
- } 
- 
-  
-
-
-
- function deleteAlert(className, deleteID){
- 
- 	if (confirm(_("Do you really want to remove this alert setting?")) == true) {
-	   
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateAlertTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
-
-
-
- function deleteWorkflow(className, deleteID){
- 
- 	if (confirm(_("Do you really want to remove this data?")) == true) {
-	   
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateWorkflowTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
-
-
-
-
- function deleteCurrency(className, deleteID){
- 
- 	if (confirm(_("Do you really want to delete this currency?")) == true) {
-
-	       $.ajax({
-		  type:       "GET",
-		  url:        "ajax_processing.php",
-		  cache:      false,
-		  data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
-		  success:    function(html) { 
-
-			if (html){		  			  	
-				showError(html);  
-
-				// close the div in 3 secs
-				setTimeout("emptyError();",3000); 
-			}else{
-				updateCurrencyTable();  
-				tb_reinit();
-			}
-			
-		  }
-	      });
-
-	}
- }
- 
- 
-
-
-  
- 
- function showError(html){
- 
-     $('#div_error').fadeTo(0, 5000, function () { 
- 	$('#div_error').html(html);
-     });
-  	
- }
-
-
- 
- function emptyError(){
+function submitAdminAlertEmail(){
+    $.ajax({
+        type:       "POST",
+        url:        "ajax_processing.php?action=updateAdminAlertEmail",
+        cache:      false,
+        data:       { alertEmailAddressID: $('#editAlertEmailAddressID').val(), emailAddress: $('#emailAddress').val() },
+        success:    function(html) { 
+            updateAlertTable();
+            window.parent.tb_remove();
+        }
+    });
+
+}
+
+
+function submitAdminAlertDays(){
+
+    numberOfDays = $('#daysInAdvanceNumber').val();
+
+    if (parseInt(numberOfDays) != numberOfDays-0){
+        $('#div_form_error').html(_("Number of days must be a number"));
+        return false;
+    }else if ((numberOfDays < 1) || (numberOfDays > 365)){
+        $('#div_form_error').html(_("Number of days should be between 1 and 365"));
+        return false;
+    }else{
+        $('#div_form_error').html("&nbsp;");
+        $.ajax({
+            type:       "POST",
+            url:        "ajax_processing.php?action=updateAdminAlertDays",
+            cache:      false,
+            data:       { alertDaysInAdvanceID: $('#editAlertDaysInAdvanceID').val(), daysInAdvanceNumber: $('#daysInAdvanceNumber').val() },
+            success:    function(html) { 
+                updateAlertTable();
+                window.parent.tb_remove();
+            }
+        });
+    }
+}
+
+
+function deleteData(className, deleteID){
+
+    if (confirm(_("Do you really want to delete this data?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateTable(className);  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+function deleteGeneralSubject(className, deleteID){
+
+    if (confirm(_("Do you really want to remove this data?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteGeneralSubject&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateSubjectsTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function deleteDetailedSubject(className, deleteID){
+
+    if (confirm(_("Do you really want to remove this data?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteDetailedSubject&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateSubjectsTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function deleteGeneralDetailSubject(className, deleteID){
+
+    if (confirm(_("Do you really want to remove this data?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateSubjectsTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function deleteUser(deleteId){
+
+    if (confirm(_("Do you really want to delete this user?")) == true) {
+
+        $('#span_User_response').html('<img src = "images/circle.gif">&nbsp;&nbsp;Processing...');
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=User&id=" + deleteId,
+            success:    function(html) { 
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateUserTable();  
+                    tb_reinit();
+                }
+            }
+        });
+
+    }
+} 
+
+
+function deleteAlert(className, deleteID){
+
+    if (confirm(_("Do you really want to remove this alert setting?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateAlertTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function deleteWorkflow(className, deleteID){
+
+    if (confirm(_("Do you really want to remove this data?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateWorkflowTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function deleteCurrency(className, deleteID){
+
+    if (confirm(_("Do you really want to delete this currency?")) == true) {
+
+        $.ajax({
+            type:       "GET",
+            url:        "ajax_processing.php",
+            cache:      false,
+            data:       "action=deleteInstance&class=" + className + "&id=" + deleteID,
+            success:    function(html) { 
+
+                if (html){		  			  	
+                    showError(html);  
+
+                    // close the div in 3 secs
+                    setTimeout("emptyError();",3000); 
+                }else{
+                    updateCurrencyTable();  
+                    tb_reinit();
+                }
+
+            }
+        });
+
+    }
+}
+
+
+function showError(html){
+
+    $('#div_error').fadeTo(0, 5000, function () { 
+        $('#div_error').html(html);
+    });
+
+}
+
+
+function emptyError(){
 
     $('#div_error').fadeTo(500, 0, function () { 
-	$('#div_error').html("");
+        $('#div_error').html("");
     });
- 	
- }
+
+}

From 58da2b7457f3f92f6d47cb519d2409efb8120a10 Mon Sep 17 00:00:00 2001
From: Cesar HERNANDEZ ANTONIO <hernandez.antonio.cesar19@gmail.com>
Date: Fri, 29 May 2015 17:31:34 +0200
Subject: [PATCH 152/159] Updated manuals and deleted commented line

---
 install/manual_upgrade_1_2.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/manual_upgrade_1_2.txt b/install/manual_upgrade_1_2.txt
index c897656..deb6cad 100644
--- a/install/manual_upgrade_1_2.txt
+++ b/install/manual_upgrade_1_2.txt
@@ -14,7 +14,7 @@ Update /admin/configuration.ini
 
 	-No changes are required to be made in the /admin/configuration.ini
 	-defaultsort was added and can be used to change the default sort order of resources.
-
+    
 Update the module
 
     -Run /coral/resources/install/update.php to apply the upgrade

From 26ae17cbbc7a9b0d65786d7bd40dc6f61605c015 Mon Sep 17 00:00:00 2001
From: bgarcia <brandon.garcia@my.wheaton.edu>
Date: Fri, 7 Aug 2015 15:06:45 -0500
Subject: [PATCH 153/159] mysql -> mysqli update. Should only impact database
 interaction. Not yet tested.

---
 admin/classes/common/DBService.php        |  32 +++---
 admin/classes/domain/OrganizationRole.php |   8 +-
 admin/classes/domain/Resource.php         | 122 +++++++++++-----------
 admin/classes/domain/ResourcePayment.php  |   6 +-
 import.php                                |   4 +-
 install/CORALInstaller.php                |  38 ++++---
 install/install.php                       |  58 +++++-----
 install/update.php                        |  11 +-
 install/upgrade_beta.php                  |  44 ++++----
 9 files changed, 168 insertions(+), 155 deletions(-)

diff --git a/admin/classes/common/DBService.php b/admin/classes/common/DBService.php
index b8a43d0..1a69e06 100644
--- a/admin/classes/common/DBService.php
+++ b/admin/classes/common/DBService.php
@@ -35,7 +35,7 @@ protected function dealloc() {
 	}
 
 	protected function checkForError() {
-		if ($this->error = mysql_error($this->db)) {
+		if ($this->error = $this->db->error) {
 			throw new Exception(_("There was a problem with the database: ") . $this->error);
 		}
 	}
@@ -44,44 +44,50 @@ protected function connect() {
 		$host = $this->config->database->host;
 		$username = $this->config->database->username;
 		$password = $this->config->database->password;
-		$this->db = mysql_connect($host, $username, $password);
+		$this->db = new mysqli($host, $username, $password);
 		$this->checkForError();
-		mysql_set_charset('utf8', $this->db);
+        $this->db->set_charset('utf8');
 
 		$databaseName = $this->config->database->name;
-		mysql_select_db($databaseName, $this->db);
+        $this->db->select_db($databaseName);
 		$this->checkForError();
 	}
 
 	protected function disconnect() {
-		//mysql_close($this->db);
+		//mysqli_close($this->db);
 	}
 
 	public function escapeString($value) {
-		return mysql_real_escape_string($value, $this->db);
+        return $this->db->escapeString($value);
 	}
 
+    public function query($sql) {
+        $result = $this->db->query($sql);
+        $this->checkForError();
+        return $result;
+    }
+
 	public function processQuery($sql, $type = NULL) {
     	//echo $sql. "\n\n";
-		$result = mysql_query($sql, $this->db);
+		$result = $this->db->query($sql);
 		$this->checkForError();
 		$data = array();
 
 		if (is_resource($result)) {
-			$resultType = MYSQL_NUM;
+			$resultType = MYSQLI_NUM;
 			if ($type == 'assoc') {
-				$resultType = MYSQL_ASSOC;
+				$resultType = MYSQLI_ASSOC;
 			}
-			while ($row = mysql_fetch_array($result, $resultType)) {
-				if (mysql_affected_rows($this->db) > 1) {
+			while ($row = $result->fetch_array($resultType)) {
+				if ($this->db->affected_rows > 1) {
 					array_push($data, $row);
 				} else {
 					$data = $row;
 				}
 			}
-			mysql_free_result($result);
+			$result->free();
 		} else if ($result) {
-			$data = mysql_insert_id($this->db);
+			$data = $this->db->insert_id;
 		}
 
 		return $data;
diff --git a/admin/classes/domain/OrganizationRole.php b/admin/classes/domain/OrganizationRole.php
index 984185a..699faaa 100644
--- a/admin/classes/domain/OrganizationRole.php
+++ b/admin/classes/domain/OrganizationRole.php
@@ -39,8 +39,8 @@ public function getArray(){
 			$query = "SELECT * FROM " . $dbName . ".OrganizationRole ORDER BY shortName;";
 
 
-			if ($orgResult = mysql_query($query)){
-				while ($orgRoleRow = mysql_fetch_assoc($orgResult)){
+			if ($orgResult = $this->db->query($query)){
+				while ($orgRoleRow = $orgResult->fetch_assoc()){
 					$orgRoleArray[$orgRoleRow['organizationRoleID']] = $orgRoleRow['shortName'];
 				}
 			}
@@ -53,8 +53,8 @@ public function getArray(){
 			$query = "SELECT * FROM OrganizationRole ORDER BY shortName;";
 
 
-			if ($orgResult = mysql_query($query)){
-				while ($orgRoleRow = mysql_fetch_assoc($orgResult)){
+			if ($orgResult = $this->db->query($query)){
+				while ($orgRoleRow = $orgResult->fetch_assoc()){
 					$orgRoleArray[$orgRoleRow['organizationRoleID']] = $orgRoleRow['shortName'];
 				}
 			}
diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 280bb27..1ab4579 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -228,8 +228,8 @@ public function getLicenseArray(){
 				//first, get the license name
 				$query = "SELECT shortName FROM " . $dbName . ".License WHERE licenseID = " . $result['licenseID'];
 
-				if ($licResult = mysql_query($query)){
-					while ($licRow = mysql_fetch_assoc($licResult)){
+				if ($licResult = $this->db->query($query)){
+					while ($licRow = $licResult->fetch_assoc()){
 						$licArray['license'] = $licRow['shortName'];
 						$licArray['licenseID'] = $result['licenseID'];
 					}
@@ -243,8 +243,8 @@ public function getLicenseArray(){
 					//first, get the license name
 					$query = "SELECT shortName FROM " . $dbName . ".License WHERE licenseID = " . $row['licenseID'];
 
-					if ($licResult = mysql_query($query)){
-						while ($licRow = mysql_fetch_assoc($licResult)){
+					if ($licResult = $this->db->query($query)){
+						while ($licRow = $licResult->fetch_assoc()){
 							$licArray['license'] = $licRow['shortName'];
 							$licArray['licenseID'] = $row['licenseID'];
 						}
@@ -900,7 +900,7 @@ public static function getSearch() {
   }
   
   public static function getSearchDetails() {
-    // A successful mysql_connect must be run before mysql_real_escape_string will function.  Instantiating a resource model will set up the connection
+    // A successful mysqli_connect must be run before mysqli_real_escape_string will function.  Instantiating a resource model will set up the connection
     $resource = new Resource();
     
     $search = Resource::getSearch();
@@ -912,7 +912,7 @@ public static function getSearchDetails() {
 
 		//if name is passed in also search alias, organizations and organization aliases
 		if ($search['name']) {
-			$nameQueryString = mysql_real_escape_string(strtoupper($search['name']));
+			$nameQueryString = $this->db->escapeString(strtoupper($search['name']));
 			$nameQueryString = preg_replace("/ +/", "%", $nameQueryString);
 		  $nameQueryString = "'%" . $nameQueryString . "%'";
 
@@ -932,16 +932,16 @@ public static function getSearchDetails() {
 
 		//get where statements together (and escape single quotes)
 		if ($search['resourceID']) {
-		  $whereAdd[] = "R.resourceID = '" . mysql_real_escape_string($search['resourceID']) . "'";
+		  $whereAdd[] = "R.resourceID = '" . $this->db->escapeString($search['resourceID']) . "'";
 		  $searchDisplay[] = "Resource ID: " . $search['resourceID'];
 	  }
 		if ($search['resourceISBNOrISSN']) {
-		  $resourceISBNOrISSN = mysql_real_escape_string(str_replace("-","",$search['resourceISBNOrISSN']));
+		  $resourceISBNOrISSN = $this->db->escapeString(str_replace("-","",$search['resourceISBNOrISSN']));
 		  $whereAdd[] = "REPLACE(I.isbnOrIssn,'-','') = '" . $resourceISBNOrISSN . "'";
 		  $searchDisplay[] = "ISSN/ISBN: " . $search['resourceISBNOrISSN'];
 		} 
 		if ($search['fund']) {
-		  $fund = mysql_real_escape_string(str_replace("-","",$search['fund']));
+		  $fund = $this->db->escapeString(str_replace("-","",$search['fund']));
 		  $whereAdd[] = "REPLACE(RPAY.fundName,'-','') = '" . $fund . "'";
 		  $searchDisplay[] = "Fund: " . $search['fund'];
 	  }
@@ -949,7 +949,7 @@ public static function getSearchDetails() {
     if ($search['stepName']) {
       $status = new Status();
       $completedStatusID = $status->getIDFromName('complete');
-      $whereAdd[] = "(R.statusID != $completedStatusID AND RS.stepName = '" . mysql_real_escape_string($search['stepName']) . "' AND RS.stepStartDate IS NOT NULL AND RS.stepEndDate IS NULL)";
+      $whereAdd[] = "(R.statusID != $completedStatusID AND RS.stepName = '" . $this->db->escapeString($search['stepName']) . "' AND RS.stepStartDate IS NOT NULL AND RS.stepEndDate IS NULL)";
       $searchDisplay[] = "Routing Step: " . $search['stepName'];
     }
 
@@ -963,14 +963,14 @@ public static function getSearchDetails() {
 
     
 		if ($search['statusID']) {
-		  $whereAdd[] = "R.statusID = '" . mysql_real_escape_string($search['statusID']) . "'";
+		  $whereAdd[] = "R.statusID = '" . $this->db->escapeString($search['statusID']) . "'";
 		  $status = new Status(new NamedArguments(array('primaryKey' => $search['statusID'])));
     	$searchDisplay[] = "Status: " . $status->shortName;
 	  }
 	  
 		if ($search['creatorLoginID']) {
-		  $whereAdd[] = "R.createLoginID = '" . mysql_real_escape_string($search['creatorLoginID']) . "'";
-		  
+		  $whereAdd[] = "R.createLoginID = '" . $this->db->escapeString($search['creatorLoginID']) . "'";
+
 		  $createUser = new User(new NamedArguments(array('primaryKey' => $search['creatorLoginID'])));
     	if ($createUser->firstName){
     		$name = $createUser->lastName . ", " . $createUser->firstName;
@@ -981,25 +981,25 @@ public static function getSearchDetails() {
 	  }
 
 		if ($search['resourceFormatID']) {
-		  $whereAdd[] = "R.resourceFormatID = '" . mysql_real_escape_string($search['resourceFormatID']) . "'";
+		  $whereAdd[] = "R.resourceFormatID = '" . $this->db->escapeString($search['resourceFormatID']) . "'";
 		  $resourceFormat = new ResourceFormat(new NamedArguments(array('primaryKey' => $search['resourceFormatID'])));
     	$searchDisplay[] = "Resource Format: " . $resourceFormat->shortName;
 	  }
 	  
 		if ($search['acquisitionTypeID']) {
-		  $whereAdd[] = "R.acquisitionTypeID = '" . mysql_real_escape_string($search['acquisitionTypeID']) . "'";
+		  $whereAdd[] = "R.acquisitionTypeID = '" . $this->db->escapeString($search['acquisitionTypeID']) . "'";
 		  $acquisitionType = new AcquisitionType(new NamedArguments(array('primaryKey' => $search['acquisitionTypeID'])));
     	$searchDisplay[] = "Acquisition Type: " . $acquisitionType->shortName;
 	  }
 
 
 		if ($search['resourceNote']) {
-		  $whereAdd[] = "UPPER(RN.noteText) LIKE UPPER('%" . mysql_real_escape_string($search['resourceNote']) . "%')";
+		  $whereAdd[] = "UPPER(RN.noteText) LIKE UPPER('%" . $this->db->escapeString($search['resourceNote']) . "%')";
 		  $searchDisplay[] = "Note contains: " . $search['resourceNote'];
 	  }
 
 		if ($search['createDateStart']) {
-		  $whereAdd[] = "R.createDate >= STR_TO_DATE('" . mysql_real_escape_string($search['createDateStart']) . "','%m/%d/%Y')";
+		  $whereAdd[] = "R.createDate >= STR_TO_DATE('" . $this->db->escapeString($search['createDateStart']) . "','%m/%d/%Y')";
 		  if (!$search['createDateEnd']) {
 		    $searchDisplay[] = "Created on or after: " . $search['createDateStart'];
 	    } else {
@@ -1008,14 +1008,14 @@ public static function getSearchDetails() {
 	  }
 	  
 		if ($search['createDateEnd']) {
-		  $whereAdd[] = "R.createDate <= STR_TO_DATE('" . mysql_real_escape_string($search['createDateEnd']) . "','%m/%d/%Y')";
+		  $whereAdd[] = "R.createDate <= STR_TO_DATE('" . $this->db->escapeString($search['createDateEnd']) . "','%m/%d/%Y')";
 		  if (!$search['createDateStart']) {
 		    $searchDisplay[] = "Created on or before: " . $search['createDateEnd'];
 	    }
 	  }
 
 		if ($search['startWith']) {
-		  $whereAdd[] = "TRIM(LEADING 'THE ' FROM UPPER(R.titleText)) LIKE UPPER('" . mysql_real_escape_string($search['startWith']) . "%')";
+		  $whereAdd[] = "TRIM(LEADING 'THE ' FROM UPPER(R.titleText)) LIKE UPPER('" . $this->db->escapeString($search['startWith']) . "%')";
 		  $searchDisplay[] = "Starts with: " . $search['startWith'];
 	  }
 
@@ -1024,7 +1024,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "((R.resourceTypeID IS NULL) OR (R.resourceTypeID = '0'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['resourceTypeID']){
-			$whereAdd[] = "R.resourceTypeID = '" . mysql_real_escape_string($search['resourceTypeID']) . "'";
+			$whereAdd[] = "R.resourceTypeID = '" . $this->db->escapeString($search['resourceTypeID']) . "'";
 			$resourceType = new ResourceType(new NamedArguments(array('primaryKey' => $search['resourceTypeID'])));
     	$searchDisplay[] = "Resource Type: " . $resourceType->shortName;
 		}
@@ -1034,7 +1034,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "((GDLINK.generalSubjectID IS NULL) OR (GDLINK.generalSubjectID = '0'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['generalSubjectID']){
-			$whereAdd[] = "GDLINK.generalSubjectID = '" . mysql_real_escape_string($search['generalSubjectID']) . "'";
+			$whereAdd[] = "GDLINK.generalSubjectID = '" . $this->db->escapeString($search['generalSubjectID']) . "'";
 			$generalSubject = new GeneralSubject(new NamedArguments(array('primaryKey' => $search['generalSubjectID'])));
     	$searchDisplay[] = "General Subject: " . $generalSubject->shortName;
 		}		
@@ -1043,7 +1043,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "((GDLINK.detailedSubjectID IS NULL) OR (GDLINK.detailedSubjectID = '0') OR (GDLINK.detailedSubjectID = '-1'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['detailedSubjectID']){
-			$whereAdd[] = "GDLINK.detailedSubjectID = '" . mysql_real_escape_string($search['detailedSubjectID']) . "'";
+			$whereAdd[] = "GDLINK.detailedSubjectID = '" . $this->db->escapeString($search['detailedSubjectID']) . "'";
 			$detailedSubject = new DetailedSubject(new NamedArguments(array('primaryKey' => $search['detailedSubjectID'])));
     	$searchDisplay[] = "Detailed Subject: " . $detailedSubject->shortName;
 		}			
@@ -1052,7 +1052,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "(RN.noteTypeID IS NULL) AND (RN.noteText IS NOT NULL)";
 			$searchDisplay[] = "Note Type: none";
 		}else if ($search['noteTypeID']){
-			$whereAdd[] = "RN.noteTypeID = '" . mysql_real_escape_string($search['noteTypeID']) . "'";
+			$whereAdd[] = "RN.noteTypeID = '" . $this->db->escapeString($search['noteTypeID']) . "'";
 			$noteType = new NoteType(new NamedArguments(array('primaryKey' => $search['noteTypeID'])));
     	$searchDisplay[] = "Note Type: " . $noteType->shortName;
 		}
@@ -1062,7 +1062,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RPSL.purchaseSiteID IS NULL";
 			$searchDisplay[] = "Purchase Site: none";
 		}else if ($search['purchaseSiteID']){
-			$whereAdd[] = "RPSL.purchaseSiteID = '" . mysql_real_escape_string($search['purchaseSiteID']) . "'";
+			$whereAdd[] = "RPSL.purchaseSiteID = '" . $this->db->escapeString($search['purchaseSiteID']) . "'";
 			$purchaseSite = new PurchaseSite(new NamedArguments(array('primaryKey' => $search['purchaseSiteID'])));
     	$searchDisplay[] = "Purchase Site: " . $purchaseSite->shortName;
 		}
@@ -1072,7 +1072,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RAUSL.authorizedSiteID IS NULL";
 			$searchDisplay[] = "Authorized Site: none";
 		}else if ($search['authorizedSiteID']){
-			$whereAdd[] = "RAUSL.authorizedSiteID = '" . mysql_real_escape_string($search['authorizedSiteID']) . "'";
+			$whereAdd[] = "RAUSL.authorizedSiteID = '" . $this->db->escapeString($search['authorizedSiteID']) . "'";
 			$authorizedSite = new AuthorizedSite(new NamedArguments(array('primaryKey' => $search['authorizedSiteID'])));
     	$searchDisplay[] = "Authorized Site: " . $authorizedSite->shortName;
 		}
@@ -1082,7 +1082,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RADSL.administeringSiteID IS NULL";
 			$searchDisplay[] = "Administering Site: none";
 		}else if ($search['administeringSiteID']){
-			$whereAdd[] = "RADSL.administeringSiteID = '" . mysql_real_escape_string($search['administeringSiteID']) . "'";
+			$whereAdd[] = "RADSL.administeringSiteID = '" . $this->db->escapeString($search['administeringSiteID']) . "'";
 			$administeringSite = new AdministeringSite(new NamedArguments(array('primaryKey' => $search['administeringSiteID'])));
     	$searchDisplay[] = "Administering Site: " . $administeringSite->shortName;
 		}
@@ -1092,7 +1092,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "R.authenticationTypeID IS NULL";
 			$searchDisplay[] = "Authentication Type: none";
 		}else if ($search['authenticationTypeID']){
-			$whereAdd[] = "R.authenticationTypeID = '" . mysql_real_escape_string($search['authenticationTypeID']) . "'";
+			$whereAdd[] = "R.authenticationTypeID = '" . $this->db->escapeString($search['authenticationTypeID']) . "'";
 			$authenticationType = new AuthenticationType(new NamedArguments(array('primaryKey' => $search['authenticationTypeID'])));
 			$searchDisplay[] = "Authentication Type: " . $authenticationType->shortName;
 		}
@@ -1101,7 +1101,7 @@ public static function getSearchDetails() {
 		  $whereAdd[] = "(R.catalogingStatusID IS NULL)";
 		  $searchDisplay[] = "Cataloging Status: none";
 		} else if ($search['catalogingStatusID']) {
-			$whereAdd[] = "R.catalogingStatusID = '" . mysql_real_escape_string($search['catalogingStatusID']) . "'";
+			$whereAdd[] = "R.catalogingStatusID = '" . $this->db->escapeString($search['catalogingStatusID']) . "'";
 			$catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $search['catalogingStatusID'])));
 		  $searchDisplay[] = "Cataloging Status: " . $catalogingStatus->shortName;
 	  }
@@ -1254,12 +1254,12 @@ public function searchCount($whereAdd) {
 	//used for A-Z on search (index)
 	public function getAlphabeticalList(){
 		$alphArray = array();
-		$result = mysql_query("SELECT DISTINCT UPPER(SUBSTR(TRIM(LEADING 'The ' FROM titleText),1,1)) letter, COUNT(SUBSTR(TRIM(LEADING 'The ' FROM titleText),1,1)) letter_count
+		$result = $this->db->query("SELECT DISTINCT UPPER(SUBSTR(TRIM(LEADING 'The ' FROM titleText),1,1)) letter, COUNT(SUBSTR(TRIM(LEADING 'The ' FROM titleText),1,1)) letter_count
 								FROM Resource R
 								GROUP BY SUBSTR(TRIM(LEADING 'The ' FROM titleText),1,1)
 								ORDER BY 1;");
 
-		while ($row = mysql_fetch_assoc($result)){
+		while ($row = $result->fetch_assoc()){
 			$alphArray[$row['letter']] = $row['letter_count'];
 		}
 
@@ -1474,8 +1474,8 @@ public function getOrganizationArray(){
 				//first, get the organization name
 				$query = "SELECT name FROM " . $dbName . ".Organization WHERE organizationID = " . $result['organizationID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organization'] = $orgRow['name'];
 						$orgArray['organizationID'] = $result['organizationID'];
 					}
@@ -1484,8 +1484,8 @@ public function getOrganizationArray(){
 				//then, get the role name
 				$query = "SELECT * FROM " . $dbName . ".OrganizationRole WHERE organizationRoleID = " . $result['organizationRoleID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organizationRoleID'] = $orgRow['organizationRoleID'];
 						$orgArray['organizationRole'] = $orgRow['shortName'];
 					}
@@ -1500,8 +1500,8 @@ public function getOrganizationArray(){
 					//first, get the organization name
 					$query = "SELECT name FROM " . $dbName . ".Organization WHERE organizationID = " . $row['organizationID'];
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organization'] = $orgRow['name'];
 							$orgArray['organizationID'] = $row['organizationID'];
 						}
@@ -1511,8 +1511,8 @@ public function getOrganizationArray(){
 					$query = "SELECT * FROM " . $dbName . ".OrganizationRole WHERE organizationRoleID = " . $row['organizationRoleID'];
 
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organizationRoleID'] = $orgRow['organizationRoleID'];
 							$orgArray['organizationRole'] = $orgRow['shortName'];
 						}
@@ -1549,8 +1549,8 @@ public function getOrganizationArray(){
 				//first, get the organization name
 				$query = "SELECT shortName FROM Organization WHERE organizationID = " . $result['organizationID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organization'] = $orgRow['shortName'];
 						$orgArray['organizationID'] = $result['organizationID'];
 					}
@@ -1559,8 +1559,8 @@ public function getOrganizationArray(){
 				//then, get the role name
 				$query = "SELECT * FROM OrganizationRole WHERE organizationRoleID = " . $result['organizationRoleID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organizationRoleID'] = $orgRow['organizationRoleID'];
 						$orgArray['organizationRole'] = $orgRow['shortName'];
 					}
@@ -1575,8 +1575,8 @@ public function getOrganizationArray(){
 					//first, get the organization name
 					$query = "SELECT shortName FROM Organization WHERE organizationID = " . $row['organizationID'];
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organization'] = $orgRow['shortName'];
 							$orgArray['organizationID'] = $row['organizationID'];
 						}
@@ -1586,8 +1586,8 @@ public function getOrganizationArray(){
 					$query = "SELECT * FROM OrganizationRole WHERE organizationRoleID = " . $row['organizationRoleID'];
 
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organizationRoleID'] = $orgRow['organizationRoleID'];
 							$orgArray['organizationRole'] = $orgRow['shortName'];
 						}
@@ -1636,8 +1636,8 @@ public function getDistinctOrganizationArray(){
 				//first, get the organization name
 				$query = "SELECT name FROM " . $dbName . ".Organization WHERE organizationID = " . $result['organizationID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organization'] = $orgRow['name'];
 						$orgArray['organizationID'] = $result['organizationID'];
 					}
@@ -1652,8 +1652,8 @@ public function getDistinctOrganizationArray(){
 					//first, get the organization name
 					$query = "SELECT DISTINCT name FROM " . $dbName . ".Organization WHERE organizationID = " . $row['organizationID'];
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organization'] = $orgRow['name'];
 							$orgArray['organizationID'] = $row['organizationID'];
 						}
@@ -1690,8 +1690,8 @@ public function getDistinctOrganizationArray(){
 				//first, get the organization name
 				$query = "SELECT DISTINCT shortName FROM Organization WHERE organizationID = " . $result['organizationID'];
 
-				if ($orgResult = mysql_query($query)){
-					while ($orgRow = mysql_fetch_assoc($orgResult)){
+				if ($orgResult = $this->db->query($query)){
+					while ($orgRow = $orgResult->fetch_assoc()){
 						$orgArray['organization'] = $orgRow['shortName'];
 						$orgArray['organizationID'] = $result['organizationID'];
 					}
@@ -1706,8 +1706,8 @@ public function getDistinctOrganizationArray(){
 					//first, get the organization name
 					$query = "SELECT DISTINCT shortName FROM Organization WHERE organizationID = " . $row['organizationID'];
 
-					if ($orgResult = mysql_query($query)){
-						while ($orgRow = mysql_fetch_assoc($orgResult)){
+					if ($orgResult = $this->db->query($query)){
+						while ($orgRow = $orgResult->fetch_assoc()){
 							$orgArray['organization'] = $orgRow['shortName'];
 							$orgArray['organizationID'] = $row['organizationID'];
 						}
@@ -1934,12 +1934,12 @@ public function removeResourceSteps(){
 	//search used for the resource autocomplete
 	public function resourceAutocomplete($q){
 		$resourceArray = array();
-		$result = mysql_query("SELECT titleText, resourceID
+		$result = $this->db->query("SELECT titleText, resourceID
 								FROM Resource
 								WHERE upper(titleText) like upper('%" . $q . "%')
 								ORDER BY 1;");
 
-		while ($row = mysql_fetch_assoc($result)){
+		while ($row = $result->fetch_assoc()){
 			$resourceArray[] = $row['titleText'] . "|" . $row['resourceID'];
 		}
 
@@ -1956,7 +1956,7 @@ public function organizationAutocomplete($q){
 		if ($config->settings->organizationsModule == 'Y'){
 			$dbName = $config->settings->organizationsDatabaseName;
 
-			$result = mysql_query("SELECT CONCAT(A.name, ' (', O.name, ')') shortName, O.organizationID
+			$result = $this->db->query("SELECT CONCAT(A.name, ' (', O.name, ')') shortName, O.organizationID
 									FROM " . $dbName . ".Alias A, " . $dbName . ".Organization O
 									WHERE A.organizationID=O.organizationID
 									AND upper(A.name) like upper('%" . $q . "%')
@@ -1968,7 +1968,7 @@ public function organizationAutocomplete($q){
 
 		}else{
 
-			$result = mysql_query("SELECT organizationID, shortName
+			$result = $this->db->query("SELECT organizationID, shortName
 									FROM Organization O
 									WHERE upper(O.shortName) like upper('%" . $q . "%')
 									ORDER BY shortName;");
@@ -1976,7 +1976,7 @@ public function organizationAutocomplete($q){
 		}
 
 
-		while ($row = mysql_fetch_assoc($result)){
+		while ($row = $result->fetch_assoc()){
 			$organizationArray[] = $row['shortName'] . "|" . $row['organizationID'];
 		}
 
@@ -1997,14 +1997,14 @@ public function licenseAutocomplete($q){
 		if ($config->settings->licensingModule == 'Y'){
 			$dbName = $config->settings->licensingDatabaseName;
 
-			$result = mysql_query("SELECT shortName, licenseID
+			$result = $this->db->query("SELECT shortName, licenseID
 									FROM " . $dbName . ".License
 									WHERE upper(shortName) like upper('%" . $q . "%')
 									ORDER BY 1;");
 
 		}
 
-		while ($row = mysql_fetch_assoc($result)){
+		while ($row = $result->fetch_assoc()){
 			$licenseArray[] = $row['shortName'] . "|" . $row['licenseID'];
 		}
 
diff --git a/admin/classes/domain/ResourcePayment.php b/admin/classes/domain/ResourcePayment.php
index 5f28094..b44a984 100644
--- a/admin/classes/domain/ResourcePayment.php
+++ b/admin/classes/domain/ResourcePayment.php
@@ -30,12 +30,12 @@ public function getPaymentAmountChangeFromPreviousYear(){
 		$currency = $this->currencyCode;
 		if ((isset($year)) && ($year != '')){
 			$sql = "SELECT SUM(paymentAmount) AS total FROM ResourcePayment WHERE resourceID = '%s' AND year = '%s' AND currencyCode = '%s'";
-			$currency = mysql_real_escape_string($currency);
-			$query = sprintf($sql, $id, mysql_real_escape_string(previous_year($year)), $currency);
+			$currency = $this->db->escapeString($currency);
+			$query = sprintf($sql, $id, $this->db->escapeString(previous_year($year)), $currency);
 			$result = $this->db->processQuery($query, 'assoc');
 			if ((isset($result['total'])) && ($result['total'] > 0)){
 				$prev_total = $result['total'];
-				$query = sprintf($sql, $id, mysql_real_escape_string($year), $currency);
+				$query = sprintf($sql, $id, $this->db->escapeString($year), $currency);
 				$result = $this->db->processQuery($query, 'assoc');
 				if (isset($result['total'])){
 					return sprintf('%+.1f', 100 * ( ($result['total'] - $prev_total) / $prev_total ));
diff --git a/import.php b/import.php
index 03cb76b..486ea7d 100644
--- a/import.php
+++ b/import.php
@@ -133,7 +133,7 @@
               $result = $organization->db->processQuery($query, 'assoc');
               // If not, we try to create it
               if ($result['count'] == 0) {
-                $query = "INSERT INTO $dbName.Organization SET createDate=NOW(), createLoginID='$loginID', name='" . mysql_escape_string($organizationName) . "'";
+                $query = "INSERT INTO $dbName.Organization SET createDate=NOW(), createLoginID='$loginID', name='" . $organization->db->escapeString($organizationName) . "'";
                 try {
                   $result = $organization->db->processQuery($query);
                   $organizationID = $result;
@@ -154,7 +154,7 @@
               if ($organizationID) {
                 $dbName = $config->settings->organizationsDatabaseName;
                 // Get role
-                $query = "SELECT organizationRoleID from OrganizationRole WHERE shortName='" . mysql_escape_string($data[$_POST['role']]) . "'";
+                $query = "SELECT organizationRoleID from OrganizationRole WHERE shortName='" . $organization->db->escapeString($data[$_POST['role']]) . "'";
                 $result = $organization->db->processQuery($query);
                 // If role is not found, fallback to the first one.
                 $roleID = ($result[0]) ? $result[0] : 1;
diff --git a/install/CORALInstaller.php b/install/CORALInstaller.php
index b391a13..a8b7c0b 100644
--- a/install/CORALInstaller.php
+++ b/install/CORALInstaller.php
@@ -9,8 +9,8 @@ function debug($value) {
 }
 
 class CORALInstaller {
-  
-  protected $db;
+
+  public $db; // because CORALInstaller::query does unwanted things with result
   public $error;
   protected $statusNotes;
   protected $config;
@@ -82,17 +82,17 @@ public function connect($username = null, $password = null) {
 		if ($password === null) {
 		  $password = $this->config->database->password;
 	  }
-		$this->db = @mysql_connect($host, $username, $password);
-		if (!$this->db) {
-		  
-		  $this->error = mysql_error();
+		$this->db = new mysqli($host, $username, $password);
+		if ($this->db->connect_error) {
+
+		  $this->error = $this->db->connect_error;
 		  if (!$this->error) {
 		    $this->error = "Access denied for user '$username'";
 		  }
 	  } else {
   		$databaseName = $this->config->database->name;
-  		mysql_select_db($databaseName, $this->db);
-  		$this->error = mysql_error($this->db);
+  		$this->db->select_db($databaseName);
+  		$this->error = $this->db->error;
 		}
 		
 		if ($this->error) {
@@ -102,26 +102,32 @@ public function connect($username = null, $password = null) {
       $this->statusNotes['database_connection'] = "Database connection successful";
     }
 	}
-	
-	public function query($sql) {
-		$result = mysql_query($sql, $this->db);
-		
+
+    public function query($sql) {
+        $result = $this->db->query($sql);
+        $this->checkForError();
+        return $result;
+    }
+
+	public function processQuery($sql) {
+		$result = $this->db->query($sql);
+
 		$this->checkForError();
 		$data = array();
 
-		if (is_resource($result)) {
-			while ($row = mysql_fetch_array($result)) {
+		if ($result instanceof mysqli_result) {
+			while ($row = $result->fetch_array()) {
 				array_push($data, $row);
 			}
 		} else if ($result) {
-			$data = mysql_insert_id($this->db);
+			$data = $this->db->insert_id;
 		}
 
 		return $data;
 	}
 	
 	protected function checkForError() {
-		if ($this->error = mysql_error($this->db)) {
+		if ($this->error = $this->db->error) {
 			throw new Exception("There was a problem with the database: " . $this->error);
 		}
 	}
diff --git a/install/install.php b/install/install.php
index 7d3e7e4..8c4efd4 100644
--- a/install/install.php
+++ b/install/install.php
@@ -33,22 +33,22 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
+		if ($link->connect_error) {
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->error;
 		}else{
 
 			//next check that the database exists
-			$dbcheck = @mysql_select_db("$database_name");
+			$dbcheck = $link->select_db("$database_name");
 			if (!$dbcheck) {
-				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . mysql_error();
+				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . $link->error;
 			}else{
 
 				//make sure the tables don't already exist - otherwise this script will overwrite all of the data!
 				$query = "SELECT count(*) count FROM information_schema.`COLUMNS` WHERE table_schema = '" . $database_name . "' AND table_name='Resource'";
 
 				//if Resource table exists, error out
-				if (!$row = mysql_fetch_array(mysql_query($query))){
+				if (!$row = $link->query($query)->fetch_array()){
 					$errorMessage[] = "Please verify your database user has access to select from the information_schema MySQL metadata database.";
 				}else{
 					if ($row['count'] > 0){
@@ -75,9 +75,9 @@
 							foreach ($sqlArray as $stmt) {
 							   if (strlen(trim($stmt))>3){
 
-									$result = mysql_query($stmt);
+									$result = $link->query($stmt);
 									if (!$result){
-										$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
+										$errorMessage[] = $link->error . "<br /><br />For statement: " . $stmt;
 										 break;
 									}
 								}
@@ -100,9 +100,9 @@
 								foreach ($sqlArray as $stmt) {
 								   if (strlen(trim($stmt))>3){
 
-										$result = mysql_query($stmt);
+										$result = $link->query($stmt);
 										if (!$result){
-											$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
+											$errorMessage[] = $link->error . "<br /><br />For statement: " . $stmt;
 											 break;
 										}
 									}
@@ -141,30 +141,30 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
+		if ($link->connect_error) {
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->error;
 		}else{
 
 			//next check that the database exists
-			$dbcheck = @mysql_select_db("$database_name");
+			$dbcheck = $link->select_db("$database_name");
 			if (!$dbcheck) {
-				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . mysql_error();
+				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . $link->error;
 			}else{
 				//passed db host, name check, test that user can select from License database
-				$result = mysql_query("SELECT privilegeID FROM " . $database_name . ".Privilege WHERE shortName like '%admin%';");
+				$result = $link->query("SELECT privilegeID FROM " . $database_name . ".Privilege WHERE shortName like '%admin%';");
 				if (!$result){
-					$errorMessage[] = "Unable to select from the Privilege table in database '" . $database_name . "' with user '" . $database_username . "'.  Error: " . mysql_error();
+					$errorMessage[] = "Unable to select from the Privilege table in database '" . $database_name . "' with user '" . $database_username . "'.  Error: " . $link->error;
 				}else{
-					while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
+					while ($row = $result->fetch_array(MYSQLI_NUM)) {
 						$privilegeID = $row[0];
 					}
 
 					//delete admin user if they exist, then set them back up
 					$query = "DELETE FROM " . $database_name . ".User;";
-					mysql_query($query);
+					$link->query($query);
 					$query = "INSERT INTO " . $database_name . ".User (loginID, privilegeID) values ('" . $admin_login . "', " . $privilegeID . ");";
-					mysql_query($query);
+					$link->query($query);
 				}
 
 			}
@@ -210,9 +210,9 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
+		if ($link->connect_error) {
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->error;
 		}
 
 
@@ -236,21 +236,21 @@
 		if (($authDatabaseName) && ($_POST['authModule'])){
 
 			//first check connecting to host
-			$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-			if (!$link) {
-				$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+			$link = new mysqli("$database_host", "$database_username", "$database_password");
+			if ($link->connect_error) {
+				$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->error;
 			}else{
 
 				//next check that the database exists
-				$dbcheck = @mysql_select_db("$authDatabaseName");
+				$dbcheck = $link->select_db("$authDatabaseName");
 				if (!$dbcheck) {
-					$errorMessage[] = "Unable to access the auth database '" . $authDatabaseName . "'.  Please verify it has been created.<br />MySQL Error: " . mysql_error();
+					$errorMessage[] = "Unable to access the auth database '" . $authDatabaseName . "'.  Please verify it has been created.<br />MySQL Error: " . $link->error;
 				}else{
 					//make sure the tables don't already exist - otherwise this script will overwrite all of the data!
 					$query = "SELECT count(*) count FROM information_schema.`COLUMNS` WHERE table_schema = '" . $authDatabaseName . "' AND table_name='Session'";
 
 					//if auth table exists, error out
-					if (!$row = mysql_fetch_array(mysql_query($query))){
+					if (!$row = $link->query($query)->fetch_array()){
 						$errorMessage[] = "Please verify your database user has access to select from the the auth tables and the information_schema MySQL metadata database.";
 					}else{
 						if ($row['count'] == 0){
diff --git a/install/update.php b/install/update.php
index 760d0e9..0b3710b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -37,11 +37,12 @@
 			foreach ($statements as $statement) {
 			   if (strlen(trim($statement))>3){
 
-					$result = mysql_query($statement);
-					if (!$result){
-						$installer->addErrorMessage(mysql_error() . "<br /><br />For statement: " . $statement);
-						break;
-					}
+					$result = $installer->db->query($statement);
+                        if (!$result){
+                        $installer->addErrorMessage($installer->db->error . "<br /><br />For statement: " . $statement);
+                        break;
+                    }
+
 				}
 			}
       
diff --git a/install/upgrade_beta.php b/install/upgrade_beta.php
index 84cbc9f..57073d2 100644
--- a/install/upgrade_beta.php
+++ b/install/upgrade_beta.php
@@ -25,22 +25,22 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
+		if ($link->connect_error) {
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->connect_error;
 		}else{
 
 			//next check that the database exists
-			$dbcheck = @mysql_select_db("$database_name");
+			$dbcheck = $link->select_db("$database_name");
 			if (!$dbcheck) {
-				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . mysql_error();
+				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . $link->error;
 			}else{
 
 				//make sure the tables don't already exist - otherwise this script will overwrite all of the data!
 				$query = "SELECT count(*) count FROM information_schema.`COLUMNS` WHERE table_schema = '" . $database_name . "' AND table_name='Resource'";
 
 				//if Resource table exists, error out
-				if (!$row = mysql_fetch_array(mysql_query($query))){
+				if (!$row = $link->query($query)->fetch_array()){
 					$errorMessage[] = "Please verify your database user has access to select from the information_schema MySQL metadata database.";
 				}else{
 
@@ -63,9 +63,9 @@
 							foreach ($sqlArray as $stmt) {
 							   if (strlen(trim($stmt))>3){
 
-									$result = mysql_query($stmt);
+									$result = $link->query($stmt);
 									if (!$result){
-										$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
+										$errorMessage[] = $link->error . "<br /><br />For statement: " . $stmt;
 										 break;
 									}
 								}
@@ -90,9 +90,9 @@
 								foreach ($sqlArray as $stmt) {
 								   if (strlen(trim($stmt))>3){
 
-										$result = mysql_query($stmt);
+										$result = $link->query($stmt);
 										if (!$result){
-											$errorMessage[] = mysql_error() . "<br /><br />For statement: " . $stmt;
+											$errorMessage[] = $link->error . "<br /><br />For statement: " . $stmt;
 											 break;
 										}
 									}
@@ -129,30 +129,30 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
-		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
+		if ($link->connect_error) {
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->connect_error;
 		}else{
 
 			//next check that the database exists
-			$dbcheck = @mysql_select_db("$database_name");
+			$dbcheck = $link->select_db("$database_name");
 			if (!$dbcheck) {
-				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . mysql_error();
+				$errorMessage[] = "Unable to access the database '" . $database_name . "'.  Please verify it has been created.<br />MySQL Error: " . $link->error;
 			}else{
 				//passed db host, name check, test that user can select from License database
-				$result = mysql_query("SELECT privilegeID FROM " . $database_name . ".Privilege WHERE shortName like '%admin%';");
+				$result = $link->query("SELECT privilegeID FROM " . $database_name . ".Privilege WHERE shortName like '%admin%';");
 				if (!$result){
-					$errorMessage[] = "Unable to select from the Privilege table in database '" . $database_name . "' with user '" . $database_username . "'.  Error: " . mysql_error();
+					$errorMessage[] = "Unable to select from the Privilege table in database '" . $database_name . "' with user '" . $database_username . "'.  Error: " . $link->error;
 				}else{
-					while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
+					while ($row = $result->fetch_array(MYSQLI_NUM)) {
 						$privilegeID = $row[0];
 					}
 
 					//delete admin user if they exist, then set them back up
 					$query = "DELETE FROM " . $database_name . ".User;";
-					mysql_query($query);
+					$link->query($query);
 					$query = "INSERT INTO " . $database_name . ".User (loginID, privilegeID) values ('" . $admin_login . "', " . $privilegeID . ");";
-					mysql_query($query);
+					$link->query($query);
 				}
 
 			}
@@ -196,9 +196,9 @@
 	}else{
 
 		//first check connecting to host
-		$link = @mysql_connect("$database_host", "$database_username", "$database_password");
+		$link = new mysqli("$database_host", "$database_username", "$database_password");
 		if (!$link) {
-			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . mysql_error();
+			$errorMessage[] = "Could not connect to the server '" . $database_host . "'<br />MySQL Error: " . $link->error;
 		}
 
 	}

From 09c38f651d2a414d9b65c3093137882076930456 Mon Sep 17 00:00:00 2001
From: bgarcia <brandon.garcia@my.wheaton.edu>
Date: Fri, 7 Aug 2015 15:47:03 -0500
Subject: [PATCH 154/159] fixed mistake in DBService::escapeString

---
 admin/classes/common/DBService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/classes/common/DBService.php b/admin/classes/common/DBService.php
index 1a69e06..e50405f 100644
--- a/admin/classes/common/DBService.php
+++ b/admin/classes/common/DBService.php
@@ -58,7 +58,7 @@ protected function disconnect() {
 	}
 
 	public function escapeString($value) {
-        return $this->db->escapeString($value);
+        return $this->db->real_escape_string($value);
 	}
 
     public function query($sql) {

From 9f975153ab0a4a5af7836cb8bf3a80da2f9d123d Mon Sep 17 00:00:00 2001
From: bgarcia <brandon.garcia@my.wheaton.edu>
Date: Mon, 10 Aug 2015 08:14:21 -0500
Subject: [PATCH 155/159] Found critical bug produced with mysql->mysqli
 update, changed 'is_resource' to 'instanceof mysqli_result'

---
 admin/classes/common/DBService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/classes/common/DBService.php b/admin/classes/common/DBService.php
index e50405f..17dbcef 100644
--- a/admin/classes/common/DBService.php
+++ b/admin/classes/common/DBService.php
@@ -73,7 +73,7 @@ public function processQuery($sql, $type = NULL) {
 		$this->checkForError();
 		$data = array();
 
-		if (is_resource($result)) {
+		if ($result instanceof mysqli_result) {
 			$resultType = MYSQLI_NUM;
 			if ($type == 'assoc') {
 				$resultType = MYSQLI_ASSOC;

From d8615162761f2e6477a7e1b8eb90ddc387aa7905 Mon Sep 17 00:00:00 2001
From: bgarcia <brandon.garcia@my.wheaton.edu>
Date: Mon, 10 Aug 2015 08:36:42 -0500
Subject: [PATCH 156/159] fixed references to 'this' in static context

---
 admin/classes/domain/Resource.php | 136 +++++++++++++++---------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/admin/classes/domain/Resource.php b/admin/classes/domain/Resource.php
index 1ab4579..083d380 100644
--- a/admin/classes/domain/Resource.php
+++ b/admin/classes/domain/Resource.php
@@ -20,7 +20,7 @@
 class Resource extends DatabaseObject {
 
 	protected function defineRelationships() {}
-  
+
   protected function defineIsbnOrIssn() {}
 
 	protected function overridePrimaryKeyName() {}
@@ -126,7 +126,7 @@ public function getParentResources(){
 	public function getChildResources(){
     return $this->getRelatedResources('relatedResourceID');
 	}
-  
+
   // return array of related resource objects
   private function getRelatedResources($key) {
 
@@ -862,7 +862,7 @@ public function getExternalLogins(){
 		return $objects;
 	}
 
-  
+
   public static function setSearch($search) {
 	$config = new Configuration;
 
@@ -871,7 +871,7 @@ public static function setSearch($search) {
 	  } else {
 		$orderBy = "R.createDate DESC, TRIM(LEADING 'THE ' FROM UPPER(R.titleText)) asc";
 	  }
-	
+
     $defaultSearchParameters = array(
 		"orderBy" => $orderBy,
 		"page" => 1,
@@ -887,24 +887,24 @@ public static function setSearch($search) {
     }
     $_SESSION['resourceSearch'] = $search;
   }
-  
+
   public static function resetSearch() {
     Resource::setSearch(array());
   }
-  
+
   public static function getSearch() {
     if (!isset($_SESSION['resourceSearch'])) {
       Resource::resetSearch();
     }
     return $_SESSION['resourceSearch'];
   }
-  
+
   public static function getSearchDetails() {
     // A successful mysqli_connect must be run before mysqli_real_escape_string will function.  Instantiating a resource model will set up the connection
     $resource = new Resource();
-    
+
     $search = Resource::getSearch();
-    
+
 		$whereAdd = array();
 		$searchDisplay = array();
 		$config = new Configuration();
@@ -912,7 +912,7 @@ public static function getSearchDetails() {
 
 		//if name is passed in also search alias, organizations and organization aliases
 		if ($search['name']) {
-			$nameQueryString = $this->db->escapeString(strtoupper($search['name']));
+			$nameQueryString = $resource->db->escapeString(strtoupper($search['name']));
 			$nameQueryString = preg_replace("/ +/", "%", $nameQueryString);
 		  $nameQueryString = "'%" . $nameQueryString . "%'";
 
@@ -926,22 +926,22 @@ public static function getSearchDetails() {
 				$whereAdd[] = "((UPPER(R.titleText) LIKE " . $nameQueryString . ") OR (UPPER(A.shortName) LIKE " . $nameQueryString . ") OR (UPPER(O.shortName) LIKE " . $nameQueryString . ") OR (UPPER(RP.titleText) LIKE " . $nameQueryString . ") OR (UPPER(RC.titleText) LIKE " . $nameQueryString . ") OR (UPPER(R.recordSetIdentifier) LIKE " . $nameQueryString . "))";
 
 			}
-			
+
 			$searchDisplay[] = "Name contains: " . $search['name'];
 		}
 
 		//get where statements together (and escape single quotes)
 		if ($search['resourceID']) {
-		  $whereAdd[] = "R.resourceID = '" . $this->db->escapeString($search['resourceID']) . "'";
+		  $whereAdd[] = "R.resourceID = '" . $resource->db->escapeString($search['resourceID']) . "'";
 		  $searchDisplay[] = "Resource ID: " . $search['resourceID'];
 	  }
 		if ($search['resourceISBNOrISSN']) {
-		  $resourceISBNOrISSN = $this->db->escapeString(str_replace("-","",$search['resourceISBNOrISSN']));
+		  $resourceISBNOrISSN = $resource->db->escapeString(str_replace("-","",$search['resourceISBNOrISSN']));
 		  $whereAdd[] = "REPLACE(I.isbnOrIssn,'-','') = '" . $resourceISBNOrISSN . "'";
 		  $searchDisplay[] = "ISSN/ISBN: " . $search['resourceISBNOrISSN'];
-		} 
+		}
 		if ($search['fund']) {
-		  $fund = $this->db->escapeString(str_replace("-","",$search['fund']));
+		  $fund = $resource->db->escapeString(str_replace("-","",$search['fund']));
 		  $whereAdd[] = "REPLACE(RPAY.fundName,'-','') = '" . $fund . "'";
 		  $searchDisplay[] = "Fund: " . $search['fund'];
 	  }
@@ -949,7 +949,7 @@ public static function getSearchDetails() {
     if ($search['stepName']) {
       $status = new Status();
       $completedStatusID = $status->getIDFromName('complete');
-      $whereAdd[] = "(R.statusID != $completedStatusID AND RS.stepName = '" . $this->db->escapeString($search['stepName']) . "' AND RS.stepStartDate IS NOT NULL AND RS.stepEndDate IS NULL)";
+      $whereAdd[] = "(R.statusID != $completedStatusID AND RS.stepName = '" . $resource->db->escapeString($search['stepName']) . "' AND RS.stepStartDate IS NOT NULL AND RS.stepEndDate IS NULL)";
       $searchDisplay[] = "Routing Step: " . $search['stepName'];
     }
 
@@ -961,15 +961,15 @@ public static function getSearchDetails() {
     }
 
 
-    
+
 		if ($search['statusID']) {
-		  $whereAdd[] = "R.statusID = '" . $this->db->escapeString($search['statusID']) . "'";
+		  $whereAdd[] = "R.statusID = '" . $resource->db->escapeString($search['statusID']) . "'";
 		  $status = new Status(new NamedArguments(array('primaryKey' => $search['statusID'])));
     	$searchDisplay[] = "Status: " . $status->shortName;
 	  }
-	  
+
 		if ($search['creatorLoginID']) {
-		  $whereAdd[] = "R.createLoginID = '" . $this->db->escapeString($search['creatorLoginID']) . "'";
+		  $whereAdd[] = "R.createLoginID = '" . $resource->db->escapeString($search['creatorLoginID']) . "'";
 
 		  $createUser = new User(new NamedArguments(array('primaryKey' => $search['creatorLoginID'])));
     	if ($createUser->firstName){
@@ -981,41 +981,41 @@ public static function getSearchDetails() {
 	  }
 
 		if ($search['resourceFormatID']) {
-		  $whereAdd[] = "R.resourceFormatID = '" . $this->db->escapeString($search['resourceFormatID']) . "'";
+		  $whereAdd[] = "R.resourceFormatID = '" . $resource->db->escapeString($search['resourceFormatID']) . "'";
 		  $resourceFormat = new ResourceFormat(new NamedArguments(array('primaryKey' => $search['resourceFormatID'])));
     	$searchDisplay[] = "Resource Format: " . $resourceFormat->shortName;
 	  }
-	  
+
 		if ($search['acquisitionTypeID']) {
-		  $whereAdd[] = "R.acquisitionTypeID = '" . $this->db->escapeString($search['acquisitionTypeID']) . "'";
+		  $whereAdd[] = "R.acquisitionTypeID = '" . $resource->db->escapeString($search['acquisitionTypeID']) . "'";
 		  $acquisitionType = new AcquisitionType(new NamedArguments(array('primaryKey' => $search['acquisitionTypeID'])));
     	$searchDisplay[] = "Acquisition Type: " . $acquisitionType->shortName;
 	  }
 
 
 		if ($search['resourceNote']) {
-		  $whereAdd[] = "UPPER(RN.noteText) LIKE UPPER('%" . $this->db->escapeString($search['resourceNote']) . "%')";
+		  $whereAdd[] = "UPPER(RN.noteText) LIKE UPPER('%" . $resource->db->escapeString($search['resourceNote']) . "%')";
 		  $searchDisplay[] = "Note contains: " . $search['resourceNote'];
 	  }
 
 		if ($search['createDateStart']) {
-		  $whereAdd[] = "R.createDate >= STR_TO_DATE('" . $this->db->escapeString($search['createDateStart']) . "','%m/%d/%Y')";
+		  $whereAdd[] = "R.createDate >= STR_TO_DATE('" . $resource->db->escapeString($search['createDateStart']) . "','%m/%d/%Y')";
 		  if (!$search['createDateEnd']) {
 		    $searchDisplay[] = "Created on or after: " . $search['createDateStart'];
 	    } else {
 	      $searchDisplay[] = "Created between: " . $search['createDateStart'] . " and " . $search['createDateEnd'];
 	    }
 	  }
-	  
+
 		if ($search['createDateEnd']) {
-		  $whereAdd[] = "R.createDate <= STR_TO_DATE('" . $this->db->escapeString($search['createDateEnd']) . "','%m/%d/%Y')";
+		  $whereAdd[] = "R.createDate <= STR_TO_DATE('" . $resource->db->escapeString($search['createDateEnd']) . "','%m/%d/%Y')";
 		  if (!$search['createDateStart']) {
 		    $searchDisplay[] = "Created on or before: " . $search['createDateEnd'];
 	    }
 	  }
 
 		if ($search['startWith']) {
-		  $whereAdd[] = "TRIM(LEADING 'THE ' FROM UPPER(R.titleText)) LIKE UPPER('" . $this->db->escapeString($search['startWith']) . "%')";
+		  $whereAdd[] = "TRIM(LEADING 'THE ' FROM UPPER(R.titleText)) LIKE UPPER('" . $resource->db->escapeString($search['startWith']) . "%')";
 		  $searchDisplay[] = "Starts with: " . $search['startWith'];
 	  }
 
@@ -1024,35 +1024,35 @@ public static function getSearchDetails() {
 			$whereAdd[] = "((R.resourceTypeID IS NULL) OR (R.resourceTypeID = '0'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['resourceTypeID']){
-			$whereAdd[] = "R.resourceTypeID = '" . $this->db->escapeString($search['resourceTypeID']) . "'";
+			$whereAdd[] = "R.resourceTypeID = '" . $resource->db->escapeString($search['resourceTypeID']) . "'";
 			$resourceType = new ResourceType(new NamedArguments(array('primaryKey' => $search['resourceTypeID'])));
     	$searchDisplay[] = "Resource Type: " . $resourceType->shortName;
 		}
-		
-		
+
+
 		if ($search['generalSubjectID'] == 'none'){
 			$whereAdd[] = "((GDLINK.generalSubjectID IS NULL) OR (GDLINK.generalSubjectID = '0'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['generalSubjectID']){
-			$whereAdd[] = "GDLINK.generalSubjectID = '" . $this->db->escapeString($search['generalSubjectID']) . "'";
+			$whereAdd[] = "GDLINK.generalSubjectID = '" . $resource->db->escapeString($search['generalSubjectID']) . "'";
 			$generalSubject = new GeneralSubject(new NamedArguments(array('primaryKey' => $search['generalSubjectID'])));
     	$searchDisplay[] = "General Subject: " . $generalSubject->shortName;
-		}		
+		}
 
 		if ($search['detailedSubjectID'] == 'none'){
 			$whereAdd[] = "((GDLINK.detailedSubjectID IS NULL) OR (GDLINK.detailedSubjectID = '0') OR (GDLINK.detailedSubjectID = '-1'))";
 			$searchDisplay[] = "Resource Type: none";
 		}else if ($search['detailedSubjectID']){
-			$whereAdd[] = "GDLINK.detailedSubjectID = '" . $this->db->escapeString($search['detailedSubjectID']) . "'";
+			$whereAdd[] = "GDLINK.detailedSubjectID = '" . $resource->db->escapeString($search['detailedSubjectID']) . "'";
 			$detailedSubject = new DetailedSubject(new NamedArguments(array('primaryKey' => $search['detailedSubjectID'])));
     	$searchDisplay[] = "Detailed Subject: " . $detailedSubject->shortName;
-		}			
-		
+		}
+
 		if ($search['noteTypeID'] == 'none'){
 			$whereAdd[] = "(RN.noteTypeID IS NULL) AND (RN.noteText IS NOT NULL)";
 			$searchDisplay[] = "Note Type: none";
 		}else if ($search['noteTypeID']){
-			$whereAdd[] = "RN.noteTypeID = '" . $this->db->escapeString($search['noteTypeID']) . "'";
+			$whereAdd[] = "RN.noteTypeID = '" . $resource->db->escapeString($search['noteTypeID']) . "'";
 			$noteType = new NoteType(new NamedArguments(array('primaryKey' => $search['noteTypeID'])));
     	$searchDisplay[] = "Note Type: " . $noteType->shortName;
 		}
@@ -1062,7 +1062,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RPSL.purchaseSiteID IS NULL";
 			$searchDisplay[] = "Purchase Site: none";
 		}else if ($search['purchaseSiteID']){
-			$whereAdd[] = "RPSL.purchaseSiteID = '" . $this->db->escapeString($search['purchaseSiteID']) . "'";
+			$whereAdd[] = "RPSL.purchaseSiteID = '" . $resource->db->escapeString($search['purchaseSiteID']) . "'";
 			$purchaseSite = new PurchaseSite(new NamedArguments(array('primaryKey' => $search['purchaseSiteID'])));
     	$searchDisplay[] = "Purchase Site: " . $purchaseSite->shortName;
 		}
@@ -1072,7 +1072,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RAUSL.authorizedSiteID IS NULL";
 			$searchDisplay[] = "Authorized Site: none";
 		}else if ($search['authorizedSiteID']){
-			$whereAdd[] = "RAUSL.authorizedSiteID = '" . $this->db->escapeString($search['authorizedSiteID']) . "'";
+			$whereAdd[] = "RAUSL.authorizedSiteID = '" . $resource->db->escapeString($search['authorizedSiteID']) . "'";
 			$authorizedSite = new AuthorizedSite(new NamedArguments(array('primaryKey' => $search['authorizedSiteID'])));
     	$searchDisplay[] = "Authorized Site: " . $authorizedSite->shortName;
 		}
@@ -1082,7 +1082,7 @@ public static function getSearchDetails() {
 			$whereAdd[] = "RADSL.administeringSiteID IS NULL";
 			$searchDisplay[] = "Administering Site: none";
 		}else if ($search['administeringSiteID']){
-			$whereAdd[] = "RADSL.administeringSiteID = '" . $this->db->escapeString($search['administeringSiteID']) . "'";
+			$whereAdd[] = "RADSL.administeringSiteID = '" . $resource->db->escapeString($search['administeringSiteID']) . "'";
 			$administeringSite = new AdministeringSite(new NamedArguments(array('primaryKey' => $search['administeringSiteID'])));
     	$searchDisplay[] = "Administering Site: " . $administeringSite->shortName;
 		}
@@ -1092,16 +1092,16 @@ public static function getSearchDetails() {
 			$whereAdd[] = "R.authenticationTypeID IS NULL";
 			$searchDisplay[] = "Authentication Type: none";
 		}else if ($search['authenticationTypeID']){
-			$whereAdd[] = "R.authenticationTypeID = '" . $this->db->escapeString($search['authenticationTypeID']) . "'";
+			$whereAdd[] = "R.authenticationTypeID = '" . $resource->db->escapeString($search['authenticationTypeID']) . "'";
 			$authenticationType = new AuthenticationType(new NamedArguments(array('primaryKey' => $search['authenticationTypeID'])));
 			$searchDisplay[] = "Authentication Type: " . $authenticationType->shortName;
 		}
-		
+
 		if ($search['catalogingStatusID'] == 'none') {
 		  $whereAdd[] = "(R.catalogingStatusID IS NULL)";
 		  $searchDisplay[] = "Cataloging Status: none";
 		} else if ($search['catalogingStatusID']) {
-			$whereAdd[] = "R.catalogingStatusID = '" . $this->db->escapeString($search['catalogingStatusID']) . "'";
+			$whereAdd[] = "R.catalogingStatusID = '" . $resource->db->escapeString($search['catalogingStatusID']) . "'";
 			$catalogingStatus = new CatalogingStatus(new NamedArguments(array('primaryKey' => $search['catalogingStatusID'])));
 		  $searchDisplay[] = "Cataloging Status: " . $catalogingStatus->shortName;
 	  }
@@ -1129,7 +1129,7 @@ public function searchQuery($whereAdd, $orderBy = '', $limit = '', $count = fals
 		}else{
 			$orgJoinAdd = "LEFT JOIN Organization O ON O.organizationID = ROL.organizationID";
 		}
-    
+
     $savedStatusID = intval($status->getIDFromName('saved'));
 		//also add to not retrieve saved records
 		$whereAdd[] = "R.statusID != " . $savedStatusID;
@@ -1196,7 +1196,7 @@ public function searchQuery($whereAdd, $orderBy = '', $limit = '', $count = fals
 									LEFT JOIN ResourceSubject RSUB ON R.resourceID = RSUB.resourceID
 									LEFT JOIN Resource RC ON RC.resourceID = RRC.resourceID
 									LEFT JOIN Resource RP ON RP.resourceID = RRP.relatedResourceID
-									LEFT JOIN GeneralDetailSubjectLink GDLINK ON RSUB.generalDetailSubjectLinkID = GDLINK.generalDetailSubjectLinkID									
+									LEFT JOIN GeneralDetailSubjectLink GDLINK ON RSUB.generalDetailSubjectLinkID = GDLINK.generalDetailSubjectLinkID
                   " . implode("\n", $additional_joins) . "
 								  " . $whereStatement . "
 								  " . $groupBy;
@@ -1244,9 +1244,9 @@ public function search($whereAdd, $orderBy, $limit){
 	public function searchCount($whereAdd) {
     $query = $this->searchQuery($whereAdd, '', '', true);
     $result = $this->db->processQuery($query, 'assoc');
-	
+
 	//echo $query;
-	
+
     return $result['count'];
   }
 
@@ -1299,7 +1299,7 @@ public function export($whereAdd, $orderBy){
 							LEFT JOIN ResourceLicenseStatus RLS ON RLS.resourceID = R.resourceID
 							LEFT JOIN LicenseStatus LS ON LS.licenseStatusID = RLS.licenseStatusID";
 
-			$licSelectAdd = "GROUP_CONCAT(DISTINCT L.shortName ORDER BY L.shortName DESC SEPARATOR '; ') licenseNames, 
+			$licSelectAdd = "GROUP_CONCAT(DISTINCT L.shortName ORDER BY L.shortName DESC SEPARATOR '; ') licenseNames,
 			        GROUP_CONCAT(DISTINCT LS.shortName, ': ', DATE_FORMAT(RLS.licenseStatusChangeDate, '%m/%d/%Y') ORDER BY RLS.licenseStatusChangeDate DESC SEPARATOR '; ') licenseStatuses, ";
 
 		}
@@ -1309,7 +1309,7 @@ public function export($whereAdd, $orderBy){
 		//also add to not retrieve saved records
 		$savedStatusID = intval($status->getIDFromName('saved'));
 		$whereAdd[] = "R.statusID != " . $savedStatusID;
-    
+
 		if (count($whereAdd) > 0){
 			$whereStatement = " WHERE " . implode(" AND ", $whereAdd);
 		}else{
@@ -1323,9 +1323,9 @@ public function export($whereAdd, $orderBy){
 						R.updateDate updateDate, S.shortName status,
 						RT.shortName resourceType, RF.shortName resourceFormat, R.orderNumber, R.systemNumber, R.resourceURL, R.resourceAltURL,
 						R.currentStartDate, R.currentEndDate, R.subscriptionAlertEnabledInd, AUT.shortName authenticationType,
-						AM.shortName accessMethod, SL.shortName storageLocation, UL.shortName userLimit, R.authenticationUserName, 
-						R.authenticationPassword, R.coverageText, CT.shortName catalogingType, CS.shortName catalogingStatus, R.recordSetIdentifier, R.bibSourceURL, 
-						R.numberRecordsAvailable, R.numberRecordsLoaded, R.hasOclcHoldings, I.isbnOrIssn, 
+						AM.shortName accessMethod, SL.shortName storageLocation, UL.shortName userLimit, R.authenticationUserName,
+						R.authenticationPassword, R.coverageText, CT.shortName catalogingType, CS.shortName catalogingStatus, R.recordSetIdentifier, R.bibSourceURL,
+						R.numberRecordsAvailable, R.numberRecordsLoaded, R.hasOclcHoldings, I.isbnOrIssn,
 						" . $orgSelectAdd . ",
 						" . $licSelectAdd . "
 						GROUP_CONCAT(DISTINCT A.shortName ORDER BY A.shortName DESC SEPARATOR '; ') aliases,
@@ -1373,7 +1373,7 @@ public function export($whereAdd, $orderBy){
 								" . $whereStatement . "
 								GROUP BY R.resourceID
 								ORDER BY " . $orderBy;
-		
+
 		$result = $this->db->processQuery(stripslashes($query), 'assoc');
 
 		$searchArray = array();
@@ -1778,7 +1778,7 @@ public function removeResource(){
 		$this->removeResourceLicenseStatuses();
 		$this->removeResourceOrganizations();
 		$this->removeResourcePayments();
-		$this->removeAllSubjects();		
+		$this->removeAllSubjects();
     $this->removeAllIsbnOrIssn();
 
 
@@ -2234,22 +2234,22 @@ public function completeWorkflow(){
 
 	//returns array of subject objects
 	public function getGeneralDetailSubjectLinkID(){
-			
-		$query = "SELECT 
+
+		$query = "SELECT
 				  GDL.generalDetailSubjectLinkID
 				FROM
 				  Resource R
 				  INNER JOIN ResourceSubject RSUB ON (R.resourceID = RSUB.resourceID)
 				  INNER JOIN GeneralDetailSubjectLink GDL ON (RSUB.generalDetailSubjectLinkID = GDL.generalDetailSubjectLinkID)
 				  LEFT OUTER JOIN GeneralSubject GS ON (GDL.generalSubjectID = GS.generalSubjectID)
-				  LEFT OUTER JOIN DetailedSubject DS ON (GDL.detailedSubjectID = DS.detailedSubjectID)			  
+				  LEFT OUTER JOIN DetailedSubject DS ON (GDL.detailedSubjectID = DS.detailedSubjectID)
 				WHERE
 				  R.resourceID = '" . $this->resourceID . "'
 				ORDER BY
 				  GS.shortName,
 				  DS.shortName";
-		
-		 
+
+
 		$result = $this->db->processQuery($query, 'assoc');
 
 		$objects = array();
@@ -2264,14 +2264,14 @@ public function getGeneralDetailSubjectLinkID(){
 				array_push($objects, $object);
 			}
 		}
-	
+
 		return $objects;
-	}	
+	}
 
 	//returns array of subject objects
 	public function getDetailedSubjects($resourceID, $generalSubjectID){
-			
-		$query = "SELECT 
+
+		$query = "SELECT
 			  RSUB.resourceID,
 			  GDL.detailedSubjectID,
 			  DetailedSubject.shortName,
@@ -2283,8 +2283,8 @@ public function getDetailedSubjects($resourceID, $generalSubjectID){
 			WHERE
 			  RSUB.resourceID = " . $resourceID . " AND GDL.generalSubjectID = " . $generalSubjectID . " ORDER BY DetailedSubject.shortName";
 
-		//echo $query . "<br>";  
-		 
+		//echo $query . "<br>";
+
 		$result = $this->db->processQuery($query, 'assoc');
 
 		$objects = array();
@@ -2301,7 +2301,7 @@ public function getDetailedSubjects($resourceID, $generalSubjectID){
 		}
 
 		return $objects;
-	}	
+	}
 
 
 	//removes all resource subjects
@@ -2312,8 +2312,8 @@ public function removeAllSubjects(){
 			WHERE resourceID = '" . $this->resourceID . "'";
 
 		$result = $this->db->processQuery($query);
-		
-	}	
+
+	}
 
   public function removeAllIsbnOrIssn() {
     $query = "DELETE

From 8162c0f2140991cc11ee97bb6d52317cebb4a195 Mon Sep 17 00:00:00 2001
From: jsavell <jsavell@library.tamu.edu>
Date: Tue, 22 Dec 2015 11:08:18 -0600
Subject: [PATCH 157/159] utilize string translation wrapper

---
 js/resource.js | 22 ++++++++++------------
 sendAlerts.php |  6 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/js/resource.js b/js/resource.js
index b512769..6f3a22a 100644
--- a/js/resource.js
+++ b/js/resource.js
@@ -88,18 +88,16 @@ $(document).ready(function(){
 		
 		var errors = [];
 
-		console.log($("#startDate").val());
-
 		if($("#startDate").val()=="") {	
 			errors.push({
-				message: "Must set a date.",
+				message: _("Must set a date."),
 				target: '#span_error_startDate'
 			});
 		} 
 
 		if($("#endDate").val()=="") {	
 			errors.push({
-				message: "Must set a date.",
+				message: _("Must set a date."),
 				target: '#span_error_endDate'
 			});
 		} 
@@ -153,14 +151,14 @@ $(document).ready(function(){
 
 		if($("#contactAddName").val() == "") {	
 			errors.push({
-				message: "New contact must have a name.",
+				message: _("New contact must have a name."),
 				target: '#span_error_contactAddName'
 			});
 		} 
 
 		if(!validateEmail($("#emailAddress").val())) {	
 			errors.push({
-				message: "CC must be a valid email.",
+				message: _("CC must be a valid email."),
 				target: '#span_error_contactEmailAddress'
 			});
 		} 
@@ -202,7 +200,7 @@ $(document).ready(function(){
 			$("#inputEmail").val('');
 			$('#span_error_contactIDs').html('');	
 		} else {
-			$('#span_error_contactIDs').html('CC must be a valid email.');
+			$('#span_error_contactIDs').html(_('CC must be a valid email.'));
 		}
 	});
 
@@ -449,22 +447,22 @@ function validateNewIssue () {
 	var appliesTo = false;
 
 	if (organization == '' || organization == null) {
-		$('#span_error_organizationId').html('Opening an issue requires a resource to be associated with an organization. Please contact your IT department.');
+		$('#span_error_organizationId').html(_('Opening an issue requires a resource to be associated with an organization. Please contact your IT department.'));
 		errorFlag=1;
 	}
 
 	if (contact == null || contact.length == 0) {
-		$('#span_error_contactName').html('A contact must be selected to continue.');
+		$('#span_error_contactName').html(_('A contact must be selected to continue.'));
 		errorFlag=1;
 	}
 
 	if (subject == '' || subject == null) {
-		$('#span_error_subjectText').html('A subject must be entered to continue.');
+		$('#span_error_subjectText').html(_('A subject must be entered to continue.'));
 		errorFlag=1;
 	}
 
 	if (body == '' || body == null) {
-		$('#span_error_bodyText').html('A body must be entered to continue.');
+		$('#span_error_bodyText').html(_('A body must be entered to continue.'));
 		errorFlag=1;
 	}
 
@@ -477,7 +475,7 @@ function validateNewIssue () {
 
 	if(!appliesTo) {
 		errorFlag=1;
-		$('#span_error_entities').html('An issue must be associated with an organization or resource(s).');
+		$('#span_error_entities').html(_('An issue must be associated with an organization or resource(s).'));
 	}
 	
  	if (errorFlag == 0){
diff --git a/sendAlerts.php b/sendAlerts.php
index 46cf7a3..f529e5f 100644
--- a/sendAlerts.php
+++ b/sendAlerts.php
@@ -82,14 +82,14 @@
 	if (count($alertableIssuesArray) > 0){
 		foreach($alertableIssuesArray as $alertableIssue) {
 			//start building the email body
-			$emailMessage = "This is a reminder that this issue needs to be revisited.\r\n\r\n
+			$emailMessage = _("This is a reminder that this issue needs to be revisited.\r\n\r\n
 			Body: {$alertableIssue['bodyText']}\r\n\r\n
 			Applies To: {$alertableIssue['appliesto']}\r\n
 			\r\n\r\nContacts: \r\n\r\n
-			{$alertableIssue['contacts']}\r\n";
+			{$alertableIssue['contacts']}\r\n");
 
 			foreach(explode(",", $alertableIssue['CCs']) as $emailAddr) {
-				mail($emailAddr, "Reminder: {$alertableIssue['subjectText']}",$emailMessage);
+				mail($emailAddr, _("Reminder: {$alertableIssue['subjectText']}"),$emailMessage);
 			}
 		}
 	} else {

From e08aa7aaab9a59e24c7be40ea471231910727249 Mon Sep 17 00:00:00 2001
From: Douglas Hahn <dhahn@tamu.edu>
Date: Mon, 18 Jan 2016 13:51:20 -0600
Subject: [PATCH 158/159] change update scripts to use UTF8

---
 install/protected/update_1.4.sql            | 14 +++++++-------
 install/protected/update_latin1-to-utf8.sql | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/install/protected/update_1.4.sql b/install/protected/update_1.4.sql
index 8b0e13a..7ff381f 100644
--- a/install/protected/update_1.4.sql
+++ b/install/protected/update_1.4.sql
@@ -10,7 +10,7 @@ CREATE TABLE `Issue` (
   `resolutionText` text,
   PRIMARY KEY (`issueID`),
   KEY `creatorID` (`creatorID`)
-) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueRelationship`;
@@ -21,7 +21,7 @@ CREATE TABLE `IssueRelationship` (
   `entityTypeID` int(11) NOT NULL,
   PRIMARY KEY (`issueRelationshipID`),
   KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueEntityType`;
@@ -29,7 +29,7 @@ CREATE TABLE `IssueEntityType` (
   `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `entityName` varchar(80) NOT NULL,
   PRIMARY KEY (`entityTypeID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueContact`;
@@ -38,7 +38,7 @@ CREATE TABLE `IssueContact` (
   `issueID` int(11) NOT NULL,
   `contactID` int(11) NOT NULL,
   PRIMARY KEY (`issueContactID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueEmail`;
@@ -48,7 +48,7 @@ CREATE TABLE `IssueEmail` (
   `email` varchar(120) NOT NULL,
   PRIMARY KEY (`IssueEmailID`),
   KEY `IssueID` (`IssueID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1 ;
 
 DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
@@ -64,11 +64,11 @@ CREATE TABLE IF NOT EXISTS `Downtime` (
   `note` TEXT DEFAULT NULL,
    PRIMARY KEY (`downtimeID`),
    KEY `IssueID` (`IssueID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8_general_ci;
 
 DROP TABLE IF EXISTS `DowntimeType`;
 CREATE TABLE IF NOT EXISTS `DowntimeType` (
   `downtimeTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `shortName` varchar(80) NOT NULL,
   PRIMARY KEY (`downtimeTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8_general_ci;
\ No newline at end of file
diff --git a/install/protected/update_latin1-to-utf8.sql b/install/protected/update_latin1-to-utf8.sql
index 49d52c1..1e34277 100644
--- a/install/protected/update_latin1-to-utf8.sql
+++ b/install/protected/update_latin1-to-utf8.sql
@@ -54,3 +54,23 @@ ALTER TABLE `DetailedSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general
 ALTER TABLE `GeneralDetailSubjectLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
 ALTER TABLE `ResourceSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
 ALTER TABLE `CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Issue` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `IssueRelationship` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `IssueEntityType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `IssueContact` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `IssueEmail` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `Downtime` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `DowntimeType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+
+
+
+
+
+
+
+
+
+
+
+

From 328fc5b4a9a7428b7aeea184c51046a510c568ed Mon Sep 17 00:00:00 2001
From: Douglas Hahn <dhahn@tamu.edu>
Date: Mon, 18 Jan 2016 15:10:12 -0600
Subject: [PATCH 159/159] Revise update and install

---
 install/protected/update_1.4.sql            | 15 +++++++-------
 install/protected/update_latin1-to-utf8.sql | 22 +--------------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/install/protected/update_1.4.sql b/install/protected/update_1.4.sql
index 7ff381f..b7683b7 100644
--- a/install/protected/update_1.4.sql
+++ b/install/protected/update_1.4.sql
@@ -10,8 +10,7 @@ CREATE TABLE `Issue` (
   `resolutionText` text,
   PRIMARY KEY (`issueID`),
   KEY `creatorID` (`creatorID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
-
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
 
 DROP TABLE IF EXISTS `IssueRelationship`;
 CREATE TABLE `IssueRelationship` (
@@ -21,7 +20,7 @@ CREATE TABLE `IssueRelationship` (
   `entityTypeID` int(11) NOT NULL,
   PRIMARY KEY (`issueRelationshipID`),
   KEY `issueID` (`issueID`,`entityID`,`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueEntityType`;
@@ -29,7 +28,7 @@ CREATE TABLE `IssueEntityType` (
   `entityTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `entityName` varchar(80) NOT NULL,
   PRIMARY KEY (`entityTypeID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueContact`;
@@ -38,7 +37,7 @@ CREATE TABLE `IssueContact` (
   `issueID` int(11) NOT NULL,
   `contactID` int(11) NOT NULL,
   PRIMARY KEY (`issueContactID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1;
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
 
 
 DROP TABLE IF EXISTS `IssueEmail`;
@@ -48,7 +47,7 @@ CREATE TABLE `IssueEmail` (
   `email` varchar(120) NOT NULL,
   PRIMARY KEY (`IssueEmailID`),
   KEY `IssueID` (`IssueID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8_general_ci AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1 ;
 
 DROP TABLE IF EXISTS `Downtime`;
 CREATE TABLE IF NOT EXISTS `Downtime` (
@@ -64,11 +63,11 @@ CREATE TABLE IF NOT EXISTS `Downtime` (
   `note` TEXT DEFAULT NULL,
    PRIMARY KEY (`downtimeID`),
    KEY `IssueID` (`IssueID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8_general_ci;
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
 
 DROP TABLE IF EXISTS `DowntimeType`;
 CREATE TABLE IF NOT EXISTS `DowntimeType` (
   `downtimeTypeID` int(11) NOT NULL AUTO_INCREMENT,
   `shortName` varchar(80) NOT NULL,
   PRIMARY KEY (`downtimeTypeID`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8_general_ci;
\ No newline at end of file
+) ENGINE=MyISAM DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT=1;
\ No newline at end of file
diff --git a/install/protected/update_latin1-to-utf8.sql b/install/protected/update_latin1-to-utf8.sql
index 1e34277..8e6d1f4 100644
--- a/install/protected/update_latin1-to-utf8.sql
+++ b/install/protected/update_latin1-to-utf8.sql
@@ -53,24 +53,4 @@ ALTER TABLE `GeneralSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_
 ALTER TABLE `DetailedSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
 ALTER TABLE `GeneralDetailSubjectLink` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
 ALTER TABLE `ResourceSubject` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `Issue` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `IssueRelationship` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `IssueEntityType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `IssueContact` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `IssueEmail` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `Downtime` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-ALTER TABLE `DowntimeType` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-
-
-
-
-
-
-
-
-
-
-
-
+ALTER TABLE `CostDetails` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;
\ No newline at end of file