New location for DSpace Project

git-svn-id: http://scm.dspace.org/svn/repo/dspace/tags/dspace-1_4_2@3767 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/CHANGES

@@ -1,7 +1,21 @@
-1.5 alpha 1
+1.4.2 final
 ===========
-(Andrea Bollini)
+(Mark Diggory)
-- SF Patch #1528142 Malformed OAI-PMH response: illegal bytes in UTF-8 for SF Bug #1490162
+- Fixed a bug introduced in patch 1655583
+
+1.4.2 beta
+===========
+
+(Mark Diggory/Graham Triggs)
+- SF Patch 1655583 Fixes issues with FilterMedia, the UI and Index locking, includes 
+  a lucene upgrade to support better management of index locking.
+  
+(Robert Tansley)
+- Fixes to QueryArgs and RegisterServlet that cause NullPointerExceptions on
+  invalid input
+
+(Flavio Botelho)
+- SF Patch #1601946 for SF Bug #1601875 - Makes javascript idependent to form position
 
 (Christophe Destin)
 - SF Patch #1582754 CreateAdministrator for dummies
@@ -20,13 +34,39 @@
 - SF Patch #1624212 for SF Bug #1606449 Improve usability of bitstream list in item display
 - SF Patch #1636954 for SF feature request #1636817 MyDSpace make group display configurable
 - SF Patch #1624323 for SF feature request #1549297 Refinement of enable suggest feature
+- Fix for SF Bug #1653151 Checker file shows filter-media (just a typo in header)
+- SF Patch #1676370 Bug #1648070 Statistics does not use navbar="admin"
+- Fix for SF Bug #1690573 dspace-admin, edit item trailing white spaces
+- SF Patch #1702177 For SF bug #1638605 bin/cleanup fails on deleted primary bitstream
+
+(Stuart Lewis)
+- SF Patch #1670110 for SF Bug #1670106 Onebox and textarea fail when visibility set to workflow
+- SF Patch #1628889 Improve file size descriptions in ItemTag
+
+(Monika Mevenkamp)
+- SF Patch #1654469 stat scripts always return exit code 1
 
 (K. Nakagami)
 - SF Patch #1591969 for SF bug #1583372 DCDate.toString returns invalid string
 - SF Patch #1621889 for SF Bug #1606789 When collection is deleted, mapped item remains in community
 
-(Dorothea Salo)
+(James Rutherford)
-- SF Patch #1557948 Link subjects and authors on item pages
+- SF Patch #1694943 for SF feature request #1691277 Importing: Workaround for ext3 subdirectory limitation
+- SF Patch #1695702 Update SubmitServlet to use default.language instead of "en" for SF bug 1636792 default.language not applied to new submissions
+- SF Patch #1699903 for SF Bug #1695692 make-release-package still uses CVS commands
+
+(Graham Triggs)
+- SF Patch #1688523 Bug fix - OAI harvest and Oracle
+- SF Patch #1660752 Workaround Numeric/Integer handling in Oracle
+- SF Patch #1665400 Oracle schema changes for CLOB columns
+- SF Patch #1655583 Avoid index lock with filter-media
+
+(Phillip Franks, Gramham Triggs, Stuart Lewis, Chris Yates, James Rutherford)
+- SF Patch #1445573 Stats not working in Oracle
+
+(Chris Yates)
+- SF Patch #1711982 Updates to short_description (null) field when editing/creat
+
 
 1.4.1 final
 ===========
@@ -158,7 +198,6 @@
 - SF patch #1556207 for SF bug #1554056 Community/collection handle URL with / redirects to homepage
 - SF patch #1571494  for SF bug  #1571490 - UTF-8 encoded characters in licence
 - SF patch #1571522  for SF  bug #1571519 - UTF-8 in statistics
-- SF Patch #1591871 Docs for google and html sitemaps
 
 (Mark Diggory)
 - SF patch #1523824 robots.txt to limit bots navigating author and date pages

dspace/KNOWN_BUGS

@@ -3,11 +3,7 @@ bug tracker:
 
 http://sourceforge.net/tracker/?group_id=19984&atid=119984
 
-Oracle compatibility: this release does not support Oracle. Check for patches or updates
-to this release to restore Oracle compatibility.
-
 1609427 OAI server doesn't generate resumption token
-1606789 When collection is deleted, mapped item remains in community
 1606458 The MyDSpace page is very unstructured
 1606456 wrong link to register
 1606447 Cache strength information
@@ -17,7 +13,6 @@ to this release to restore Oracle compatibility.
 1606439 Exception handling for deleting a metadata field
 1604365 Unbalanced brackets cause search error
 1596576 Stackable LDAP authentication does not work
-1583372 DCDate.toString returns invalid string when hour is zero
 1571645 NullPointerException possible in review.jsp
 1552792 Not possible to uncheck a primary bitstream
 1552760 Submit interface looks bad in Safari browser
@@ -29,13 +24,11 @@ to this release to restore Oracle compatibility.
 1520527 PluginManager messy fail
 1517528 Finishing a submission as a supervisor fails
 1506556 Textareas in Oracle (VARCHAR datatype)
-1490162 Malformed OAI-PMH response: illegal bytes in UTF-8
 1472729 Permissions for Approval Users
 1461607 errors on oracle -- database_schema_13-14.sql
 1461606 oracle errors on-- database_schema.sql (ORACLE version!)
 1460754 Problems with Long Java datatype and Oracle
 1456594 Collection Administrator can delete any item
-1456593 links to controlled vocab docs required
 1456590 Values of templates are not visible for the user
 1456587 Authorisation Policies
 1456580 admin redirected after item withdrawn
@@ -60,10 +53,8 @@ to this release to restore Oracle compatibility.
 1256920 Mapped Items not added to Community (DSpace 1.3.1)
 1242527 Duplicate Items during submission
 1238166 Multi Media and D-Space
-1217068 Failed to complete review in workflow
 1174342 Potencial Memory Issue for a large collection
 1173600 Items Mapper has memory issue for a large collection
 1169975 workspace item policy not updated after workflow change
 1155173 Forms in custom 'skin' break group admin tool
 1120726 Performance bottlekneck in Group.update()
-1076506 Templates applied to imported items

dspace/README

@@ -1,4 +1,4 @@
-DSpace Version 1.4.1, 8-December-2006
+DSpace Version 1.4.2, 8-May-2007
 
 Installation instructions are included in this release package.
 
@@ -18,5 +18,5 @@ mailing list.
 
 http://sourceforge.net/mail/?group_id=19984
 
-Copyright (c) 2002-2006, Hewlett-Packard Company and Massachusetts
+Copyright (c) 2002-2007, Hewlett-Packard Company and Massachusetts
 Institute of Technology.  All rights reserved.

dspace/bin/checker

@@ -2,7 +2,7 @@
 
 ###########################################################################
 #
-# filter-media
+# checker
 #
 # Version: $Revision$
 #

dspace/bin/index-all

@@ -2,7 +2,7 @@
 
 ###########################################################################
 #
-# install-configs
+# index-all
 #
 # Version: $Revision$
 #

dspace/bin/stat-general

@@ -81,6 +81,6 @@ $out_directory = "/dspace/log/";
 
 $general = "$dsrun org.dspace.app.statistics.LogAnalyser -out $out_directory$out_prefix$this_year-$this_month-$day$out_suffix";
 
-system($general);
+$status = system($general);
 
-exit(1);
+exit($status);

dspace/bin/stat-monthly

@@ -120,6 +120,6 @@ $out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suff
 # The command to generate the report
 $execute = "$dsrun org.dspace.app.statistics.LogAnalyser -start $start -end $end -out $out";
 
-system($execute);
+$status = system($general);
 
-exit(1);
+exit($status);

dspace/bin/stat-report-general

@@ -88,6 +88,6 @@ $out = $out_directory . $out_prefix . $this_year . "-" . $this_month . "-" . $da
 
 $general = "$dsrun org.dspace.app.statistics.ReportGenerator -format html -in $in -out $out";
 
-system($general);
+$status = system($general);
 
-exit(1);
+exit($status);

dspace/bin/stat-report-monthly

@@ -100,6 +100,6 @@ $out = $out_directory . $out_prefix . $this_year . "-" . $this_month . $out_suff
 # The command to generate the report
 $execute = "$dsrun org.dspace.app.statistics.ReportGenerator -format html -in $in -out $out";
 
-system($execute);
+$status = system($general);
 
-exit(1);
+exit($status);

dspace/bin/structure-builder

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+###########################################################################
+#
+# structure-builder
+#
+# Version: $Revision$
+#
+# Date: $Date$
+#
+# Copyright (c) 2007, Hewlett-Packard Company and Massachusetts
+# Institute of Technology.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Hewlett-Packard Company nor the name of the
+# Massachusetts Institute of Technology nor the names of their
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+#
+###########################################################################
+
+# Shell script to allow the creation of DSpace community and collection structure
+
+# Get the DSPACE/bin directory
+BINDIR=`dirname $0`
+
+$BINDIR/dsrun dsrun org.dspace.administer.StructBuilder $@

dspace/config/dc2mods.cfg

@@ -18,7 +18,7 @@ date.copyright = <mods:originInfo><mods:copyrightDate encoding="iso8601">%s</mod
 date.created = <mods:originInfo><mods:dateCreated encoding="iso8601">%s</mods:dateCreated></mods:originInfo>
 date.issued = <mods:originInfo><mods:dateIssued encoding="iso8601">%s</mods:dateIssued></mods:originInfo>
 date.submitted = <mods:extension><mods:dateSubmitted encoding="iso8601">%s</mods:dateSubmitted></mods:extension>
-date = <mods:originInfo><mods:dateOther encoding="iso8601">%s</mods:dateOther><mods:originInfo>
+date = <mods:originInfo><mods:dateOther encoding="iso8601">%s</mods:dateOther></mods:originInfo>
 description.abstract = <mods:abstract>%s</mods:abstract>
 description.provenance = <mods:note type="provenance">%s</mods:note>
 description.sponsorship = <mods:note type="sponsorship">%s</mods:note>

dspace/config/language-packs/Messages.properties

@@ -1097,7 +1097,7 @@ jsp.tools.confirm-delete-collection.info3 = All associated authorisation policie
 
 jsp.tools.confirm-delete-community.title = Delete Community
 jsp.tools.confirm-delete-community.heading = Delete Community: {0}
-jsp.tools.confirm-delete-community.confirm = Are you sure the collection <strong>{0}</strong> should be deleted?  This will delete:
+jsp.tools.confirm-delete-community.confirm = Are you sure the community <strong>{0}</strong> should be deleted?  This will delete:
 jsp.tools.confirm-delete-community.info1 = Any collections in the community that are not contained in other communities
 jsp.tools.confirm-delete-community.info2 = Any items and incomplete submissions in those collections that aren't contained in other collections
 jsp.tools.confirm-delete-community.info3 = The contents of those items

dspace/docs/application.html

@@ -630,26 +630,26 @@ archive_directory/
 
   <p><strong>Note:</strong> Before running the item importer over items previously exported from a DSpace instance, please first refer to <a href="application.html#transferitem">Transferring Items Between DSpace Instances</a>.</p>
 
-  <p>The item importer is in <code>org.dspace.app.itemimport.ItemImport</code>, and is run with the <code>dsrun</code> utility in the <code>dspace/bin</code> directory. Running it with -h gets the current command-line arguments. Another very important flag is the --test flag, which you can use with any command to simulate all of the actions it will perform without actually making any changes to your DSpace instance - very useful for validating your item directories before doing an import. In the importer's arguments you can use either the user's database ID or email address and the eperson ID, and the collection's database ID or handle as arguments. Currently with the importer you can add, remove, and replace items in a collection. If you specify more than one collection argument then the items will be imported to multiple collections, and the first collection specified becomes the "owning" collection. If there is an error and the import is aborted, there is a --resume flag that you can try to resume the import where you left off after you fix the error.</p>
+  <p>The item importer is in <code>org.dspace.app.itemimport.ItemImport</code>, and is run with the <code>import</code> utility in the <code>dspace/bin</code> directory. Running it with -h gets the current command-line arguments. Another very important flag is the --test flag, which you can use with any command to simulate all of the actions it will perform without actually making any changes to your DSpace instance - very useful for validating your item directories before doing an import. In the importer's arguments you can use either the user's database ID or email address and the eperson ID, and the collection's database ID or handle as arguments. Currently with the importer you can add, remove, and replace items in a collection. If you specify more than one collection argument then the items will be imported to multiple collections, and the first collection specified becomes the "owning" collection. If there is an error and the import is aborted, there is a --resume flag that you can try to resume the import where you left off after you fix the error.</p>
 
   <p>To add items to a collection with an EPerson as the submitter, type:</p>
   <pre>
-dsrun org.dspace.app.itemimport.ItemImport --add --eperson=joe@user.com  --collection=collectionID --source=items_dir --mapfile=mapfile
+[dspace]/bin/dsrun org.dspace.app.itemimport.ItemImport --add --eperson=joe@user.com  --collection=collectionID --source=items_dir --mapfile=mapfile
 </pre>
 
   <p>(or by using the short form)</p>
   <pre>
-dsrun org.dspace.app.itemimport.ItemImport -a -e joe@user.com  -c collectionID -s items_dir -m mapfile
+[dspace]/bin/dsrun org.dspace.app.itemimport.ItemImport -a -e joe@user.com  -c collectionID -s items_dir -m mapfile
 </pre>
 
   <p>which would then cycle through the archive directory's items, import them, and then generate a map file which stores the mapping of item directories to item handles. Save this map file! Using the map file you can then 'unimport' with the command:</p>
   <pre>
-dsrun org.dspace.app.itemimport.ItemImport --delete --mapfile=mapfile
+[dspace]/bin/dsrun org.dspace.app.itemimport.ItemImport --delete --mapfile=mapfile
 </pre>
 
   <p>The imported items listed in the map file would then be deleted. If you wish to replace previously imported items, you can give the command:</p>
   <pre>
-dsrun org.dspace.app.itemimport.ItemImport --replace --eperson=joe@user.com --collection=collectID --source=items_dir --mapfile=mapfile
+[dspace]/bin/dsrun org.dspace.app.itemimport.ItemImport --replace --eperson=joe@user.com --collection=collectID --source=items_dir --mapfile=mapfile
 </pre>
 
   <p>Replacing items uses the map file to replace the old items and still retain their handles.</p>
@@ -662,12 +662,12 @@ dsrun org.dspace.app.itemimport.ItemImport --replace --eperson=joe@user.com --co
 
   <p>The item exporter can export a single item or a collection of items, and creates a DSpace simple archive for each item to be exported. To export a collection's items you type:</p>
   <pre>
-dsrun org.dspace.app.itemexport.ItemExport --type=COLLECTION --id=collID --dest=dest_dir --number=seq_num
+[dspace]/bin/dsrun org.dspace.app.itemexport.ItemExport --type=COLLECTION --id=collID --dest=dest_dir --number=seq_num
 </pre>
 
   <p>The keyword <code>COLLECTION</code> means that you intend to export an entire collection. The ID can either be the database ID or the handle. The exporter will begin numbering the simple archives with the sequence number that you supply. To export a single item use the keyword <code>ITEM</code> and give the item ID as an argument:</p>
   <pre>
-dsrun org.dspace.app.itemexport.ItemExport --type=ITEM --id=itemID --dest=dest_dir --number=seq_num
+[dspace]/bin/dsrun org.dspace.app.itemexport.ItemExport --type=ITEM --id=itemID --dest=dest_dir --number=seq_num
 </pre>
 
   <p>Each exported item will have an additional file in its directory, named 'handle'. This will contain the handle that was assigned to the item, and this file will be read by the importer so that items exported and then imported to another machine will retain the item's original handle.</p>

dspace/docs/configure.html

@@ -1041,11 +1041,16 @@ For example:
          &nbsp;&nbsp;&nbsp;&nbsp;&lt;input-type&gt;twobox&lt;/input-type&gt;<br/>
          &nbsp;&nbsp;&nbsp;&nbsp;&lt;hint&gt; Enter appropriate subject keywords or phrases below. &lt;/hint&gt;<br/>
          &nbsp;&nbsp;&lt;required&gt;&lt;/required&gt;<br/>
-         <b>&nbsp;&nbsp;&lt;vocabulary&gt;nsi&lt;/vocabulary&gt;</b><br/>
+         <b>&nbsp;&nbsp;&lt;vocabulary [closed="false"]&gt;nsi&lt;/vocabulary&gt;</b><br/>
        &lt;/field&gt;<br/>
 </code>
 </p>
-
+<p>
+The vocabulary element has an optional boolean attribute <b>closed</b> that can be used to force input only with 
+the javascript of controlled-vocabulary add-on. 
+The default behaviour (i.e. without this attribute) is as set <b>closed="false"</b>.
+This allow the user also to enter the value in free way.
+</p>
 <p>
 The following vocabularies are currently available by default:
 </p>

dspace/docs/history.html

@@ -10,6 +10,44 @@
 <h1>DSpace System Documentation: Version History</h1>
 <p><a href="index.html">Back to contents</a></p>
 
+<h2><a name="version1_4_2">Changes in DSpace 1.4.2</a></h2>
+
+<h3>General Improvements</h3>
+
+<ul>
+    <li>Lots of improvements to DSIndexer</li>
+    <li>Improvements in controlled vocabulary support</li>
+    <li>Link to admin area in the navigation bar when logged in as an administrator</li>
+    <li>Refinement of enable suggest feature</li>
+    <li>Group display on MyDSpace page is now configurable</li>
+    <li>Lots of work on Oracle support</li>
+    <li>Fix for SF Bug #1653151 Checker file shows filter-media (just a typo in header)</li>
+    <li>Specify subdirectory limit in ItemExport</li>
+    <li>Stat scripts don't always return exit code 1</li>
+    <li>Improved file size descriptions in ItemTag</li>
+</ul>
+
+<h3>Bug fixes</h3>
+<ul>
+    <li>1638605 bin/cleanup fails on deleted primary bitstreams</li>
+    <li>1601946 Makes javascript independent to form position (in group/eperson selection)</li>
+    <li>1695692 make-release-package still uses CVS commands</li>
+    <li>1490162 dspace-admin, edit item trailing white spaces</li>
+    <li>1583372 DCDate.toString returns invalid string</li>
+    <li>1076506 Item import command line option for application of template</li>
+    <li>1606789 MyDSpace Group Membership Special Groups</li>
+    <li>1619439 When collection is deleted, mapped item remains in community</li>
+    <li>1217068 Failed to complete review in workflow</li>
+    <li>1606449 Improve usability of bitstream list in item display</li>
+    <li>1670106 Onebox and textarea fail when visibility set to workflow</li>
+    <li>1648070 Statistics does not use navbar="admin"</li>
+    <li>1456593 links to controlled vocab docs required</li>
+    <li>1653151 Checker file shows filter-media (just a typo in header)</li>
+    <li>1506556 Textareas in Oracle (VARCHAR datatype)</li>
+    <li>1460754 Problems with Long Java datatype and Oracle</li>
+    <li>1445573 Stats not working on Oracle </li>
+</ul>
+
 <h2><a name="version1_4_1">Changes in DSpace 1.4.1</a></h2>
 
 <h3>General Improvements</h3>
@@ -548,6 +586,6 @@ error)</li>
 expire.)</li>
 </ul>
 <hr>
-<address> Copyright &copy; 2002-2006 MIT and Hewlett Packard </address>
+<address> Copyright &copy; 2002-2007 MIT and Hewlett Packard </address>
 </body>
 </html>

dspace/docs/index.html

@@ -10,7 +10,7 @@
 
     <P>Authors: Robert Tansley, Mick Bass, Margret Branschofsky, Grace Carpenter, Greg McClellan, David Stuve, and others</P>
 
-    <P>For DSpace Version: <strong>1.4.1</strong> (8-December-2006)</P>
+    <P>For DSpace Version: <strong>1.4.2</strong> (8-May-2007)</P>
 
     <P><small>Documentation for other versions of DSpace are included with the source code.</small></P>
 
@@ -56,7 +56,8 @@
       </LI>
       <LI><A HREF="update.html">Updating a DSpace Installation</A>
         <UL>
-          <LI><A HREF="update.html#14_141">Updating From 1.4 to 1.4.1</A></LI>
+          <LI><A HREF="update.html#141_142">Updating From 1.4.1 to 1.4.2</A></LI>
+          <LI><A HREF="update.html#14_14x">Updating From 1.4 to 1.4.x</A></LI>
           <LI><A HREF="update.html#132_14">Updating From 1.3.x to 1.4.x</A></LI>
           <LI><A HREF="update.html#131_132">Updating From 1.3.1 to 1.3.2</A></LI>
           <LI><A HREF="update.html#12_13">Updating From 1.2.x to 1.3.x</A></LI>
@@ -148,6 +149,7 @@
       </LI>
       <LI><A HREF="history.html">Version History</A>
         <UL>
+          <LI><A HREF="history.html#version1_4_2">Changes in DSpace 1.4.2</A></LI>
           <LI><A HREF="history.html#version1_4_1">Changes in DSpace 1.4.1</A></LI>
           <LI><A HREF="history.html#version1_4">Changes in DSpace 1.4</A></LI>
           <LI><A HREF="history.html#version1_3_2">Changes in DSpace 1.3.2</A></LI>
@@ -170,7 +172,7 @@
     <HR>
 
     <ADDRESS>
-      Copyright &copy; 2002-2006 MIT and Hewlett Packard
+      Copyright &copy; 2002-2007 MIT and Hewlett Packard
     </ADDRESS>
   </BODY>
 </HTML>

dspace/docs/update.html

@@ -12,21 +12,24 @@
 
     <P>This section describes how to update a DSpace installation from one version to the next.  Details of the differences between the functionality of each version are given in the <A HREF="history.html">Version History</A> section.</P>
 
-    <h2><a name="14_141">Updating From 1.4 to 1.4.1</a></h2>
+    <h2><a name="141_142">Updating From 1.4.1 to 1.4.2</a></h2>
+See <A HREF="#14_14x">Updating From 1.4 to 1.4.x</A>; the same instructions apply.
 
-   <p>The changes in 1.4.1 are only code and configuration changes so the update is simply a matter of rebuilding the wars and slight changes to your config file.</p>
+    <h2><a name="14_14x">Updating From 1.4 to 1.4.x</a></h2>
 
-     <p>In the notes below <code><i>[dspace]</i></code> refers to the install directory for your existing DSpace installation, and <code><i>[dspace-1.4.1-source]</i></code> to the source directory for DSpace 1.4.1. Whenever you see these path references, be sure to replace them with the actual path names on your local system.</p>
+   <p>The changes in 1.4.x releases are only code and configuration changes so the update is simply a matter of rebuilding the wars and slight changes to your config file.</p>
+
+     <p>In the notes below <code><i>[dspace]</i></code> refers to the install directory for your existing DSpace installation, and <code><i>[dspace-1.4.x-source]</i></code> to the source directory for DSpace 1.4.x. Whenever you see these path references, be sure to replace them with the actual path names on your local system.</p>
 
      <ol>
-      <li><p>Get the new DSpace 1.4.1 source code from <a href="http://sourceforge.net/projects/dspace/">the DSpace page on SourceForge</a> and unpack it somewhere.  Do not unpack it on top of your existing installation!!</p></li>
+      <li><p>Get the new DSpace 1.4.x source code from <a href="http://sourceforge.net/projects/dspace/">the DSpace page on SourceForge</a> and unpack it somewhere.  Do not unpack it on top of your existing installation!!</p></li>
 
       <li><p>Copy the PostgreSQL driver JAR to the source tree.  For example:</p>
 
       <pre>cd <i>[dspace]</i>/lib
-cp postgresql.jar <i>[dspace-1.4.1-source]</i>/lib</pre></li>
+cp postgresql.jar <i>[dspace-1.4.x-source]</i>/lib</pre></li>
 
-      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.x-source]</i>/lib with the new version.</li>
 
       <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
 
@@ -48,15 +51,15 @@ cp postgresql.jar <i>[dspace-1.4.1-source]</i>/lib</pre></li>
 webui.html.max-depth-guess = 3</pre>
 	<p>If <code>webui.html.max-depth-guess</code> is not present in <code>dspace.cfg</code> the default value is used. If archiving entire web sites or deeply nested HTML documents it is advisable to change the default to a higher value more suitable for these types of materials.</p></li>
 
-      <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4.1 versions into your locally modified ones. You can use the <code>diff</code> command to compare your JSPs against the 1.4.1 versions to do this. You can also check against the <a href="http://dspace.cvs.sourceforge.net/dspace/">DSpace CVS</a>.</p></li>
+      <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4.x versions into your locally modified ones. You can use the <code>diff</code> command to compare your JSPs against the 1.4.x versions to do this. You can also check against the <a href="http://dspace.cvs.sourceforge.net/dspace/">DSpace CVS</a>.</p></li>
 
-      <li><p>In <code><i>[dspace-1.4.1-source]</i></code> run:</p>
+      <li><p>In <code><i>[dspace-1.4.x-source]</i></code> run:</p>
 
       <pre>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</pre></li>
 
-      <li><p>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.4.1-source]</i>/build</code> to the <code>webapps</code> sub-directory of your servlet container (e.g. Tomcat).  e.g.:</p>
+      <li><p>Copy the <code>.war</code> Web application files in <code><i>[dspace-1.4.x-source]</i>/build</code> to the <code>webapps</code> sub-directory of your servlet container (e.g. Tomcat).  e.g.:</p>
 
-      <pre>cp <i>[dspace-1.4.1-source]</i>/build/*.war <i>[tomcat]</i>/webapps</pre>
+      <pre>cp <i>[dspace-1.4.x-source]</i>/build/*.war <i>[tomcat]</i>/webapps</pre>
 
       <p>If you're using Tomcat, you need to delete the directories corresponding to the old <code>.war</code> files.  For example, if <code>dspace.war</code> is installed in <code><i>[tomcat]</i>/webapps/dspace.war</code>, you should delete the <code><i>[tomcat]</i>/webapps/dspace</code> directory.  Otherwise, Tomcat will continue to use the old code in that directory. </p></li>
 
@@ -86,7 +89,7 @@ webui.html.max-depth-guess = 3</pre>
       <pre>cd <i>[dspace]</i>/lib
 cp postgresql.jar <i>[dspace-1.4.x-source]</i>/lib</pre></li>
 
-      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.x-source]</i>/lib with the new version.</li>
 
       <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
 
@@ -675,7 +678,7 @@ ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</PRE></LI>
     <HR>
 
     <ADDRESS>
-      Copyright &copy; 2002-2004 MIT and Hewlett Packard
+      Copyright &copy; 2002-2007 MIT and Hewlett Packard
     </ADDRESS>
   </BODY>
 </HTML>

dspace/etc/oracle/ORACLE_README.txt

@@ -43,6 +43,16 @@ for now.  Note that with UTF-8 encoding that 4k could translate to 1300
 characters worst-case (every character taking up 3 bytes is the worst case
 scenario.)
 
+==UPDATE 5 April 2007==
+CLOBs are now used as follows:
+MetadataValue:text_value
+Community:introductory_text
+Community:copyright_text
+Collection:introductory_text
+Collection:license
+Collection:copyright_text
+==                   ==
+
 DatabaseManager had to have some of the type checking changed, because Oracle's
 JDBC driver is reporting INTEGERS as type DECIMAL.
 

dspace/etc/oracle/database_schema.sql

@@ -251,7 +251,7 @@ CREATE TABLE MetadataValue
   metadata_value_id  INTEGER PRIMARY KEY,
   item_id       INTEGER REFERENCES Item(item_id),
   metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
-  text_value VARCHAR2(4000),
+  text_value CLOB,
   text_lang  VARCHAR(64),
   place              INTEGER
 );
@@ -283,9 +283,9 @@ CREATE TABLE Community
   community_id      INTEGER PRIMARY KEY,
   name              VARCHAR2(128),
   short_description VARCHAR2(512),
-  introductory_text VARCHAR2(2000),
+  introductory_text CLOB,
   logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
-  copyright_text    VARCHAR2(2000),
+  copyright_text    CLOB,
   side_bar_text     VARCHAR2(2000)
 );
 
@@ -297,12 +297,12 @@ CREATE TABLE Collection
   collection_id     INTEGER PRIMARY KEY,
   name              VARCHAR2(128),
   short_description VARCHAR2(512),
-  introductory_text VARCHAR2(2000),
+  introductory_text CLOB,
   logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
   template_item_id  INTEGER REFERENCES Item(item_id),
   provenance_description  VARCHAR2(2000),
-  license           VARCHAR2(2000),
+  license           CLOB,
-  copyright_text    VARCHAR2(2000),
+  copyright_text    CLOB,
   side_bar_text     VARCHAR2(2000),
   workflow_step_1   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
   workflow_step_2   INTEGER REFERENCES EPersonGroup( eperson_group_id ),

dspace/etc/oracle/database_schema_14-142.sql

@@ -0,0 +1,164 @@
+--
+-- database_schema_14-142.sql
+--
+-- Version: $Revision: 1.0 $
+--
+-- Date:    $Date: 2007/02/21 06:06:55 $
+--
+-- Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+-- Institute of Technology.  All rights reserved.
+-- 
+-- Redistribution and use in source and binary forms, with or without
+-- modification, are permitted provided that the following conditions are
+-- met:
+-- 
+-- - Redistributions of source code must retain the above copyright
+-- notice, this list of conditions and the following disclaimer.
+-- 
+-- - Redistributions in binary form must reproduce the above copyright
+-- notice, this list of conditions and the following disclaimer in the
+-- documentation and/or other materials provided with the distribution.
+-- 
+-- - Neither the name of the Hewlett-Packard Company nor the name of the
+-- Massachusetts Institute of Technology nor the names of their
+-- contributors may be used to endorse or promote products derived from
+-- this software without specific prior written permission.
+-- 
+-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-- HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+-- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+-- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+-- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+-- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+-- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+-- USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+-- DAMAGE.
+
+--
+-- SQL commands to upgrade the database schema of a live DSpace 1.4 or 1.4.1
+-- to the DSpace 1.4.2 database schema
+-- 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. 
+
+---------------------------------------
+-- Update MetadataValue to include CLOB
+---------------------------------------
+
+CREATE TABLE MetadataValueTemp
+(
+  metadata_value_id  INTEGER PRIMARY KEY,
+  item_id       INTEGER REFERENCES Item(item_id),
+  metadata_field_id  INTEGER REFERENCES MetadataFieldRegistry(metadata_field_id),
+  text_value CLOB,
+  text_lang  VARCHAR(64),
+  place              INTEGER
+);
+
+INSERT INTO MetadataValueTemp
+SELECT * FROM MetadataValue;
+
+DROP VIEW dcvalue;
+DROP TABLE MetadataValue;
+ALTER TABLE MetadataValueTemp RENAME TO MetadataValue;
+
+CREATE VIEW dcvalue AS
+  SELECT MetadataValue.metadata_value_id AS "dc_value_id", MetadataValue.item_id,
+    MetadataValue.metadata_field_id AS "dc_type_id", MetadataValue.text_value,
+    MetadataValue.text_lang, MetadataValue.place
+  FROM MetadataValue, MetadataFieldRegistry
+  WHERE MetadataValue.metadata_field_id = MetadataFieldRegistry.metadata_field_id
+  AND MetadataFieldRegistry.metadata_schema_id = 1;
+
+CREATE INDEX metadatavalue_item_idx ON MetadataValue(item_id);
+CREATE INDEX metadatavalue_item_idx2 ON MetadataValue(item_id,metadata_field_id);
+
+------------------------------------
+-- Update Community to include CLOBs
+------------------------------------
+
+CREATE TABLE CommunityTemp
+(
+  community_id      INTEGER PRIMARY KEY,
+  name              VARCHAR2(128),
+  short_description VARCHAR2(512),
+  introductory_text CLOB,
+  logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
+  copyright_text    CLOB,
+  side_bar_text     VARCHAR2(2000)
+);
+
+INSERT INTO CommunityTemp
+SELECT * FROM Community;
+
+DROP TABLE Community CASCADE CONSTRAINTS;
+ALTER TABLE CommunityTemp RENAME TO Community;
+
+ALTER TABLE Community2Community ADD CONSTRAINT fk_c2c_parent
+FOREIGN KEY (parent_comm_id)
+REFERENCING Community (community_id);
+
+ALTER TABLE Community2Community ADD CONSTRAINT fk_c2c_child
+FOREIGN KEY (child_comm_id)
+REFERENCING Community (community_id);
+
+ALTER TABLE Community2Collection ADD CONSTRAINT fk_c2c_community
+FOREIGN KEY (community_id)
+REFERENCING Community (community_id);
+
+ALTER TABLE Communities2Item ADD CONSTRAINT fk_c2i_community
+FOREIGN KEY (community_id)
+REFERENCING Community (community_id);
+
+-------------------------------------
+-- Update Collection to include CLOBs
+-------------------------------------
+
+CREATE TABLE CollectionTemp
+(
+  collection_id     INTEGER PRIMARY KEY,
+  name              VARCHAR2(128),
+  short_description VARCHAR2(512),
+  introductory_text CLOB,
+  logo_bitstream_id INTEGER REFERENCES Bitstream(bitstream_id),
+  template_item_id  INTEGER REFERENCES Item(item_id),
+  provenance_description  VARCHAR2(2000),
+  license           CLOB,
+  copyright_text    CLOB,
+  side_bar_text     VARCHAR2(2000),
+  workflow_step_1   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  workflow_step_2   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  workflow_step_3   INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  submitter         INTEGER REFERENCES EPersonGroup( eperson_group_id ),
+  admin             INTEGER REFERENCES EPersonGroup( eperson_group_id )
+);
+
+INSERT INTO CollectionTemp
+SELECT * FROM Collection;
+
+DROP TABLE Collection CASCADE CONSTRAINTS;
+ALTER TABLE CollectionTemp RENAME TO Collection;
+
+ALTER TABLE Community2Collection ADD CONSTRAINT fk_c2c_collection
+FOREIGN KEY (collection_id)
+REFERENCING Collection (collection_id);
+
+ALTER TABLE Collection2Item ADD CONSTRAINT fk_c2i_collection
+FOREIGN KEY (collection_id)
+REFERENCING Collection (collection_id);
+
+ALTER TABLE WorkspaceItem ADD CONSTRAINT fk_wsi_collection
+FOREIGN KEY (collection_id)
+REFERENCING Collection (collection_id);
+
+ALTER TABLE WorkflowItem ADD CONSTRAINT fk_wfi_collection
+FOREIGN KEY (collection_id)
+REFERENCING Collection (collection_id);
+
+ALTER TABLE Subscription ADD CONSTRAINT fk_subs_collection
+FOREIGN KEY (collection_id)
+REFERENCING Collection (collection_id);

dspace/jsp/dspace-admin/eperson-main.jsp

@@ -85,7 +85,7 @@
 	   </strong></p>
 <%  } %>
     
-    <form method="post" action="">    
+    <form name="epersongroup" method="post" action="">    
 
     <center>
         <table width="90%">

dspace/jsp/dspace-admin/wizard-permissions.jsp

@@ -146,7 +146,7 @@
 	<%-- <p>You can change this later using the relevant sections of the DSpace admin UI.</p> --%>
 	<p><fmt:message key="jsp.dspace-admin.wizard-permissions.change"/></p>
 
-    <form action="<%= request.getContextPath() %>/tools/collection-wizard" method="post">
+    <form name="epersongroup" action="<%= request.getContextPath() %>/tools/collection-wizard" method="post">
 		<center>
 			<table>
 <%

dspace/jsp/statistics/no-report.jsp

@@ -46,8 +46,10 @@
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-
+<%
-<dspace:layout titlekey="jsp.statistics.no-report.title">
+    String navbar = (String) request.getAttribute("navbar");
+%>
+<dspace:layout navbar="<%=  navbar %>" titlekey="jsp.statistics.no-report.title">
 
 <p><fmt:message key="jsp.statistics.no-report.info1"/></p>
 

dspace/jsp/statistics/report.jsp

@@ -55,12 +55,13 @@
     Date[] months = (Date[]) request.getAttribute("months");
     String date = (String) request.getAttribute("date");
     Boolean general = (Boolean) request.getAttribute("general");
+    String navbar = (String) request.getAttribute("navbar");
     
     SimpleDateFormat sdfDisplay = new SimpleDateFormat("MM'/'yyyy");
     SimpleDateFormat sdfLink = new SimpleDateFormat("yyyy'-'M");
 %>
 
-<dspace:layout titlekey="jsp.statistics.report.title">
+<dspace:layout navbar="<%= navbar %>" titlekey="jsp.statistics.report.title">
 
     <p>
 <%

dspace/jsp/submit/edit-metadata.jsp

@@ -413,7 +413,7 @@
 
     void doTextArea(javax.servlet.jsp.JspWriter out, Item item,
       String fieldName, String schema, String element, String qualifier, boolean repeatable,
-      int fieldCountIncr, String label, PageContext pageContext) 
+      int fieldCountIncr, String label, PageContext pageContext, String vocabulary, boolean closedVocabulary) 
       throws java.io.IOException 
     {
 
@@ -443,9 +443,13 @@
            .append(fieldName);
          if (repeatable)
            sb.append("_").append(i);
-         sb.append("\" rows=\"4\" cols=\"45\" >")
+         sb.append("\" rows=\"4\" cols=\"45\"")
+           .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
+           .append(" >")
            .append(val)
-	   .append("</textarea></td>\n");
+	   .append("</textarea>")
+	   .append(doControlledVocabulary(fieldName + (repeatable?"_" + i:""), pageContext, vocabulary))
+	   .append("</td>\n");
 
 	 if (repeatable && i < defaults.length) 
 	 {
@@ -481,7 +485,7 @@
 
     void doOneBox(javax.servlet.jsp.JspWriter out, Item item,
       String fieldName, String schema, String element, String qualifier, boolean repeatable,
-      int fieldCountIncr, String label, PageContext pageContext, String vocabulary) 
+      int fieldCountIncr, String label, PageContext pageContext, String vocabulary, boolean closedVocabulary) 
       throws java.io.IOException 
     {
 
@@ -513,9 +517,10 @@
            sb.append("_").append(i);
          
          sb.append("\" size=\"50\" value=\"")
-           .append(val)
+           .append(val +"\"")
-	   	.append("\"/>")
+           .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
-	   .append(doControlledVocabulary(fieldName, pageContext, vocabulary))
+	   	.append("/>")
+	   .append(doControlledVocabulary(fieldName + (repeatable?"_" + i:""), pageContext, vocabulary))
 	   .append("</td>\n");
 	   
 
@@ -553,7 +558,7 @@
 
     void doTwoBox(javax.servlet.jsp.JspWriter out, Item item,
       String fieldName, String schema, String element, String qualifier, boolean repeatable,
-      int fieldCountIncr, String label, PageContext pageContext, String vocabulary) 
+      int fieldCountIncr, String label, PageContext pageContext, String vocabulary, boolean closedVocabulary) 
       throws java.io.IOException 
     {
       DCValue[] defaults = item.getMetadata(schema, element, qualifier, Item.ANY);
@@ -596,19 +601,25 @@
              .append("_").append(i)
              .append("\" size=\"15\" value=\"")
              .append(defaults[i].value.replaceAll("\"", "&quot;"))
-	     .append("\"/>&nbsp;<input type=\"submit\" name=\"submit_")
+             .append("\"")
+       	     .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
+             .append("/>&nbsp;<input type=\"submit\" name=\"submit_")
 	     .append(fieldName)
 	     .append("_remove_")
 	     .append(i)
 //	     .append("\" value=\"Remove\"/></td>\n");
 	     .append("\" value=\"")
 	     .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2"))
-	     .append("\"/></td>\n");
+	     .append("\"/>")
+         .append(doControlledVocabulary(fieldName + "_" + i, pageContext, vocabulary))
+	     .append("</td>\n");
          else 
 	 {
            sb.append("<td align=\"left\"><input type=\"text\" name=\"")
              .append(fieldName).append("_").append(i)
-             .append("\" size=\"15\"/>")
+             .append("\" size=\"15\"")
+             .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
+             .append("/>")
              .append(doControlledVocabulary(fieldName + "_" + i, pageContext, vocabulary))
              .append("</td>\n");             
 	 }
@@ -619,21 +630,27 @@
              .append("_").append(i)
              .append("\" size=\"15\" value=\"")
              .append(defaults[i].value.replaceAll("\"", "&quot;"))
-	     .append("\"/>&nbsp;<input type=\"submit\" name=\"submit_")
+	         .append("\"")
+	         .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
+	         .append("/>&nbsp;<input type=\"submit\" name=\"submit_")
 	     .append(fieldName)
 	     .append("_remove_")
 	     .append(i)
 //	     .append("\" value=\"Remove\"/></td></tr>\n");
 	     .append("\" value=\"")
 	     .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.button.remove2"))
-	     .append("\"/></td></tr>\n");
+	     .append("\"/>")
+         .append(doControlledVocabulary(fieldName + "_" + i, pageContext, vocabulary))
+	     .append("</td></tr>\n");
 	 else 
 	 {
            sb.append("<td align=\"left\"><input type=\"text\" name=\"")
              .append(fieldName)
              .append("_").append(i)
              //.append("\" size=\"15\"/></td>");
-             .append("\" size=\"15\"/>") 
+             .append("\" size=\"15\"")
+             .append(hasVocabulary(vocabulary)&&closedVocabulary?" readonly=\"readonly\" ":"")
+             .append("/>")
              .append(doControlledVocabulary(fieldName + "_" + i, pageContext, vocabulary))
              .append("</td>\n");             
 
@@ -932,6 +949,8 @@
 
        String inputType = inputs[z].getInputType();
        String label = inputs[z].getLabel();
+       boolean closedVocabulary = inputs[z].isClosedVocabulary();
+       
        if (inputType.equals("name")) 
        {
            doPersonalName(out, item, fieldName, dcSchema, dcElement, dcQualifier,
@@ -955,7 +974,8 @@
        else if (inputType.equals("textarea")) 
        {
 	   	   doTextArea(out, item, fieldName, dcSchema, dcElement, dcQualifier, 
-	     			  repeatable, fieldCountIncr, label, pageContext);
+	     			  repeatable, fieldCountIncr, label, pageContext, vocabulary,
+	     			  closedVocabulary);
        } 
        else if (inputType.equals("dropdown")) 
        {
@@ -965,12 +985,14 @@
        else if (inputType.equals("twobox")) 
        {
 	   		doTwoBox(out, item, fieldName, dcSchema, dcElement, dcQualifier, 
-	     			 repeatable, fieldCountIncr, label, pageContext, vocabulary);
+	     			 repeatable, fieldCountIncr, label, pageContext, vocabulary, 
+	     			 closedVocabulary);
        } 
        else 
        {
 	   		doOneBox(out, item, fieldName, dcSchema, dcElement, dcQualifier, 
-	     			 repeatable, fieldCountIncr, label, pageContext, vocabulary);
+	     			 repeatable, fieldCountIncr, label, pageContext, vocabulary, 
+	     			 closedVocabulary);
        }
        
        if (hasVocabulary(vocabulary))

dspace/jsp/tools/edit-collection.jsp

@@ -100,6 +100,11 @@
             license = collection.getLicense();
         }
         
+        if (shortDesc == null)
+        {
+            shortDesc = "";
+        }
+        
         if (copy == null)
         {
             copy = "";

dspace/jsp/tools/edit-community.jsp

@@ -78,6 +78,11 @@
         copy = community.getMetadata("copyright_text");
         side = community.getMetadata("side_bar_text");
        
+       	if (shortDesc == null)
+        {
+            shortDesc = "";
+        }
+        
         if (copy == null)
         {
             copy = "";

dspace/jsp/tools/eperson-list.jsp

@@ -118,7 +118,7 @@ function addEPerson(id, email, name)
 // Clear selected items from main e-people list
 function clearEPeople()
 {
-	var list = self.opener.document.forms[0].eperson_id;
+	var list = self.opener.document.epersongroup.eperson_id;
 	while (list.options.length > 0)
 	{
 		list.options[0] = null;

dspace/jsp/tools/group-edit.jsp

@@ -87,7 +87,7 @@
   </table>
 
   <center>
-    <form method="post" action="">
+    <form name="epersongroup" method="post" action="">
 	<p><label for="tgroup_name"><fmt:message key="jsp.tools.group-edit.name"/></label><input name="group_name" id="tgroup_name" value="<%=group.getName()%>"/></p>
    	    <h3><fmt:message key="jsp.tools.group-edit.heading"/></h3>
 

dspace/jsp/tools/group-select-list.jsp

@@ -117,7 +117,7 @@ function addGroup(id, name)
 // Clear selected items from main group list
 function clearGroups()
 {
-	var list = self.opener.document.forms[0].group_ids;
+	var list = self.opener.document.epersongroup.group_ids;
 	while (list.options.length > 0)
 	{
 		list.options[0] = null;

dspace/jsp/utils.js

@@ -52,17 +52,17 @@ var popupWindow;
 // Add to list of e-people on this page -- invoked by eperson popup window
 function addEPerson(id, email, name)
 {
-    var newplace = window.document.forms[0].eperson_id.options.length;
+    var newplace = window.document.epersongroup.eperson_id.options.length;
 
-    if (newplace > 0 && window.document.forms[0].eperson_id.options[0].value == "")
+    if (newplace > 0 && window.document.epersongroup.eperson_id.options[0].value == "")
     {
         newplace = 0;
     }
 
     // First we check to see if e-person is already there
-    for (var i = 0; i < window.document.forms[0].eperson_id.options.length; i++)
+    for (var i = 0; i < window.document.epersongroup.eperson_id.options.length; i++)
     {
-        if (window.document.forms[0].eperson_id.options[i].value == id)
+        if (window.document.epersongroup.eperson_id.options[i].value == id)
         {
             newplace = -1;
         }
@@ -70,33 +70,33 @@ function addEPerson(id, email, name)
 
     if (newplace > -1)
     {
-        window.document.forms[0].eperson_id.options[newplace] = new Option(name + " (" + email + ")", id);
+        window.document.epersongroup.eperson_id.options[newplace] = new Option(name + " (" + email + ")", id);
     }
 }
 
 // Add to list of groups on this page -- invoked by eperson popup window
 function addGroup(id, name)
 {
-    var newplace = window.document.forms[0].group_ids.options.length;
+    var newplace = window.document.epersongroup.group_ids.options.length;
 
-	if (newplace > 0 && window.document.forms[0].group_ids.options[0].value == "")
+	if (newplace > 0 && window.document.epersongroup.group_ids.options[0].value == "")
     {
         newplace = 0;
     }
 
     // First we check to see if group is already there
-    for (var i = 0; i < window.document.forms[0].group_ids.options.length; i++)
+    for (var i = 0; i < window.document.epersongroup.group_ids.options.length; i++)
     {
         // is it in the list already
-        if (window.document.forms[0].group_ids.options[i].value == id)
+        if (window.document.epersongroup.group_ids.options[i].value == id)
         {
             newplace = -1;
         }
 
         // are we trying to add the new group to the new group on an Edit Group page (recursive)
-        if (window.document.forms[0].group_id)
+        if (window.document.epersongroup.group_id)
         {
-            if (window.document.forms[0].group_id.value == id)
+            if (window.document.epersongroup.group_id.value == id)
             {
                 newplace = -1;
             }
@@ -105,7 +105,7 @@ function addGroup(id, name)
 
     if (newplace > -1)
     {
-        window.document.forms[0].group_ids.options[newplace] = new Option(name + " (" + id + ")", id);
+        window.document.epersongroup.group_ids.options[newplace] = new Option(name + " (" + id + ")", id);
     }
 }
 
@@ -113,7 +113,7 @@ function addGroup(id, name)
 // on pages with a dspace:selecteperson element in them
 function finishEPerson()
 {
-    selectAll(window.document.forms[0].eperson_id);
+    selectAll(window.document.epersongroup.eperson_id);
 
 	if (popupWindow != null)
 	{
@@ -125,7 +125,7 @@ function finishEPerson()
 // on pages with a dspace:selecteperson element in them
 function finishGroups()
 {
-    selectAll(window.document.forms[0].group_ids);
+    selectAll(window.document.epersongroup.group_ids);
 
     if (popupWindow != null)
     {

dspace/lib/README

@@ -17,8 +17,7 @@ jdom.jar             Java DOM API library (version 1.0)
 jena.jar:            The Jena RDF framework (version 1.4.0)
 jstl.jar:            Java Standard Tag Library (JSTL) API (version 1.0.6)
 log4j.jar:           Log4j, for system logging (version 1.2.14)
-lucene.jar:          Lucene search engine (version 2.0.0)
+lucene.jar:          Lucene search engine (version 2.1.0)
-lucene-sandbox.jar:  Lucene search engine (version - compiled against Lucene 2.0.0 jar)
 mail.jar:            JavaMail, used for sending e-mail (version 1.4)
 mets.jar*:           Harvard University Libraries METS toolkit (version 1.5.2)
 oaicat.jar:          OCLC's OAI data provider implementation (version 1.5.48)

dspace/lib/licenses/bcmail-jdk14-135.jar.license

@@ -0,0 +1,9 @@
+License
+
+Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

dspace/lib/licenses/bcprov-jdk14-135.jar.license

@@ -0,0 +1,9 @@
+License
+
+Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

dspace/make-release-package

@@ -1,39 +1,69 @@
 #!/bin/sh
 
-USAGE="$0 cvs-tag version"
+USAGE="Usage: $0 <path> <svn_revision> <version>
+  * <path> is relative to the SVN root (eg: branches/dspace-1_4_x/dspace)
+  * <svn_revision> is the revision you want to build the release from
+  * <version> is the version number to release as (eg: 1.4.2)
+Example:
+./make-release-package branches/dspace-1_4_x/dspace 1795 1.4.2"
 
-# Just in case you need to 'socksify' etc
+SVN="svn"
-CVS_COMMAND="cvs"
+SVN_BASE_URL="https://dspace.svn.sourceforge.net/svnroot/dspace"
 
 # Check we have required command-line arguments
-if [ "$#" != "2" ]; then
+if [ "$#" != "3" ]; then
-        echo $USAGE
+	echo "${USAGE}"
 	exit 1
 fi
 
-FILENAME="dspace-$2-source"
-
 mkdir tmp
+
+if [ $? -eq 1 ]; then
+	# If mkdir failed, then tmp/ already exists, and we don't want to overwrite
+	# anything in there.
+	exit 1
+fi
+
 cd tmp
+FILENAME="dspace-$3-source"
 
 echo "Checking out core code..."
-$CVS_COMMAND -Q export -r $1 dspace
+$SVN export -r $2 "$SVN_BASE_URL/$1" dspace
 
-# Don't need to include this script!
+if [ $? -eq 1 ] || [ ! -d "dspace" ]; then
-rm -f dspace/make-release-package
+	# SVN export failed
+	echo "SVN export failed. Check your path & revision number and try again."
+	cd ..
+	rmdir tmp
+	exit 1
+fi
 
-# Or silly cvsignore files
+if [ ! -f "dspace/make-release-package" ]; then
-rm -f `find dspace -name .cvsignore`
+	cat <<-EOF
+	ERROR: The file dspace/make-release-package doesn't exist. There must have
+	been a problem with the export. Check the contents of tmp/ to find out what
+	the problem was.
+	EOF
+	exit 1
+else
+	# Don't need to include this script!
+	rm -f dspace/make-release-package
+fi
 
 echo "Creating tarball..."
 mv dspace $FILENAME
 
-tar -cf - $FILENAME | gzip -c > $FILENAME.tar.gz
+tar czf $FILENAME.tgz $FILENAME
+tar cjf $FILENAME.tbz2 $FILENAME
+zip -r $FILENAME.zip $FILENAME
 
 echo "Cleaning up..."
 
 cd ..
-mv tmp/$FILENAME.tar.gz .
+mv tmp/$FILENAME.* .
 rm -r tmp
 
-echo "Package created as $FILENAME.tar.gz"
+echo "Packages created:
+  * $FILENAME.tgz
+  * $FILENAME.tbz2
+  * $FILENAME.zip"

dspace/src/org/dspace/app/itemexport/ItemExport.java

@@ -44,6 +44,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.InputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -85,6 +86,8 @@ import org.dspace.handle.HandleManager;
  */
 public class ItemExport
 {
+    private static final int SUBDIR_LIMIT = 0;
+
     /*
      *  
      */
@@ -260,13 +263,39 @@ public class ItemExport
             String destDirName, int seqStart) throws Exception
     {
         int mySequenceNumber = seqStart;
+        int counter = SUBDIR_LIMIT - 1;
+        int subDirSuffix = 0;
+        String fullPath = destDirName;
+        String subdir = "";
+        File dir;
+
+        if (SUBDIR_LIMIT > 0)
+        {
+            dir = new File(destDirName);
+            if (!dir.isDirectory())
+            {
+                throw new IOException(destDirName + " is not a directory.");
+            }
+        }
 
         System.out.println("Beginning export");
 
         while (i.hasNext())
         {
+            if (SUBDIR_LIMIT > 0 && ++counter == SUBDIR_LIMIT)
+            {
+                subdir = new Integer(subDirSuffix++).toString();
+                fullPath = destDirName + dir.separatorChar + subdir;
+                counter = 0;
+
+                if (!new File(fullPath).mkdirs())
+                {
+                    throw new IOException("Error, can't make dir " + fullPath);
+                }
+            }
+
             System.out.println("Exporting item to " + mySequenceNumber);
-            exportItem(c, i.next(), destDirName, mySequenceNumber);
+            exportItem(c, i.next(), fullPath, mySequenceNumber);
             mySequenceNumber++;
         }
     }

dspace/src/org/dspace/app/mediafilter/MediaFilterManager.java

@@ -77,7 +77,7 @@ import org.dspace.search.DSIndexer;
  */
 public class MediaFilterManager
 {
-    public static boolean createIndex = true; // default to creating index
+    public static boolean updateIndex = true; // default to updating index
 
     public static boolean isVerbose = false; // default to not verbose
 
@@ -108,7 +108,7 @@ public class MediaFilterManager
         options.addOption("f", "force", false,
                 "force all bitstreams to be processed");
         options.addOption("n", "noindex", false,
-                "do NOT re-create search index after filtering bitstreams");
+                "do NOT update the search index after filtering bitstreams");
         options.addOption("i", "identifier", true,
         		"ONLY process bitstreams belonging to identifier");
         options.addOption("m", "maximum", true,
@@ -132,7 +132,7 @@ public class MediaFilterManager
 
         if (line.hasOption('n'))
         {
-            createIndex = false;
+            updateIndex = false;
         }
 
         if (line.hasOption('f'))
@@ -207,11 +207,11 @@ public class MediaFilterManager
             	}
             }
           
-            // create search index?
+            // update search index?
-            if (createIndex)
+            if (updateIndex)
             {
-                System.out.println("Creating search index:");
+                System.out.println("Updating search index:");
-                DSIndexer.createIndex(c);
+                DSIndexer.updateIndex(c);
             }
 
             c.complete();

dspace/src/org/dspace/app/statistics/LogAnalyser.java

@@ -1174,6 +1174,12 @@ public class LogAnalyser
     public static Integer getNumItems(Context context, String type)
         throws SQLException
     {
+        boolean oracle = false;
+        if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
+        {
+            oracle = true;
+        }
+
         // FIXME: this method is clearly not optimised
         
         // FIXME: we don't yet collect total statistics, such as number of items
@@ -1206,24 +1212,42 @@ public class LogAnalyser
                           " AND qualifier = 'accessioned') ");
       
         if (startDate != null)
+        {
+            if (oracle)
+            {
+                dateQuery.append(" AND TO_TIMESTAMP( TO_CHAR(text_value), "+
+                        "'yyyy-mm-dd\"T\"hh24:mi:ss\"Z\"' ) > TO_DATE('" +
+                        unParseDate(startDate) + "', 'yyyy-MM-dd') ");
+            }
+            else
             {
                 dateQuery.append(" AND text_value::timestamp > '" +
                         unParseDate(startDate) + "'::timestamp ");
             }
+        }
 
         if (endDate != null)
         {
-            dateQuery.append(" AND text_value::timestamp < ' " +
+            if (oracle)
+            {
+                dateQuery.append(" AND TO_TIMESTAMP( TO_CHAR(text_value), "+
+                        "'yyyy-mm-dd\"T\"hh24:mi:ss\"Z\"' ) < TO_DATE('" +
+                        unParseDate(endDate) + "', 'yyyy-MM-dd') ");
+            }
+            else
+            {
+                dateQuery.append(" AND text_value::timestamp < '" +
                         unParseDate(endDate) + "'::timestamp ");
             }
+        }
         
         // build the final query
         StringBuffer query = new StringBuffer();
         
-        query.append("SELECT COUNT(*) AS number " +
+        query.append("SELECT COUNT(*) AS num " +
                   "FROM item " +
-                  "WHERE in_archive = true " + 
+                  "WHERE in_archive = " + (oracle ? "1 " : "true ") +
-                  "AND withdrawn = false ");
+                  "AND withdrawn = " + (oracle ? "0 " : "false "));
         
         if (startDate != null || endDate != null)
         {
@@ -1239,9 +1263,18 @@ public class LogAnalyser
         
         TableRow row = DatabaseManager.querySingle(context, query.toString());
 
+        Integer numItems;
+        if (oracle)
+        {
+            numItems = new Integer(row.getIntColumn("num"));
+        }
+        else
+        {
             // for some reason the number column is of "long" data type!
-        Long count = new Long(row.getLongColumn("number"));
+            Long count = new Long(row.getLongColumn("num"));
-        return new Integer(count.intValue());
+            numItems = new Integer(count.intValue());
+        }
+        return numItems;
     }
     
     

dspace/src/org/dspace/app/webui/jsptag/ItemTag.java

@@ -54,7 +54,6 @@ import org.dspace.core.Constants;
 import org.dspace.core.Utils;
 
 import java.io.IOException;
-import java.net.URLEncoder;
 
 import java.sql.SQLException;
 import java.util.Enumeration;
@@ -281,7 +280,6 @@ public class ItemTag extends TagSupport
     private void render() throws IOException
     {
         JspWriter out = pageContext.getOut();
-        HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
 
         String configLine = ConfigurationManager
                 .getProperty("webui.itemdisplay." + style);
@@ -305,8 +303,6 @@ public class ItemTag extends TagSupport
         	String field = st.nextToken().trim();
             boolean isDate = false;
             boolean isLink = false;
-            boolean isAuthor = isAuthor(field);
-            boolean isSubject = isSubject(field);
 
             // Find out if the field should rendered as a date or link
 
@@ -366,18 +362,6 @@ public class ItemTag extends TagSupport
                         // Parse the date
                         out.print(UIUtil.displayDate(dd, false, false));
                     }
-                    else if (isAuthor)
-                    {
-                        out.print("<a href=\"" + request.getContextPath() + "/items-by-author?author="
-                            + URLEncoder.encode(values[j].value, "UTF-8") + "\">" + values[j].value
-                            + "</a>");
-                    }
-                    else if (isSubject)
-                    {
-                        out.print("<a href=\"" + request.getContextPath() + "/items-by-subject?subject="
-                            + URLEncoder.encode(values[j].value, "UTF-8") + "\">" + values[j].value
-                            + "</a>");
-                    }
                     else
                     {
                         out.print(Utils.addEntities(values[j].value));
@@ -648,8 +632,8 @@ public class ItemTag extends TagSupport
             		}
 
             		out.print("</td><td headers=\"t3\" class=\"standard\">");
-            		out.print(primaryBitstream.getSize() / 1024);
+                    out.print(UIUtil.formatFileSize(primaryBitstream.getSize()));
-            		out.print("Kb</td><td headers=\"t4\" class=\"standard\">");
+                    out.print("</td><td headers=\"t4\" class=\"standard\">");
             		out.print(primaryBitstream.getFormatDescription());
             		out
                         .print("</td><td class=\"standard\"><a target=\"_blank\" href=\"");
@@ -718,9 +702,9 @@ public class ItemTag extends TagSupport
 
             					out
                                     .print("</td><td headers=\"t3\" class=\"standard\">");
-            					out.print(bitstreams[k].getSize() / 1024);
+                                out.print(UIUtil.formatFileSize(bitstreams[k].getSize()));
             					out
-                                    .print("Kb</td><td headers=\"t4\" class=\"standard\">");
+                                .print("</td><td headers=\"t4\" class=\"standard\">");
             					out.print(bitstreams[k].getFormatDescription());
             					out
                                     .print("</td><td class=\"standard\" align=\"center\">");
@@ -894,121 +878,4 @@ public class ItemTag extends TagSupport
             }
         }
     }
-    
-    /**
-     * Is the given field name an Author field? 
-     * 
-     * If undefined in dspace.cfg (webui.browse.index.author) it defaults
-     * to using any field containing 'creator'.
-     * 
-     * @param field
-     * @return Whether or not the given String is an author 
-     */
-    private boolean isAuthor(String field)
-    {
-        // Does the user want to link to authors?
-        if (ConfigurationManager.getBooleanProperty("webui.authorlinks.enable", true) == false)
-        {
-           return false; 
-        }
-        
-        //Check whether a given metadata field should be considered an author field.
-        String authorField = ConfigurationManager.getProperty("webui.browse.index.author");
-        if (authorField == null)
-        {
-            if (field.indexOf("contributor") > 0 || field.indexOf("creator") > 0)
-                return true;
-            else
-                return false;
-        }
-        else
-        {
-            StringTokenizer st = new StringTokenizer(authorField, ",");
-            String aField;
-
-            while (st.hasMoreTokens())
-            {
-                aField = st.nextToken().trim();
-                // does dspace.cfg allow all qualifiers for this element?
-                if (aField.endsWith(".*"))
-                {
-                    // does the field have a qualifier?
-                    int i = field.lastIndexOf(".");
-                    if (i != field.indexOf("."))
-                    {
-                        // lop off qualifier
-                        field = field.substring(0, i);
-                    }
-                }
-                // check field against dspace.cfg
-                if (aField.indexOf(field) >= 0)
-                    return true;
-            }
-            //no match found
-            return false;
-        }
-    }
-    
-    /**
-     * Is the given field name a Subject field? 
-     * 
-     * If undefined in dspace.cfg (webui.browse.index.subject) it defaults
-     * to using any field containing 'subject'.
-     * 
-     * @param field
-     * @return Whether or not the given String is a subject 
-     */
-    private boolean isSubject(String field)
-    {
-        // Does the user want to link to subjects?
-        if (ConfigurationManager.getBooleanProperty("webui.subjectlinks.enable", false) == false)
-        {
-           return false; 
-        }
-        
-        // Check whether a given metadata field should be considered a subject field
-        String subjectField = ConfigurationManager.getProperty("webui.browse.index.subject");
-        
-        if (subjectField == null)
-        {
-            if (field.indexOf("subject") > 0)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            StringTokenizer st = new StringTokenizer(subjectField, ",");
-            String sField;
-            
-            while (st.hasMoreTokens())
-            {
-                sField = st.nextToken().trim();
-                // does dspace.cfg allow all qualifiers for this element?
-                if (sField.endsWith(".*"))
-                {
-                    // does the field have a qualifier?
-                    int i = field.lastIndexOf(".");
-                    if (i != field.indexOf("."))
-                    {
-                        // lop off qualifier
-                        field = field.substring(0, i);
-                    }
-                }
-
-                // check field against dspace.cfg
-                if (sField.indexOf(field) >= 0)
-                {
-                    return true;
-                }
-            }
-            
-            //no match found
-            return false;
-        }
-    }
 }

dspace/src/org/dspace/app/webui/jsptag/SelectEPersonTag.java

@@ -185,7 +185,7 @@ public class SelectEPersonTag extends TagSupport
                 out.print("<input type=\"button\" value=\""
                                         + LocaleSupport.getLocalizedMessage(pageContext,
                                                 "org.dspace.app.webui.jsptag.SelectEPersonTag.removeSelected")
-                                        + "\" onclick=\"javascript:removeSelected(window.document.forms[0].eperson_id);\"/>");
+                                        + "\" onclick=\"javascript:removeSelected(window.document.epersongroup.eperson_id);\"/>");
             }
 
             out.println("</td></tr></table>");

dspace/src/org/dspace/app/webui/jsptag/SelectGroupTag.java

@@ -181,7 +181,7 @@ public class SelectGroupTag extends TagSupport
                 out.print("<input type=\"button\" value=\""
                             + LocaleSupport.getLocalizedMessage(pageContext,
                                 "org.dspace.app.webui.jsptag.SelectGroupTag.removeSelected")
-                                + "\" onclick=\"javascript:removeSelected(window.document.forms[0].group_ids);\"/>");
+                                + "\" onclick=\"javascript:removeSelected(window.document.epersongroup.group_ids);\"/>");
 			}
 
             out.println("</td></tr></table>");

dspace/src/org/dspace/app/webui/servlet/RegisterServlet.java

@@ -243,7 +243,17 @@ public class RegisterServlet extends DSpaceServlet
             HttpServletResponse response) throws ServletException, IOException,
             SQLException, AuthorizeException
     {
-        String email = request.getParameter("email").toLowerCase().trim();
+        String email = request.getParameter("email");
+        if (email == null || email.length() > 64)
+        {
+        	// Malformed request or entered value is too long.
+        	email = "";
+        }
+        else
+        {
+        	email = email.toLowerCase().trim();
+        }
+        
         String netid = request.getParameter("netid");
         String password = request.getParameter("password");
         EPerson eperson = EPerson.findByEmail(context, email);

dspace/src/org/dspace/app/webui/servlet/StatisticsServlet.java

@@ -94,6 +94,10 @@ public class StatisticsServlet extends org.dspace.app.webui.servlet.DSpaceServle
         // check to see if the statistics are restricted to administrators
         boolean publicise = ConfigurationManager.getBooleanProperty("report.public");
         
+        // determine the navigation bar to be displayed
+        String navbar = (publicise == false ? "admin" : "default");
+        request.setAttribute("navbar", navbar);
+        
         // is the user a member of the Administrator (1) group
         boolean admin = Group.isMember(c, 1);
         

dspace/src/org/dspace/app/webui/servlet/SubmitServlet.java

@@ -5,7 +5,7 @@
  *
  * Date: $Date$
  *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Copyright (c) 2002-2007, Hewlett-Packard Company and Massachusetts
  * Institute of Technology.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -792,6 +792,8 @@ public class SubmitServlet extends DSpaceServlet
         throws ServletException, IOException, SQLException, AuthorizeException
     {
         String buttonPressed = UIUtil.getSubmitButton(request, "submit_next");
+		String defaultLanguage =
+			ConfigurationManager.getProperty("default.language");
 
         // Firstly, check for a click of the cancel button.
         if (buttonPressed.equals("submit_cancel"))
@@ -879,7 +881,8 @@ public class SubmitServlet extends DSpaceServlet
     	      	{
                     if (!vals[z].equals(""))
                     {
-                        item.addMetadata(dcSchema, dcElement, dcQualifier, "en", vals[z]);
+                        item.addMetadata(dcSchema, dcElement, dcQualifier,
+								defaultLanguage, vals[z]);
                     }
     	      	}
     	      }
@@ -888,7 +891,7 @@ public class SubmitServlet extends DSpaceServlet
     	   			(inputType.equals("textarea")))
     	   {
     	   		readText(request, item, dcSchema, dcElement, dcQualifier, 
-    	   				 inputs[j].getRepeatable(), "en");
+    	   				 inputs[j].getRepeatable(), defaultLanguage);
     	   }
     	   else 
     	   {
@@ -2426,8 +2429,12 @@ public class SubmitServlet extends DSpaceServlet
         else
         {
             // Just a single name
-            vals.add(request.getParameter(dcname).trim());
+            String value = request.getParameter(dcname);
-            ;
+            if (value != null)
+            {
+                value.trim();
+            }
+            vals.add(value);
         }
 
         // Remove existing values

dspace/src/org/dspace/app/webui/servlet/admin/EditItemServlet.java

@@ -136,7 +136,7 @@ public class EditItemServlet extends DSpaceServlet
         else if ((handle != null) && !handle.equals(""))
         {
             // resolve handle
-            DSpaceObject dso = HandleManager.resolveToObject(context, handle);
+            DSpaceObject dso = HandleManager.resolveToObject(context, handle.trim());
 
             // make sure it's an ITEM
             if ((dso != null) && (dso.getType() == Constants.ITEM))

dspace/src/org/dspace/app/webui/util/DCInput.java

@@ -92,6 +92,9 @@ public class DCInput
     /** the name of the controlled vocabulary to use */
     private String vocabulary = null;
 
+    /** is the entry closed to vocabulary terms? */
+    private boolean closedVocabulary = false;
+    
     /**
      * Class constructor for creating a DCInput object based on the contents of
      * a HashMap
@@ -127,6 +130,9 @@ public class DCInput
         required = (warning != null && warning.length() > 0);
         visibility = (String) fieldMap.get("visibility");
         vocabulary = (String) fieldMap.get("vocabulary");
+        String closedVocabularyStr = (String) fieldMap.get("closedVocabulary");
+        closedVocabulary = "true".equalsIgnoreCase(closedVocabularyStr)
+                            || "yes".equalsIgnoreCase(closedVocabularyStr);
     }
 
     /**
@@ -349,4 +355,21 @@ public class DCInput
         return null;
     }
 
+	/**
+	 * The closed attribute of the vocabulary tag for this field as set in 
+	 * input-forms.xml
+	 * 
+	 * <code> 
+	 * <field>
+	 *     .....
+	 *     <vocabulary closed="true">nsrc</vocabulary>
+	 * </field>
+	 * </code>
+	 * @return the closedVocabulary flags: true if the entry should be restricted 
+	 *         only to vocabulary terms, false otherwise
+	 */
+	public boolean isClosedVocabulary() {
+		return closedVocabulary;
+	}
+
 }

dspace/src/org/dspace/app/webui/util/DCInputsReader.java

@@ -421,6 +421,11 @@ public class DCInputsReader
     					}			
     				}
     			}
+    			else if (tagName.equals("vocabulary"))
+    			{
+    				String closedVocabularyString = getAttribute(nd, "closed");
+    			    field.put("closedVocabulary", closedVocabularyString);
+    			}
     		}
     	}
     	String missing = null;

dspace/src/org/dspace/app/webui/util/UIUtil.java

@@ -42,8 +42,11 @@ package org.dspace.app.webui.util;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.Locale;
 import java.net.URLEncoder;
 
 import javax.servlet.http.HttpServletRequest;
@@ -401,7 +404,7 @@ public class UIUtil
 
         try
         {
-            return Integer.parseInt(val);
+            return Integer.parseInt(val.trim());
         }
         catch (Exception e)
         {
@@ -658,4 +661,46 @@ public class UIUtil
 	 {
 	 	return encodeBitstreamName(stringIn, Constants.DEFAULT_ENCODING);
 	 }
+     
+     /**
+      * Formats the file size. Examples:
+      * 
+      *  - 50 = 50B
+      *  - 1024 = 1KB
+      *  - 1,024,000 = 1MB etc
+      *  
+      *  The numbers are formatted using java Locales
+      *  
+      * @param in The number to covnert
+      * @return the file size as a String
+      */
+     public static String formatFileSize(double in)
+     {
+         // Work out the size of the file, and format appropriatly
+         // FIXME: When full i18n support is available, use the user's Locale
+         // rather than the default Locale.
+         NumberFormat nf = NumberFormat.getNumberInstance(Locale.getDefault());
+         DecimalFormat df = (DecimalFormat)nf;
+         df.applyPattern("###,###.##");
+         if (in < 1024)
+         {
+             df.applyPattern("0");
+             return df.format(in) +  " " + "B";
+         }
+         else if (in < 1024000)
+         {
+             in = in / 1024;
+             return df.format(in) + " " + "kB";
+         }
+         else if (in < 1024000000)
+         {
+             in = in / 1024000;
+             return df.format(in) + " " + "MB";
+         }
+         else
+         {
+             in = in / 1024000000;
+             return df.format(in) + " " + "GB";
+         }
+     }
 }

dspace/src/org/dspace/content/Bitstream.java

@@ -478,6 +478,12 @@ public class Bitstream extends DSpaceObject
      */
     void delete() throws SQLException
     {
+        boolean oracle = false;
+        if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
+        {
+            oracle = true;
+        }
+
         // changed to a check on remove
         // Check authorisation
         //AuthorizeManager.authorizeAction(bContext, this, Constants.DELETE);
@@ -490,6 +496,12 @@ public class Bitstream extends DSpaceObject
         // Remove policies
         AuthorizeManager.removeAllPolicies(bContext, this);
 
+        // Remove references to primary bitstreams in bundle
+        String query = "update bundle set primary_bitstream_id = ";
+        query += (oracle ? "''" : "Null") + " where primary_bitstream_id = ? ";
+        DatabaseManager.updateQuery(bContext,
+                query, bRow.getIntColumn("bitstream_id"));
+
         // Remove bitstream itself
         BitstreamStorageManager.delete(bContext, bRow
                 .getIntColumn("bitstream_id"));

dspace/src/org/dspace/search/DSQuery.java

@@ -40,6 +40,7 @@
 package org.dspace.search;
 
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -83,21 +84,29 @@ public class DSQuery
     static final String COMMUNITY = "" + Constants.COMMUNITY;
 
     // cache a Lucene IndexSearcher for more efficient searches
-    private static Searcher searcher;
+    private static IndexSearcher searcher = null;
+
+    private static String indexDir = null;
+    
+    private static String operator = null;
     
     private static long lastModified;
     
     /** log4j logger */
     private static Logger log = Logger.getLogger(DSQuery.class);
 
+    
     static
     {
-        String maxClauses = ConfigurationManager
+        String maxClauses = ConfigurationManager.getProperty("search.max-clauses");
-                .getProperty("search.max-clauses");
         if (maxClauses != null)
         {
             BooleanQuery.setMaxClauseCount(Integer.parseInt(maxClauses));
         } 
+        
+        indexDir = ConfigurationManager.getProperty("search.dir");
+        
+        operator = ConfigurationManager.getProperty("search.operator");   
     }
 
     /**
@@ -135,13 +144,11 @@ public class DSQuery
         try
         {
             // grab a searcher, and do the search
-            Searcher searcher = getSearcher(ConfigurationManager
+            Searcher searcher = getSearcher(c);
-                    .getProperty("search.dir"));
 
             QueryParser qp = new QueryParser("default", DSIndexer.getAnalyzer());
             log.info("Final query string: " + querystring);
             
-            String operator = ConfigurationManager.getProperty("search.operator");   
             if (operator == null || operator.equals("OR"))
             {
             	qp.setDefaultOperator(QueryParser.OR_OPERATOR);
@@ -388,21 +395,66 @@ public class DSQuery
         }
     }
 
-    /*---------  private methods ----------*/
+    /*---------  protected methods ----------*/
+
+    /**	
+     * get an IndexReader.
+     * @throws IOException 
+     */
+    protected static IndexReader getIndexReader() 
+    	throws IOException
+    {
+    	return getSearcher(null).getIndexReader();
+    }
     
     /**
      * get an IndexSearcher, hopefully a cached one (gives much better
      * performance.) checks to see if the index has been modified - if so, it
      * creates a new IndexSearcher
      */
-    private static synchronized Searcher getSearcher(String indexDir)
+    protected static synchronized IndexSearcher getSearcher(Context c)
             throws IOException
     {
-        if (lastModified != IndexReader.getCurrentVersion(indexDir))
+       
+        // If we have already opened a searcher, check to see if the index has been updated
+        // If it has, we need to close the existing searcher - we will open a new one later
+        if (searcher != null && lastModified != IndexReader.getCurrentVersion(indexDir))
         {
-            // there's a new index, open it
+            try
+            {
+                // Close the cached IndexSearcher
+                searcher.close();
+            }
+            catch (IOException ioe)
+            {
+                // Index is probably corrupt. Log the error, but continue to either:
+                // 1) Return existing searcher (may yet throw exception, no worse than throwing here)
+                log.warn("DSQuery: Unable to check for updated index", ioe);
+            }
+            finally
+            {
+            	searcher = null;
+            }
+        }
+
+        // There is no existing searcher - either this is the first execution,
+        // or the index has been updated and we closed the old index.
+        if (searcher == null)
+        {
+            // So, open a new searcher
             lastModified = IndexReader.getCurrentVersion(indexDir);
-            searcher = new IndexSearcher(indexDir);
+            searcher = new IndexSearcher(indexDir){
+            	/* 
+            	 * TODO: Has Lucene fixed this bug yet?
+            	 * Lucene doesn't release read locks in 
+            	 * windows properly on finalize. Our hack
+            	 * extend IndexSearcher to force close().
+            	 */
+                protected void finalize() throws Throwable {
+            		this.close();
+            		super.finalize();
+            	}
+            };
         }
 
         return searcher;

dspace/src/org/dspace/search/Harvest.java

@@ -39,7 +39,6 @@
  */
 package org.dspace.search;
 
-import java.sql.Date;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -146,7 +145,6 @@ public class Harvest
         	}
         }       
 
-
         query += " WHERE handle.resource_type_id=" + Constants.ITEM + " AND handle.resource_id=item.item_id ";
 
         if (scope != null)
@@ -166,21 +164,10 @@ public class Harvest
         }      
                 
         if (startDate != null)
-        {
-            if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
-            {
-            	
-            	startDate = oracleTimeStampFormat(startDate);
-                query += " AND item.last_modified >= " + 
-                		oracleTimeStampFunction(startDate);
-                parameters.add(startDate);
-            }
-            else //postgres
         {
         	query = query + " AND item.last_modified >= ? ";
         	parameters.add(toTimestamp(startDate, false));
         }
-        }
 
         if (endDate != null)
         {
@@ -209,19 +196,9 @@ public class Harvest
                 selfGenerated = true;
             }
 
-            if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
-            {
-            	endDate = oracleTimeStampFormat(endDate);
-                query += " AND item.last_modified <= " +
-                		oracleTimeStampFunction(endDate);
-                parameters.add(endDate);
-            }
-            else //postgres
-            {
         	query += " AND item.last_modified <= ? ";
             parameters.add(toTimestamp(endDate, selfGenerated));
         }
-        }
         
         if (withdrawn == false)
         {
@@ -401,50 +378,4 @@ public class Harvest
         df.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
         return new Timestamp(df.parse(t).getTime());
     }    
-
-    
-    /**
-     * Create an oracle to_timestamp function for the given iso date. It must be
-     * an ISO 8601-stlye string.
-     * 
-     * Since the date could be a possible sql injection attack vector instead 
-     * of placing the value inside the query a place holder will be used. The
-     * caller must ensure that the isoDateString parameter is bound to the query
-     * for the approprate substitution.
-     * 
-     * @param isoDateString
-     * @return The oracle to_timestamp function.
-     */
-    private static String oracleTimeStampFunction(String isoDateString)
-    {
-        if (isoDateString.length() == 19 )
-        {
-            return "TO_TIMESTAMP( ? ,'YYYY-MM-DD\"T\"HH24:MI:SS')";
-        } else if (isoDateString.length() > 19)
-        {
-            return "TO_TIMESTAMP( ? ,'YYYY-MM-DD\"T\"HH24:MI:SS.FF\"Z\"')"; 
-        } else
-        {
-            throw new IllegalArgumentException("argument does not seem to be in the expected ISO 8601 format");
-        }
-    }
-    
-    /**
-     * Format the isoDateString according to oracles needs. The input should be ISO-85601 style.
-     * 
-     * @param isoDateString
-     * @return a datastring format better suited to oracles needs.
-     */
-    private static String oracleTimeStampFormat(String isoDateString)
-    {
-    	if (isoDateString.length() == 10)
-    	{
-    		return isoDateString + "T00:00:00";
-    	}
-    	else
-    	{
-    		return isoDateString;
-    	}
-    }
-
 }

dspace/src/org/dspace/search/QueryArgs.java

@@ -152,15 +152,25 @@ public class QueryArgs
         
         for (int i = 1; i <= numField; i++)
         {
-        	String tmp_query = request.getParameter("query"+i).trim();
+        	String tmp_query = request.getParameter("query"+i);
-        	String tmp_field = request.getParameter("field"+i).trim();
+        	String tmp_field = request.getParameter("field"+i);
+        	// TODO: Ensure a valid field from config
+            // Disarm fields with regexp control characters
+            if (tmp_field != null)
+            {
+                tmp_field = tmp_field.replace('/', ' ');
+                tmp_field = tmp_field.replace('<', ' ');
+                tmp_field = tmp_field.replace('\\', ' ');
+                tmp_field = tmp_field.replace(':', ' ');
+            }
+
             if (tmp_query != null && !tmp_query.equals(""))
         	{
-        		query.add(tmp_query);
+        		query.add(tmp_query.trim());
         		if (tmp_field == null)        		        			
         			field.add("ANY");
         		else  			
-        			field.add(tmp_field);
+        			field.add(tmp_field.trim());
         		if (i != numField)
             	{
             		conjunction.add(request.getParameter("conjunction"+i) != null?

dspace/src/org/dspace/storage/rdbms/DatabaseManager.java

@@ -78,7 +78,7 @@ import org.apache.commons.pool.impl.GenericKeyedObjectPool;
 import org.apache.commons.pool.impl.GenericKeyedObjectPoolFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
 import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 
@@ -1173,7 +1173,7 @@ public class DatabaseManager
                     // Otherwise, we need to know!
                     else
                     {
-                        if (log.isEnabledFor(Priority.WARN))
+                        if (log.isEnabledFor(Level.WARN))
                         {
                             log.warn(msg, sqle);
                         }
@@ -1217,6 +1217,7 @@ public class DatabaseManager
     static TableRow process(ResultSet results, String table)
             throws SQLException
     {
+        String dbName =ConfigurationManager.getProperty("db.name");
         ResultSetMetaData meta = results.getMetaData();
         int columns = meta.getColumnCount() + 1;
 
@@ -1240,12 +1241,29 @@ public class DatabaseManager
             else if ((jdbctype == Types.INTEGER) || (jdbctype == Types.NUMERIC)
                     || (jdbctype == Types.DECIMAL))
             {
+                // If we are using oracle
+                if ("oracle".equals(dbName))
+                {
+                    // Test the value from the record set. If it can be represented using an int, do so.
+                    // Otherwise, store it as long
+                    long longValue = results.getLong(i);
+                    if (longValue <= (long)Integer.MAX_VALUE)
+                        row.setColumn(name, (int)longValue);
+                    else
+                        row.setColumn(name, longValue);
+                }
+                else
                     row.setColumn(name, results.getInt(i));
             }
             else if (jdbctype == Types.BIGINT)
             {
                 row.setColumn(name, results.getLong(i));
             }
+            else if (jdbctype == Types.CLOB && "oracle".equals(dbName))
+            {
+                // Support CLOBs in place of TEXT columns in Oracle
+                row.setColumn(name, results.getString(i));
+            }
             else if (jdbctype == Types.VARCHAR)
             {
                 try
@@ -1379,6 +1397,7 @@ public class DatabaseManager
     private static int execute(Connection connection, String sql, List columns,
             TableRow row) throws SQLException
     {
+        String dbName =ConfigurationManager.getProperty("db.name");
         PreparedStatement statement = null;
 
         if (log.isDebugEnabled())
@@ -1412,9 +1431,13 @@ public class DatabaseManager
 
                     continue;
                 }
-                else if ((jdbctype == Types.INTEGER)
+                else if ((jdbctype == Types.INTEGER) || (jdbctype == Types.NUMERIC)
                         || (jdbctype == Types.DECIMAL))
                 {
+                    // If we are using Oracle, we can pass in long values, so always do so.
+                    if ("oracle".equals(dbName))
+                        statement.setLong(count, row.getLongColumn(column));
+                    else
                         statement.setInt(count, row.getIntColumn(column));
 
                     continue;
@@ -1423,6 +1446,13 @@ public class DatabaseManager
                 {
                     statement.setLong(count, row.getLongColumn(column));
                 }
+                else if (jdbctype == Types.CLOB && "oracle".equals(dbName))
+                {
+                    // Support CLOBs in place of TEXT columns in Oracle
+                    statement.setString(count, row.getStringColumn(column));
+
+                    continue;
+                }
                 else if (jdbctype == Types.VARCHAR)
                 {
                     statement.setString(count, row.getStringColumn(column));

dspace/src/org/dspace/storage/rdbms/TableRow.java

@@ -198,9 +198,17 @@ public class TableRow
                     + " not present");
         }
 
+        // If the value is an integer, it can be represented without error as a long
+        // So, allow the return of a long. (This is needed for Oracle support).
+        if ((value instanceof Integer))
+        {
+            return ((Integer) value).longValue();
+        }
+        
         if (!(value instanceof Long))
         {
-            throw new IllegalArgumentException("Value is not an long");
+            throw new IllegalArgumentException("Value for " + column
+                    + " is not a long");
         }
 
         return ((Long) value).longValue();

language-packs/fr/Messages_fr.properties

@@ -9,16 +9,27 @@
 # Author: Andre Meunier
 # Author: Marie-Helene Vezina
 # Author: Claudia Juergen
-#
+# Author: Christophe Dupriez
 
-jsp.adminhelp                                                   = Aide administration...
+itemlist.dc.contributor.*      = Auteur(s)
+itemlist.dc.contributor.author = Auteur(s)
+itemlist.dc.creator            = Auteur(s)
+itemlist.dc.date.defense       = Date de d\u00E9fense
+itemlist.dc.date.issued        = Date de publication
+itemlist.dc.title              = Titre
+itemlist.dc.type               = Type
+itemlist.dc.type.*             = Type
+itemlist.dc.type.course        = Cours
+itemlist.dc.type.degree        = Degr\u00E9
+
+jsp.adminhelp                                                   = Aide sur l'administration...
 jsp.administer                                                  = Acc\u00E8s administrateur
 jsp.admintools                                                  = Outils d'administration
 jsp.browse.authors.enter                                        = ou entrer les premi\u00E8res lettres :
 jsp.browse.authors.jump                                         = Aller \u00E0 :
 jsp.browse.authors.show                                         = Auteurs {0} \u00E0 {1} de {2}.
 jsp.browse.authors.title                                        = Parcourir l'index des auteurs
-jsp.browse.general.go                                           = ok
+jsp.browse.general.go                                           = OK
 jsp.browse.general.next                                         = Page suivante
 jsp.browse.general.previous                                     = Page pr\u00E9c\u00E9dente
 jsp.browse.items-by-author.heading1                             = Documents de l'auteur
@@ -39,15 +50,28 @@ jsp.browse.items-by-date.show                                   = Document(s) {0
 jsp.browse.items-by-date.title                                  = Parcourir par date
 jsp.browse.items-by-date.type                                   = ou entrer une ann\u00E9e :
 jsp.browse.items-by-date.year                                   = [Choisir une ann\u00E9e]
+jsp.browse.items-by-subject.heading1                            = Documents associ\u00E9s au sujet
+jsp.browse.items-by-subject.return                              = Retour au parcours par sujet
+jsp.browse.items-by-subject.show                                = Affichage de {0} documents.
+jsp.browse.items-by-subject.sort1                               = Tri par titre...
+jsp.browse.items-by-subject.sort2                               = Tri par date
+jsp.browse.items-by-subject.sort3                               = Tri par titre
+jsp.browse.items-by-subject.sort4                               = Tri par date...
+jsp.browse.items-by-subject.title                               = Documents associ\u00E9s au sujet
 jsp.browse.items-by-title.enter                                 = ou entrer les premi\u00E8res lettres :
-jsp.browse.items-by-title.jump                                  = Aller à :
+jsp.browse.items-by-title.jump                                  = Aller \u00E0 :
 jsp.browse.items-by-title.show                                  = Titres {0} \u00E0 {1} sur {2}.
 jsp.browse.items-by-title.title                                 = Parcourir l'index des titres
 jsp.browse.no-results.col                                       = Il n'y aucune entr\u00E9e dans l'index pour la collection "{0}".
 jsp.browse.no-results.com                                       = Il n'y aucune entr\u00E9e dans l'index pour la communaut\u00E9 "{0}".
 jsp.browse.no-results.genericScope                              = Il n'y aucune entr\u00E9e dans l'index du d\u00E9p\u00F4t.
 jsp.browse.no-results.title                                     = Aucune entr\u00E9e dans l'index
+jsp.browse.subject.enter                                        = ou entrer les premi\u00E8res lettres :
+jsp.browse.subject.jump                                         = Aller \u00E0 :
+jsp.browse.subject.show                                         = Sujets {0} \u00E0 {1} sur {2}.
+jsp.browse.subject.title                                        = Parcourir l'index des sujets
 jsp.collection-home.editsub.button                              = \u00C9diter la liste de d\u00E9posants
+jsp.collection-home.feeds                                       = Flux RSS
 jsp.collection-home.heading1                                    = Page d'accueil de la collection
 jsp.collection-home.info                                        = Voir vos abonnements
 jsp.collection-home.item.button                                 = Lier un document \u00E0 plus d'une collection
@@ -59,6 +83,7 @@ jsp.collection-home.subscribed                                  = Vous \u00EAtes
 jsp.collection-home.unsub                                       = Cesser cet abonnement
 jsp.community-home.create1.button                               = Cr\u00E9er une collection
 jsp.community-home.create2.button                               = Cr\u00E9er une sous-communaut\u00E9
+jsp.community-home.feeds                                        = Flux RSS
 jsp.community-home.heading1                                     = Page d'accueil de la communaut\u00E9
 jsp.community-home.heading2                                     = Collections de cette communaut\u00E9
 jsp.community-home.heading3                                     = Sous-communaut\u00E9 comprises dans cette communaut\u00E9
@@ -67,22 +92,40 @@ jsp.community-list.create.button                                = Cr\u00E9er une
 jsp.community-list.text1                                        = La liste ci-dessous pr\u00E9sente les communaut\u00E9s pr\u00E9sentes dans DSpace ainsi que les collections et sous-communaut\u00E9s qu'elles contiennent. Cliquez sur un nom pour consulter la page d'accueil de cette communaut\u00E9 ou de cette collection.
 jsp.community-list.title                                        = Communaut\u00E9s et collections
 jsp.components.contact-info.details                             = Vous pouvez contacter les administrateurs de {0}
-jsp.components.contact-info.email                               = par courriel :
 jsp.components.ldap-form.enter                                  = Entrez votre nom d'utilisateur et mot de passe ci-dessous.
 jsp.components.ldap-form.login.button                           = Se connecter
 jsp.components.ldap-form.newuser                                = Nouvel utilisateur? Cliquez ici pour vous enregistrer.
 jsp.components.ldap-form.password                               = Mot de passe :
 jsp.components.ldap-form.username-or-email                      = Nom d'utilisateur<br /> ou adresse de courriel&nbsp;:
 jsp.components.login-form.email                                 = Courriel&nbsp;:
-jsp.components.login-form.enter                                 = Pri\u00E8re d'entrer votre courriel ainsi que votre mot de passe afin d'acc\u00E9der \u00E0 votre zone personnelle&nbsp;:
+jsp.components.login-form.enter                                 = Pri\u00E8re d'entrer votre courriel ainsi que votre mot de passe afin d'acc\u00E9der \u00E0 votre espace personnel&nbsp;:
-jsp.components.login-form.forgot                                = oubli\u00E9 votre mot de passe ou d\u00E9sirez changer votre adresse courriel?
+jsp.components.login-form.forgot                                = Mot de passe oubli\u00E9 ? Votre courriel a chang\u00E9 ?
 jsp.components.login-form.login                                 = Acc\u00E9der
 jsp.components.login-form.newuser                               = Cliquez ici afin de vous inscrire.
 jsp.components.login-form.password                              = Mot de passe&nbsp;:
-jsp.display-item.back_to_workspace                              = Retourner \u00E0 \u00AB&nbsp;Ma zone personnelle&nbsp;\u00BB
+jsp.controlledvocabulary.controlledvocabulary.clearbutton       = Annuler
+jsp.controlledvocabulary.controlledvocabulary.closebutton       = Fermer
+jsp.controlledvocabulary.controlledvocabulary.filter            = Filtrer:
+jsp.controlledvocabulary.controlledvocabulary.help-link         = (Aide sur les cat\u00E9gories de sujets...)
+jsp.controlledvocabulary.controlledvocabulary.title             = Cat\u00E9gories de sujets
+jsp.controlledvocabulary.controlledvocabulary.trimbutton        = Appliquer
+jsp.controlledvocabulary.controlledvocabulary.trimmessage       = Trouver un sujet dans le vocabulaire contr\u00F4l\u00E9:
+jsp.controlledvocabulary.controlledvocabularytag.noresults      = No results
+jsp.controlledvocabulary.results.newsearch                      = Chercher sur un autre sujet...
+jsp.controlledvocabulary.search.clearbutton                     = Annuler
+jsp.controlledvocabulary.search.filter                          = Filtrer:
+jsp.controlledvocabulary.search.heading                         = Recherche par sujet
+jsp.controlledvocabulary.search.on-page-help.para1              = Cocher les cases des cat\u00E9gories que vous d\u00E9sirez et cliquer "Chercher...". Les cat\u00E9gories peuvent \u00EAtre ouvertes pour choisir des sujets plus pr\u00E9cis. On peut choisir autant de cat\u00E9gories que n\u00E9cessaire.
+jsp.controlledvocabulary.search.on-page-help.para2              = Filtrer une liste de cat\u00E9gories permet de n'afficher que celles qui correspondent au terme de filtrage. Si vous ouvrez une cat\u00E9gorie, vous ne verrez que les sous-cat\u00E9gories qui correspondent \u00E0 ce terme.
+jsp.controlledvocabulary.search.searchbutton                    = Chercher...
+jsp.controlledvocabulary.search.title                           = Recherche par sujet
+jsp.controlledvocabulary.search.trimbutton                      = Appliquer
+jsp.controlledvocabulary.search.trimmessage                     = Trouver un sujet dans le vocabulaire contr\u00F4l\u00E9:
+jsp.display-item.back_to_workspace                              = Retourner \u00E0 l'espace personnel
 jsp.display-item.copyright                                      = Tous les documents dans DSpace sont prot\u00E9g\u00E9s par copyright, avec tous droits r\u00E9serv\u00E9s.
 jsp.display-item.identifier                                     = Veuillez utiliser cette adresse pour citer ce document&nbsp;:
 jsp.display-item.license                                        = Licence Creative Commons
+jsp.display-item.suggest                                        = Recommander ce document
 jsp.display-item.text1                                          = Affichage abbr\u00E9g\u00E9
 jsp.display-item.text2                                          = Affichage d\u00E9taill\u00E9
 jsp.display-item.text3                                          = Ce document est autoris\u00E9 sous une licence de type
@@ -120,15 +163,19 @@ jsp.dspace-admin.collection-select.col                          = Collections&nb
 jsp.dspace-admin.collection-select.title                        = Choisissez la collection
 jsp.dspace-admin.community-select.com                           = Communaut\u00E9s&nbsp;:
 jsp.dspace-admin.community-select.title                         = Choisissez la comunaut\u00E9
-jsp.dspace-admin.confirm-delete-dctype.confirm                  = \u00CAtes-vous certain que le format  <strong>{0}</strong> doit \u00EAtre supprim\u00E9?
-jsp.dspace-admin.confirm-delete-dctype.heading                  = Supprimer le format Dublin Core&nbsp;: <code>{0}</code>
-jsp.dspace-admin.confirm-delete-dctype.title                    = Supprimer le type Dublin Core
-jsp.dspace-admin.confirm-delete-dctype.warning                  = Cela va g\u00E9n\u00E9rer une erreur si une valeur DC a ce type.
 jsp.dspace-admin.confirm-delete-format.confirm                  = \u00CAtes-vous certain que le format <strong>{0}</strong> doit \u00EAtre supprim\u00E9?
 jsp.dspace-admin.confirm-delete-format.heading                  = Supprimer le format Bitstream&nbsp;: {0}
 jsp.dspace-admin.confirm-delete-format.returntoedit             = Retour \u00E0 la page d'aministration des E-personnes
 jsp.dspace-admin.confirm-delete-format.title                    = Supprimer le format Bitstream
 jsp.dspace-admin.confirm-delete-format.warning                  = Tout bitstream existant avec ce format sera transform\u00E9 en format <em>unknown</em>.
+jsp.dspace-admin.confirm-delete-mdfield.confirm                 = \u00CAtes vous certain que la zone <strong>{0}</strong> doit \u00EAtre d\u00E9truite?
+jsp.dspace-admin.confirm-delete-mdfield.heading                 = D\u00E9truire la zone de m\u00E9ta-donn\u00E9es: <code>{0}</code>
+jsp.dspace-admin.confirm-delete-mdfield.title                   = D\u00E9truire une zone de m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.confirm-delete-mdfield.warning                 = Ceci provoque des erreurs si des documents ont des valeurs pour cette zone de m\u00E9ta-donn\u00E9es.
+jsp.dspace-admin.confirm-delete-mdschema.confirm                = \u00CAtes vous certain que le sch\u00E9ma <strong>{0}</strong> doit \u00EAtre d\u00E9truit?
+jsp.dspace-admin.confirm-delete-mdschema.heading                = D\u00E9truire le sch\u00E9ma de m\u00E9ta-donn\u00E9es: <code>{0}</code>
+jsp.dspace-admin.confirm-delete-mdschema.title                  = D\u00E9truire tout un sch\u00E9ma de m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.confirm-delete-mdschema.warning                = Ceci provoque des erreurs si des documents ont des valeurs pour ce sch\u00E9ma de m\u00E9ta-donn\u00E9es.
 jsp.dspace-admin.eperson-browse.canlogin                        = Peut se connecter?
 jsp.dspace-admin.eperson-browse.email                           = Adresse courriel
 jsp.dspace-admin.eperson-browse.heading                         = Parcourir les E-personnes {0} \u00E0 {1} sur {2}
@@ -145,6 +192,7 @@ jsp.dspace-admin.eperson-deletion-error.title                   = Erreur de supp
 jsp.dspace-admin.eperson-edit.can                               = Peut se connecter&nbsp;:
 jsp.dspace-admin.eperson-edit.email                             = Courriel&nbsp;:
 jsp.dspace-admin.eperson-edit.emailexists                       = Cette adresse courriel est d\u00E9j\u00E0 employ\u00E9e par une autre E-personne.  Les adresses courriel doivent \u00EAtre uniques.
+jsp.dspace-admin.eperson-edit.groups                            = Groupes dont cette E-personne est membre:
 jsp.dspace-admin.eperson-edit.heading                           = \u00C9diter E-personne {0}&nbsp;:
 jsp.dspace-admin.eperson-edit.phone                             = T\u00E9l\u00E9phone&nbsp;:
 jsp.dspace-admin.eperson-edit.require                           = N\u00E9c\u00E9ssite un certificat&nbsp;:
@@ -152,6 +200,7 @@ jsp.dspace-admin.eperson-edit.title                             = \u00C9diter E-
 jsp.dspace-admin.eperson-main.add                               = Ajouter une E-personne...
 jsp.dspace-admin.eperson-main.choose                            = Choisissez une action&nbsp;:
 jsp.dspace-admin.eperson-main.heading                           = Administrer E-personnes
+jsp.dspace-admin.eperson-main.noepersonselected                 = Pas de E-personne s\u00E9lectionn\u00E9e!
 jsp.dspace-admin.eperson-main.or                                = ou
 jsp.dspace-admin.eperson-main.then                              = puis
 jsp.dspace-admin.eperson-main.title                             = Administration des E-personnes
@@ -168,6 +217,7 @@ jsp.dspace-admin.general.delete                                 = Supprimer
 jsp.dspace-admin.general.delete-w-confirm                       = Supprimer...
 jsp.dspace-admin.general.edit                                   = \u00C9diter
 jsp.dspace-admin.general.editpolicy                             = \u00C9diter les politiques
+jsp.dspace-admin.general.eperson                                = E-personne
 jsp.dspace-admin.general.group                                  = Groupe
 jsp.dspace-admin.general.group-colon                            = Groupe&nbsp;:
 jsp.dspace-admin.general.next.button                            = Suivant &gt;
@@ -178,6 +228,9 @@ jsp.dspace-admin.general.upload                                 = T\u00E9l\u00E9
 jsp.dspace-admin.group-eperson-select.add                       = Ajouter une E-personne
 jsp.dspace-admin.group-eperson-select.heading                   = S\u00E9lectionnez une E-personne \u00E0 ajouter au groupe {0}
 jsp.dspace-admin.group-eperson-select.title                     = S\u00E9lectionnez une E-personne
+jsp.dspace-admin.group-group-select.add                         = Ajouter un groupe
+jsp.dspace-admin.group-group-select.heading                     = S\u00E9lectionner un groupe \u00E0 ajouter au groupe {0}
+jsp.dspace-admin.group-group-select.title                       = S\u00E9lectionner un groupe
 jsp.dspace-admin.index.heading                                  = Outils d'Administration
 jsp.dspace-admin.index.text                                     = Choisissez une op\u00E9ration dans le menu de gauche.
 jsp.dspace-admin.item-select.enter                              = Entrer le Handle ou le ID interne du document que vous voulez s\u00E9lectionner.
@@ -187,11 +240,11 @@ jsp.dspace-admin.item-select.heading                            = S\u00E9lection
 jsp.dspace-admin.item-select.id                                 = ID interne&nbsp;:
 jsp.dspace-admin.item-select.text                               = <strong>L&#39;ID que vous avez entr\u00E9 n&#39;est pas un ID valide.</strong> Si vous essayez d&#39;\u00E9diter une communaut\u00E9 ou une collection, vous devez utiliser la <a HREF="{0}">page d'administration des communaut\u00E9s et collections</a>.
 jsp.dspace-admin.item-select.title                              = S\u00E9lectionnez un document
-jsp.dspace-admin.list-dc-types.element                          = \u00C9l\u00E9ment
+jsp.dspace-admin.license-edit.description                       = Mettre \u00E0 jour le texte de la licence dans la case ci-dessous. Celle-ci ne peut pas &ecirc;tre vide.<br />S.V.P v\u00E9rifiez la l\u00E9galit\u00E9 de cette licence pour votre pays.<br />Changer cette licence n'affecte pas les documents d\u00E9j\u00E0 publi\u00E9s et les collections qui ont une licence sp\u00E9cifique.
-jsp.dspace-admin.list-dc-types.note                             = Note&nbsp;: Ajouter un nouvel \u00E9l\u00E9ment au Registre DC n'ajoute pas un champs correspondant au formulaire de soumission!
+jsp.dspace-admin.license-edit.edited                            = La licence assum\u00E9e par d\u00E9faut a \u00E9t\u00E9 mise \u00E0 jour
-jsp.dspace-admin.list-dc-types.qualifier                        = Qualifier
+jsp.dspace-admin.license-edit.empty                             = Vous devez d\u00E9finir une licence!
-jsp.dspace-admin.list-dc-types.scope                            = Note d'application
+jsp.dspace-admin.license-edit.heading                           = Editeur du texte de la licence assum\u00E9e par d\u00E9faut
-jsp.dspace-admin.list-dc-types.title                            = Registre des types Dublin Core
+jsp.dspace-admin.license-edit.title                             = Editer la licence assum\u00E9e par d\u00E9faut
 jsp.dspace-admin.list-formats.description                       = Description longue
 jsp.dspace-admin.list-formats.extensions                        = Extensions
 jsp.dspace-admin.list-formats.internal                          = Interne?
@@ -204,15 +257,33 @@ jsp.dspace-admin.list-formats.text1                             = Les <strong>Ex
 jsp.dspace-admin.list-formats.text2                             = Quand vous ajoutez un format de fichier, il est d'abord rendu 'interne' pour ne pas qu'il apparaisse dans l'interface de soumission avant que vous n'ayez fini d'\u00E9diter les m\u00E9ta-donn\u00E9es du format. N'oubliez pas de d\u00E9cocher la case 'Interne' si le format doit appara\u00EEtre dans la liste des formats du formulaire de soumission.
 jsp.dspace-admin.list-formats.title                             = Registre des formats de fichiers
 jsp.dspace-admin.list-formats.unknown                           = Inconnu
-jsp.dspace-admin.news-edit.heading                              = Editeur de News
+jsp.dspace-admin.list-metadata-fields.addfield                  = Ajouter une zone aux m\u00E9ta-donn\u00E9es
-jsp.dspace-admin.news-edit.news                                 = News&nbsp;:
+jsp.dspace-admin.list-metadata-fields.addfieldnote              = Pour cr\u00E9er une nouvelle zone, il faut indiquer une combinaison unique d'un nom d'\u00E9l\u00E9ment et d'un qualificatif optionnel. Ce nom d'\u00E9l\u00E9ment et ce qualificatif ne peut pas contenir d'espaces, de soulign\u00E9s ou de points.
-jsp.dspace-admin.news-edit.text.sidebar                         = Ajoutez ou \u00E9ditez le texte dans la boite ci-dessous pour le voir appara\u00EEtre dans le  <strong>cadre lat\u00E9ral</strong> de la page d'acceuil de DSpace.
+jsp.dspace-admin.list-metadata-fields.element                   = &Eacute;l\u00E9ment
+jsp.dspace-admin.list-metadata-fields.move                      = D\u00E9placer la zone
+jsp.dspace-admin.list-metadata-fields.moveformnote              = Si vous aviez plus d'un sch\u00E9ma, un formulaire appara&icirc;trait pour d\u00E9placer des zones d'un sch\u00E9ma &agrave; un autre.
+jsp.dspace-admin.list-metadata-fields.movenote                  = S\u00E9lectionner une ou plusieurs zones (Ctrl-Clic pour choisir plusieurs zones) et un sch\u00E9ma de destination. Si le sch\u00E9ma de destination a d\u00E9j&agrave; des zones avec des noms identiques, ces zones ne seront pas d\u00E9plac\u00E9es.
+jsp.dspace-admin.list-metadata-fields.movesubmit                = D\u00E9placer
+jsp.dspace-admin.list-metadata-fields.note                      = Note: D\u00E9finir une nouvelle zone de m\u00E9ta-donn\u00E9es dans le registre n'ajoute pas la case correspondante dans le formulaire de mise-&agrave;-jour.
+jsp.dspace-admin.list-metadata-fields.qualifier                 = Qualificatif
+jsp.dspace-admin.list-metadata-fields.schema                    = Sch\u00E9ma
+jsp.dspace-admin.list-metadata-fields.schemas                   = Sch\u00E9mas
+jsp.dspace-admin.list-metadata-fields.scope                     = Note d'application
+jsp.dspace-admin.list-metadata-fields.title                     = Registre des zones de m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.list-metadata-schemas.instruction              = Cr\u00E9er un nouveau sch\u00E9ma en indiquant son nom d'espace de nommage; Modifier un sch\u00E9ma existant en cliquant le bouton de mise &agrave; jour. Un nom de sch\u00E9ma ne doit pas d\u00E9passer 32 caract&egrave;res et ne doit pas contenir des espaces, des soulign\u00E9s ni des points.
+jsp.dspace-admin.list-metadata-schemas.name                     = Nom
+jsp.dspace-admin.list-metadata-schemas.namespace                = Espace de nommage
+jsp.dspace-admin.list-metadata-schemas.title                    = Registre des sch\u00E9mas de m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.news-edit.heading                              = Editeur de Nouvelles br&egrave;ves
+jsp.dspace-admin.news-edit.news                                 = Nouvelles&nbsp;:
+jsp.dspace-admin.news-edit.text.sidebar                         = Ajoutez ou \u00E9ditez le texte dans la boite ci-dessous pour le voir appara\u00EEtre dans le  <strong>cadre lat\u00E9ral</strong> de la page d'accueil de DSpace.
 jsp.dspace-admin.news-edit.text.topbox                          = Ajoutez ou \u00E9ditez le texte dans la boite ci-dessous pour le voir appara\u00EEtre dans le  <strong>cadre sup\u00E9rieur</strong> de la page d'accueil de DSpace.
 jsp.dspace-admin.news-edit.text3                                = Vous pouvez mettre le texte en forme en utilisant les tags HTML.
-jsp.dspace-admin.news-edit.title                                = Formulaire d'\u00E9dition des News
+jsp.dspace-admin.news-edit.title                                = Formulaire d'\u00E9dition des Nouvelles br&egrave;ves
-jsp.dspace-admin.news-main.heading                              = Editeur de News
+jsp.dspace-admin.news-main.heading                              = Editeur de Nouvelles br&egrave;ves
-jsp.dspace-admin.news-main.news.sidebar                         = Cadre lat\u00E9ral de News
+jsp.dspace-admin.news-main.news.sidebar                         = Cadre lat\u00E9ral de Nouvelles br&egrave;ves
-jsp.dspace-admin.news-main.news.top                             = Cadre sup\u00E9rieur de News
+jsp.dspace-admin.news-main.news.top                             = Cadre sup\u00E9rieur de Nouvelles br&egrave;ves
+jsp.dspace-admin.news-main.title                                = Editeur de Nouvelles br&egrave;ves
 jsp.dspace-admin.supervise-confirm-remove.authorheader          = Auteur
 jsp.dspace-admin.supervise-confirm-remove.confirm               = \u00CAtes-vous sur de vouloir supprimer cette demande de supervision?
 jsp.dspace-admin.supervise-confirm-remove.heading               = Confirmez la suppression
@@ -261,7 +332,7 @@ jsp.dspace-admin.wizard-basicinfo.description                   = Description co
 jsp.dspace-admin.wizard-basicinfo.html1                         = HTML, apparait au centre de la page d'accueil des collections. N'oubliez pas de mettre les tags &lt;P&gt; &lt;/P&gt; !
 jsp.dspace-admin.wizard-basicinfo.html2                         = HTML, apparait dans le cadre droit de la page d'accueil de la collection. N'oubliez pas les tags &lt;P&gt; &lt;/P&gt; !
 jsp.dspace-admin.wizard-basicinfo.intro                         = Texte d'introduction&nbsp;:
-jsp.dspace-admin.wizard-basicinfo.license1                      = Licence que les soumissionnaires doivent accepter. Laissez ceci vide si vous voulez utiliser la licence par d\u00E9faut.
+jsp.dspace-admin.wizard-basicinfo.license1                      = Licence que les soumissionaires doivent accepter. Laissez ceci vide si vous voulez utiliser la licence par d\u00E9faut.
 jsp.dspace-admin.wizard-basicinfo.license2                      = Licence&nbsp;:
 jsp.dspace-admin.wizard-basicinfo.logo                          = Logo&nbsp;:
 jsp.dspace-admin.wizard-basicinfo.name                          = Nom&nbsp;:
@@ -281,11 +352,12 @@ jsp.dspace-admin.wizard-default-item.title                      = Entrer le m\u0
 jsp.dspace-admin.wizard-default-item.value                      = Valeur
 jsp.dspace-admin.wizard-permissions.change                      = Vous pouvez changer ceci plus tard en utilisant les sections ad\u00E9quates de l'interface administrateur de DSpace.
 jsp.dspace-admin.wizard-permissions.click                       = Cliquez sur 'Choisir une E-personne' pour choisir une E-personne et l'ajouter \u00E0 la liste.
+jsp.dspace-admin.wizard-permissions.click2                      = Cliquer "Choisir un Groupe" pour en ajouter &agrave; cette liste.
 jsp.dspace-admin.wizard-permissions.heading1                    = Autorisation \u00E0 la lecture
 jsp.dspace-admin.wizard-permissions.heading2                    = Autorisation \u00E0 la soumission
-jsp.dspace-admin.wizard-permissions.heading3                    = Processus de soumission \u00E9tape d'acceptation/rejet
+jsp.dspace-admin.wizard-permissions.heading3                    = Proc\u00E9dure de soumission \u00E9tape d'acceptation/rejet
-jsp.dspace-admin.wizard-permissions.heading4                    = Processus de soumission \u00E9tape d'acceptation/rejet/\u00E9dition des m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.wizard-permissions.heading4                    = Proc\u00E9dure de soumission \u00E9tape d'acceptation/rejet/\u00E9dition des m\u00E9ta-donn\u00E9es
-jsp.dspace-admin.wizard-permissions.heading5                    = Processus de soumission \u00E9tape d'\u00E9dition des m\u00E9ta-donn\u00E9es
+jsp.dspace-admin.wizard-permissions.heading5                    = Proc\u00E9dure de soumission \u00E9tape d'\u00E9dition des m\u00E9ta-donn\u00E9es
 jsp.dspace-admin.wizard-permissions.heading6                    = Administrateurs de collection d\u00E9l\u00E9gu\u00E9e
 jsp.dspace-admin.wizard-permissions.mit                         = Tous les utilisateurs MIT
 jsp.dspace-admin.wizard-permissions.or                          = ou
@@ -298,24 +370,24 @@ jsp.dspace-admin.wizard-permissions.text6                       = Qui sont les a
 jsp.dspace-admin.wizard-permissions.title                       = Autorisations de la collection
 jsp.dspace-admin.wizard-questions.check1                        = Les nouveaux documents devraient \u00EAtre accessibles \u00E0 tous
 jsp.dspace-admin.wizard-questions.check2                        = Quelques utilisateurs pourront soumettre \u00E0 cette collection
-jsp.dspace-admin.wizard-questions.check3                        = Le processus de soumission incluera une \u00E9tape d'<em>acceptation/reject</em>
+jsp.dspace-admin.wizard-questions.check3                        = La proc\u00E9dure de soumission incluera une \u00E9tape d'<em>acceptation/reject</em>
-jsp.dspace-admin.wizard-questions.check4                        = Le processus de soumission incluera une \u00E9tape d'<em>acceptation/reject/\u00E9dition des m\u00E9ta-donn\u00E9es</em>
+jsp.dspace-admin.wizard-questions.check4                        = La proc\u00E9dure de soumission incluera une \u00E9tape d'<em>acceptation/reject/\u00E9dition des m\u00E9ta-donn\u00E9es</em>
-jsp.dspace-admin.wizard-questions.check5                        = Le processus de soumission incluera une \u00E9tape d'<em>\u00E9dition des m\u00E9ta-donn\u00E9es</em>
+jsp.dspace-admin.wizard-questions.check5                        = La proc\u00E9dure de soumission incluera une \u00E9tape d'<em>\u00E9dition des m\u00E9ta-donn\u00E9es</em>
 jsp.dspace-admin.wizard-questions.check6                        = Cette collection aura des administrateurs de collection d\u00E9l\u00E9gu\u00E9s
 jsp.dspace-admin.wizard-questions.check7                        = Les nouvelles soumissions auront des m\u00E9ta-donn\u00E9es d\u00E9j\u00E0 remplies par d\u00E9faut
 jsp.dspace-admin.wizard-questions.text                          = Cochez les cases associ\u00E9es aux phrases qui s'appliquent \u00E0 cette collection.
 jsp.dspace-admin.wizard-questions.title                         = D\u00E9crivez la collection
 jsp.dspace-admin.workflow-abort-confirm.collection              = Collection&nbsp;: {0}
-jsp.dspace-admin.workflow-abort-confirm.heading                 = Supprimez le processus&nbsp;: {0}
+jsp.dspace-admin.workflow-abort-confirm.heading                 = Supprimez la proc\u00E9dure de soumission&nbsp;: {0}
 jsp.dspace-admin.workflow-abort-confirm.item-title              = Titre&nbsp;: {0}
 jsp.dspace-admin.workflow-abort-confirm.submitter               = Soumissionnaire&nbsp;: {0}
-jsp.dspace-admin.workflow-abort-confirm.title                   = Abandonner le processus
+jsp.dspace-admin.workflow-abort-confirm.title                   = Abandonner la proc\u00E9dure
-jsp.dspace-admin.workflow-abort-confirm.warning                 = Etes-vous sur de vouloir arr\u00EAter ce processus? Il retournera dans l'espace de travail de l'utilisateur
+jsp.dspace-admin.workflow-abort-confirm.warning                 = Etes-vous sur de vouloir arr\u00EAter cette proc\u00E9dure? Il retournera dans l'espace de travail de l'utilisateur
 jsp.dspace-admin.workflow-list.collection                       = Collection
-jsp.dspace-admin.workflow-list.heading                          = Processus actuellement en cours
+jsp.dspace-admin.workflow-list.heading                          = Proc\u00E9dure de soumission en cours actuellement
 jsp.dspace-admin.workflow-list.item-title                       = Titre
 jsp.dspace-admin.workflow-list.submitter                        = Soumissionnaire
-jsp.dspace-admin.workflow-list.title                            = Abandon du processus
+jsp.dspace-admin.workflow-list.title                            = Abandon de la proc\u00E9dure de soumission
 jsp.error.404.text1                                             = L'adresse URL \u00E0 laquelle vous tentez d'acc\u00E9der ne correspond \u00E0 aucune page sur ce serveur.
 jsp.error.404.text2                                             = Si vous avez suivi un lien fourni par une ressource externe, il est possible que ce lien contienne une erreur.  V\u00E9rifiez s&#39;il a \u00E9t\u00E9 correctement inscrit. Si l&#39;erreur persiste, vous pouvez initier la recherche du document en question depuis la <a href="{0}">page d&#39;accueil</a>.
 jsp.error.404.text3                                             = Si vous avez obtenu cette erreur en cliquant sur un lien du site de DSpace, veuillez nous en aviser afin que nous puissions effectuer la correction du lien d\u00E9fectueux. Nous vous remercions de votre collaboration.
@@ -333,11 +405,20 @@ jsp.error.integrity.text2                                       = Si le probl\u0
 jsp.error.integrity.title                                       = Requ\u00EAte mal form\u00E9e
 jsp.error.internal.text1                                        = Il s'est produit une erreur interne dans le syst\u00E8me. Cette erreur a \u00E9t\u00E9 enregistr\u00E9e dans un journal qui est r\u00E9guli\u00E8rement v\u00E9rifi\u00E9 par les administrateurs du syst\u00E8me.  Veuillez essayer votre op\u00E9ration de nouveau et si le probl\u00E8me persiste, communiquez avec nous afin que nous puissions r\u00E9gler ce probl\u00E8me.
 jsp.error.internal.title                                        = Erreur du syst\u00E8me
+jsp.error.invalid-id.constants.type.0                           = Bitstream
+jsp.error.invalid-id.constants.type.1                           = Bundle
+jsp.error.invalid-id.constants.type.2                           = Document
+jsp.error.invalid-id.constants.type.3                           = Collection
+jsp.error.invalid-id.constants.type.4                           = Communaut\u00E9
+jsp.error.invalid-id.constants.type.5                           = Site
+jsp.error.invalid-id.constants.type.6                           = Groupe
+jsp.error.invalid-id.constants.type.7                           = E-personne
 jsp.error.invalid-id.list1                                      = Veuillez v\u00E9rifier, selon le cas qui s'applique, si l'adresse URL de la page courante n'est pas erron\u00E9e ou si le bon identifiant a \u00E9t\u00E9 inscrit dans le formulaire.
 jsp.error.invalid-id.list2                                      = Vous avez entr\u00E9 un identifiant (ID) non valide - pri\u00E8re d'essayer de nouveau.
 jsp.error.invalid-id.text1                                      = L&#39;identifiant {0} ne correspond \u00E0 aucun objet (de type {1}) de notre base de donn\u00E9es.
 jsp.error.invalid-id.text2                                      = Si vous \u00E9prouvez des probl\u00E8mes, ou encore si vous vous attendiez \u00E0 ce que cet identifiant (ID) soit valide, vous pouvez contacter les administrateurs du site.
 jsp.error.invalid-id.title                                      = Identifiant invalide
+jsp.error.invalid-id.type.object                                = Objet
 jsp.error.require-certificate.text                              = La configuration de ce site DSpace requiert des usagers un certificat web valide pour se connecter. Si vous \u00E9prouvez des probl\u00E8mes avec ce m\u00E9canisme, pri\u00E8re de nous contacter.
 jsp.error.require-certificate.title                             = Un certificat est requis
 jsp.feedback.acknowledge.text                                   = Votre commentaire a \u00E9t\u00E9 envoy\u00E9 aux responsables du site.
@@ -352,12 +433,17 @@ jsp.general.authors.button                                      = Auteurs
 jsp.general.date.button                                         = Date
 jsp.general.edit.button                                         = Administration&nbsp;: \u00C9diter/modifier...
 jsp.general.genericScope                                        = Tout le d\u00E9p\u00F4t
-jsp.general.go                                                  = ok
+jsp.general.go                                                  = OK
 jsp.general.gohome                                              = Aller \u00E0 la page d'accueil
+jsp.general.goto                                                = Aller \u00E0
+jsp.general.home                                                = Accueil
+jsp.general.id                                                  = ID
 jsp.general.location                                            = Dans&nbsp;:
+jsp.general.mydspace                                            = Espace personnel
 jsp.general.orbrowse                                            = Parcourir par
-jsp.general.search.button                                       = ok
+jsp.general.search.button                                       = OK
-jsp.general.searchfor                                           = Rechercher&nbsp;:
+jsp.general.searchfor                                           = Chercher&nbsp;:
+jsp.general.subjects.button                                     = Sujets
 jsp.general.titles.button                                       = Titres
 jsp.general.untitled                                            = Sans titre
 jsp.help                                                        = Aide...
@@ -365,7 +451,7 @@ jsp.help.formats.contact1                                       = Contactez votr
 jsp.help.formats.contact2                                       = Administrateur DSpace
 jsp.help.formats.contact3                                       = si vous avez des questions particuli\u00E8res sur un format qui ne serait pas list\u00E9.
 jsp.help.formats.extensions                                     = Extensions
-jsp.help.formats.here                                           = (\u00C0 venir...)
+jsp.help.formats.here                                           = (Politique locale quant aux formats de donn\u00E9es)
 jsp.help.formats.mime                                           = MIME Type
 jsp.help.formats.name                                           = Description
 jsp.help.formats.policy                                         = Politique en mati\u00E8re de format
@@ -380,16 +466,17 @@ jsp.help.formats.top                                            = haut
 jsp.help.formats.whattodo                                       = Que faire si le format dans lequel je d\u00E9sire d\u00E9poser mon document n'est pas list\u00E9&nbsp;?
 jsp.home.com1                                                   = Communaut\u00E9s de recherche et d'enseignement repr\u00E9sent\u00E9es dans DSpace
 jsp.home.com2                                                   = Choisir une communaut\u00E9 pour parcourir ses collections.
+jsp.home.feeds                                                  = Flux RSS
 jsp.home.search1                                                = Recherche
 jsp.home.search2                                                = Entrez un texte \u00E0 rechercher dans le d\u00E9p\u00F4t.
 jsp.home.title                                                  = Accueil
 jsp.layout.footer-default.feedback                              = Commentaires
-jsp.layout.footer-default.text                                  = Ce site utilise l'application <a target="_blank" href="http://www.dspace.org">DSpace</a>, Version 1.3.2
+jsp.layout.footer-default.text                                  = Ce site utilise l'application <a target="_blank" href="http://www.dspace.org">DSpace</a>, Version 1.4.1
 jsp.layout.header-default.about                                 = \u00C0 propos de l'application DSpace
 jsp.layout.header-default.alt                                   = DSpace
 jsp.layout.navbar-admin.authorization                           = Autorisations
 jsp.layout.navbar-admin.communities-collections                 = Communaut\u00E9s/Collections
-jsp.layout.navbar-admin.dcregistry                              = Registre Dublin Core
+jsp.layout.navbar-admin.editlicense                             = \u00C9diter la licence<br />assum\u00E9e par d\u00E9faut
 jsp.layout.navbar-admin.editnews                                = \u00C9diter les nouvelles
 jsp.layout.navbar-admin.epeople                                 = E-personnes
 jsp.layout.navbar-admin.formatregistry                          = Registre des formats de fichiers
@@ -397,9 +484,10 @@ jsp.layout.navbar-admin.groups                                  = Groupes
 jsp.layout.navbar-admin.help                                    = Aide
 jsp.layout.navbar-admin.items                                   = Documents
 jsp.layout.navbar-admin.logout                                  = D\u00E9connexion
+jsp.layout.navbar-admin.metadataregistry                        = Registre des m\u00E9ta-donn\u00E9es
 jsp.layout.navbar-admin.statistics                              = Statistiques
 jsp.layout.navbar-admin.supervisors                             = Superviseurs
-jsp.layout.navbar-admin.workflow                                = Processus en cours
+jsp.layout.navbar-admin.workflow                                = Proc\u00E9dure de soumission en cours
 jsp.layout.navbar-default.about                                 = \u00C0 propos de DSpace
 jsp.layout.navbar-default.advanced                              = Recherche avanc\u00E9e
 jsp.layout.navbar-default.authors                               = Auteurs
@@ -407,7 +495,7 @@ jsp.layout.navbar-default.browse                                = Parcourir le d
 jsp.layout.navbar-default.communities-collections               = Communaut\u00E9s et collections
 jsp.layout.navbar-default.date                                  = Date
 jsp.layout.navbar-default.edit                                  = Modifier mon profil
-jsp.layout.navbar-default.go                                    = ok
+jsp.layout.navbar-default.go                                    = OK
 jsp.layout.navbar-default.help                                  = Aide
 jsp.layout.navbar-default.home                                  = Accueil
 jsp.layout.navbar-default.loggedin                              = <strong>Bonjour</strong><br/>{0}
@@ -415,38 +503,44 @@ jsp.layout.navbar-default.logout                                = D\u00E9connexi
 jsp.layout.navbar-default.receive                               = Recevoir&nbsp;les&nbsp;nouveaut\u00E9s
 jsp.layout.navbar-default.search                                = Chercher&nbsp;dans&nbsp;le&nbsp;d\u00E9p\u00F4t&nbsp;:
 jsp.layout.navbar-default.sign                                  = Services personnalis\u00E9s&nbsp;:
+jsp.layout.navbar-default.subjects                              = Sujets
+jsp.layout.navbar-default.subjectsearch                         = Chercher par Sujet
 jsp.layout.navbar-default.titles                                = Titres
-jsp.layout.navbar-default.users                                 = \u00AB&nbsp;Ma&nbsp;zone&nbsp;personnelle&nbsp;\u00BB
+jsp.layout.navbar-default.users                                 = Espace personnel
 jsp.layout.navbar-default.users-authorized                      = <small>utilisateurs autoris\u00E9s</small>
-jsp.login.incorrect.heading                                     = Acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.login.chooser.chooseyour                                    = Choisir la m\u00E9thode d'identification:
+jsp.login.chooser.heading                                       = Choisir une m\u00E9thode d'identification
+jsp.login.chooser.title                                         = Choisir une m\u00E9thode d'identification
+jsp.login.incorrect.heading                                     = Acc\u00E9der \u00E0 votre espace personnel
 jsp.login.incorrect.text                                        = Le courriel et/ou le mot de passe que vous avez fournis ne sont pas valides.<br />Veuillez essayer de nouveau, ou peut-\u00EAtre avez-vous <a href="{0}">oubli\u00E9 votre mot de passe</a>?
 jsp.login.incorrect.title                                       = Acc\u00E9der
 jsp.login.ldap-incorrect.errormsg                               = Le nom d'usager et/ou le mot de passe que vous avez fournis ne sont pas valides.  Veuillez essayer de nouveau.
-jsp.login.ldap-incorrect.heading                                = Acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.login.ldap-incorrect.heading                                = Acc\u00E9der \u00E0 votre espace personnel
 jsp.login.ldap-incorrect.title                                  = Acc\u00E9der
-jsp.login.ldap.heading                                          = Acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.login.ldap.heading                                          = Acc\u00E9der \u00E0 votre espace personnel
 jsp.login.ldap.title                                            = Acc\u00E9der
 jsp.login.logged-out.thank                                      = Vous vous \u00EAtes d\u00E9connect\u00E9 avec succ\u00E8s.
 jsp.login.logged-out.title                                      = D\u00E9connexion
-jsp.login.no-valid-cert.heading                                 = Acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.login.no-valid-cert.heading                                 = Acc\u00E9der \u00E0 votre espace personnel
 jsp.login.no-valid-cert.text                                    = <strong>Il semble que vous n'ayez pas un certificat web valide.</strong>  Veuillez essayer de nouveau.
 jsp.login.no-valid-cert.title                                   = Acc\u00E9der
 jsp.login.not-in-records.register                               = Inscription \u00E0 DSpace
 jsp.login.not-in-records.text                                   = Vous avez bien un certificat web valide, mais le syst\u00E8me DSpace ne poss\u00E8de pas de compte \u00E0 votre nom.  Vous devez vous <a href="{0}">inscrire au d\u00E9p\u00F4t</a> avant de pouvoir utiliser les fonctionnalit\u00E9s pour lesquelles le syst\u00E8me n\u00E9cessite un compte d'usager.
 jsp.login.not-in-records.title                                  = Compte d'usager non disponible\r\n
-jsp.login.password.heading                                      = Acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.login.password.heading                                      = Acc\u00E9der \u00E0 votre espace personnel
 jsp.login.password.title                                        = Acc\u00E9der
 jsp.morehelp                                                    = (Plus de d\u00E9tails...)
-jsp.mydspace                                                    = Ma \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.mydspace                                                    = Espace personnel
 jsp.mydspace.general.approve                                    = Accepter
-jsp.mydspace.general.backto-mydspace                            = Retourner \u00E0 ma \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.mydspace.general.backto-mydspace                            = Retourner \u00E0 l'espace personnel
 jsp.mydspace.general.cancel                                     = Annuler
-jsp.mydspace.general.goto-mydspace                              = Aller \u00E0 ma \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.mydspace.general.goto-mydspace                              = Aller directement \u00E0 l'espace personnel
+jsp.mydspace.general.open                                       = Ouvrir
 jsp.mydspace.general.reject                                     = Refuser
 jsp.mydspace.general.remove                                     = Supprimer
-jsp.mydspace.general.returnto-mydspace                          = Retourner \u00E0 ma \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.mydspace.general.returnto-mydspace                          = Retourner \u00E0 l'espace personnel
 jsp.mydspace.in-archive.heading1                                = Merci
-jsp.mydspace.in-archive.return.link                             = Retour \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.mydspace.in-archive.return.link                             = Retour \u00E0 votre espace personnel
 jsp.mydspace.in-archive.text1                                   = Le document est maintenant disponible dans le d\u00E9p\u00F4t. Voici l'identifiant qui lui a \u00E9t\u00E9 attribu\u00E9&nbsp;:
 jsp.mydspace.in-archive.text2                                   = Un avis vient d'\u00EAtre envoy\u00E9 au d\u00E9posant.
 jsp.mydspace.in-archive.title                                   = Document archiv\u00E9 dans le d\u00E9p\u00F4t.
@@ -457,6 +551,7 @@ jsp.mydspace.main.heading2                                      = T\u00E2che(s)
 jsp.mydspace.main.heading3                                      = T\u00E2che(s) propos\u00E9e(s)&nbsp;:
 jsp.mydspace.main.heading4                                      = Soumission(s) interrompue(s)&nbsp;:
 jsp.mydspace.main.heading5                                      = Soumission(s) en cours de v\u00E9rification&nbsp;:
+jsp.mydspace.main.heading6                                      = Groupes dont vous &ecirc;tes membre
 jsp.mydspace.main.item                                          = Document
 jsp.mydspace.main.link                                          = Voir vos abonnements aux nouveaut\u00E9s
 jsp.mydspace.main.perform.button                                = Ex\u00E9cuter cette t\u00E2che
@@ -472,7 +567,7 @@ jsp.mydspace.main.take.button                                   = Accepter la t\
 jsp.mydspace.main.task                                          = T\u00E2che
 jsp.mydspace.main.text1                                         = Voici les t\u00E2ches que vous avez accept\u00E9 d'ex\u00E9cuter&nbsp;:
 jsp.mydspace.main.text2                                         = L'assignation des t\u00E2ches suivantes vous est propos\u00E9e&nbsp;:
-jsp.mydspace.main.text4                                         = Vous pouvez ici continuer la soumission de vos documents.
+jsp.mydspace.main.text4                                         = Ici, vous pouvez reprendre la soumission de vos documents.
 jsp.mydspace.main.view.button                                   = Voir vos soumissions accept\u00E9es
 jsp.mydspace.own-submissions.text1                              = Aucun document n'a \u00E9t\u00E9 soumis par vous dans le d\u00E9p\u00F4t.
 jsp.mydspace.own-submissions.text2                              = Les soumissions de documents qui ont \u00E9t\u00E9 accept\u00E9es dans le d\u00E9p\u00F4t sont list\u00E9es ci-dessous.
@@ -485,7 +580,7 @@ jsp.mydspace.perform-task.instruct1                             = Si vous avez \
 jsp.mydspace.perform-task.instruct2                             = Si vous avez compl\u00E9t\u00E9 l'\u00E9dition des m\u00E9tadonn\u00E9es li\u00E9es \u00E0 ce document, cliquez ce bouton pour terminer l'archivage du document dans le d\u00E9p\u00F4t.
 jsp.mydspace.perform-task.instruct3                             = Si vous avez \u00E9valu\u00E9 le document et le trouvez <strong>non</strong> conforme pour inclusion dans la collection, cliquez sur \u00AB&nbsp;Refuser&nbsp;\u00BB.  Vous devrez pr\u00E9ciser la raison pour laquelle le document est non conforme et, \u00E9ventuellement, indiquer \u00E0 la personne ayant soumis le document s'il y a des modifications \u00E0 apporter afin de le rendre conforme.
 jsp.mydspace.perform-task.instruct4                             = Choisissez cette option pour modifier ou compl\u00E9ter les m\u00E9tadonn\u00E9es associ\u00E9es au document.
-jsp.mydspace.perform-task.instruct5                             = Utilisez cette option pour suspendre la t\u00E2che et retourner \u00E0 votre zone personnelle. Vous pourrez poursuivre plus tard l'ex\u00E9cution de cette t\u00E2che.
+jsp.mydspace.perform-task.instruct5                             = Utilisez cette option pour suspendre la t\u00E2che et retourner \u00E0 votre espace personnel. Vous pourrez poursuivre plus tard l'ex\u00E9cution de cette t\u00E2che.
 jsp.mydspace.perform-task.instruct6                             = Vous pouvez choisir de ne pas effectuer cette t\u00E2che et la remettre \u00E0 quelqu'un d'autre de votre groupe. La t\u00E2che ne sera pas effac\u00E9e du syst\u00E8me et il vous sera possible de la reprendre le cas \u00E9ch\u00E9ant (si personne d'autre ne la prend).
 jsp.mydspace.perform-task.later.button                          = Suspendre la t\u00E2che
 jsp.mydspace.perform-task.return.button                         = Annuler la t\u00E2che
@@ -503,7 +598,7 @@ jsp.mydspace.reject-reason.reject.button                        = Confirmer le r
 jsp.mydspace.reject-reason.text1                                = Veuillez indiquer de quelle mani\u00E8re le document ne satisfait pas les conditions n\u00E9cessaires \u00E0 son d\u00E9p\u00F4t dans la collection. Le cas \u00E9ch\u00E9ant, indiquer s'il y a des modifications \u00E0 apporter afin de le rendre conforme pour une nouvelle soumission. Ce message sera transmis \u00E0 la personne qui a effectu\u00E9 la soumission.
 jsp.mydspace.reject-reason.title                                = Raison du refus du document soumis
 jsp.mydspace.remove-item.cancel.button                          = Annuler le retrait
-jsp.mydspace.remove-item.confirmation                           = \u00CAtes vous certain de vouloir retirer ce document du processus non compl\u00E9t\u00E9 de soumission&nbsp;?
+jsp.mydspace.remove-item.confirmation                           = \u00CAtes vous certain de vouloir retirer ce document de la proc\u00E9dure de soumission non compl\u00E9t\u00E9 de soumission&nbsp;?
 jsp.mydspace.remove-item.remove.button                          = Retirer le document
 jsp.mydspace.remove-item.title                                  = Retirer le document
 jsp.mydspace.subscriptions.info1                                = Vos abonnements ont \u00E9t\u00E9 mis \u00E0 jour.
@@ -534,7 +629,7 @@ jsp.register.forgot-password.forgot.button                      = J'ai oubli\u00
 jsp.register.forgot-password.info1                              = L'adresse de courriel que vous avez entr\u00E9e ne figure pas parmi celles des utilisateurs inscrits dans le syst\u00E8me.  Veuillez recommencer.
 jsp.register.forgot-password.info2                              = Inscrivez votre adresse de courriel ci-dessous et cliquez sur \u00AB&nbsp;J'ai oubli\u00E9 mon mot de passe&nbsp;\u00BB.  Vous recevrez un message qui vous permettra de d\u00E9finir un nouveau mot de passe.
 jsp.register.forgot-password.title                              = Mot de passe oubli\u00E9
-jsp.register.general.return-home                                = Retour \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB
+jsp.register.general.return-home                                = Retour \u00E0 votre espace personnel
 jsp.register.inactive-account.info                              = L'adresse de courriel que vous avez entr\u00E9e ne correspond pas \u00E0 un compte d'utilisateur actif. V\u00E9rifiez l'adresse que vous venez d'indiquer.  Si cette derni\u00E8re est valide, vous n&#39;\u00EAtes probablement pas encore <a href="{0}">inscrit</a> dans le syst\u00E8me.</P>
 jsp.register.inactive-account.title                             = Compte inactif
 jsp.register.invalid-token.info1                                = L'identifiant temporaire d'inscription (<i>token</i>) de l'adresse URL n'est pas valide, pour l'une des raisons suivantes&nbsp;:
@@ -623,7 +718,7 @@ jsp.statistics.report.info1                                     = Rapport g\u00E
 jsp.statistics.report.info2                                     = Rapports mensuels&nbsp;:
 jsp.statistics.report.title                                     = R\u00E9sum\u00E9 statistique
 jsp.submit.cancel.continue.button                               = Reprendre la soumission
-jsp.submit.cancel.info                                          = Voulez-vous supprimer la soumission \u00E0 moiti\u00E9 termin\u00E9e, ou voulez-vous la conserver et continuer \u00E0 la remplir plus tard? Vous pouvez aussi la reprendre l\u00E0 o\u00F9 vous \u00E9tiez rendus dans le processus de soumission si vous avez cliqu\u00E9 sur 'Annuler' par erreur. Cliquez sur le bouton correspondant \u00E0 votre choix&nbsp;:
+jsp.submit.cancel.info                                          = Voulez-vous supprimer la soumission \u00E0 moiti\u00E9 termin\u00E9e, ou voulez-vous la conserver et continuer \u00E0 la remplir plus tard? Vous pouvez aussi la reprendre l\u00E0 o\u00F9 vous \u00E9tiez rendus dans la proc\u00E9dure de soumission si vous avez cliqu\u00E9 sur 'Annuler' par erreur. Cliquez sur le bouton correspondant \u00E0 votre choix&nbsp;:
 jsp.submit.cancel.remove.button                                 = Supprimer la soumission
 jsp.submit.cancel.save.button                                   = Sauvegarder les informations d\u00E9j\u00E0 entr\u00E9es
 jsp.submit.cancel.title                                         = Annuler ou enregistrer la soumission
@@ -647,9 +742,9 @@ jsp.submit.choose-file.info6                                    = Veuillez prend
 jsp.submit.choose-file.info7                                    = Veuillez consulter l&#39;aide en ligne afin d&#39;\u00EAtre renseign\u00E9 sur les types de fichiers et leur niveau de prise en charge par le syst\u00E8me.
 jsp.submit.choose-file.info9                                    = Donner une courte description du contenu de ce fichier, tel par exemple "Article principal", ou "Ensemble de donn\u00E9es exp\u00E9rimentales".
 jsp.submit.choose-file.title                                    = T\u00E9l\u00E9charger un fichier.
-jsp.submit.complete.heading                                     = Soumission&nbsp;: Soumission compl\u00E9t\u00E9e
+jsp.submit.complete.heading                                     = Soumission compl\u00E9t\u00E9e
-jsp.submit.complete.info                                        = Votre soumission suivra maintenant son cours selon les \u00E9tapes du processus normal de v\u00E9rification mis en place pour la collection \u00E0 laquelle vous avez soumis votre document. Vous recevrez un avis par courriel d\u00E8s que votre document sera int\u00E9gr\u00E9 \u00E0 la collection ou, le cas \u00E9ch\u00E9ant, un avis indiquant que votre soumission ne peut \u00EAtre accept\u00E9e. Vous pouvez vous enqu\u00E9rir du statut de votre soumission en visitant votre \u00AB zone personnelle \u00BB.
+jsp.submit.complete.info                                        = Votre soumission suivra maintenant son cours selon les \u00E9tapes de la proc\u00E9dure normale de v\u00E9rification mis en place pour la collection \u00E0 laquelle vous avez soumis votre document. Vous recevrez un avis par courriel d\u00E8s que votre document sera int\u00E9gr\u00E9 \u00E0 la collection ou, le cas \u00E9ch\u00E9ant, un avis indiquant que votre soumission ne peut \u00EAtre accept\u00E9e. Vous pouvez vous enqu\u00E9rir du statut de votre soumission en visitant votre espace personnel.
-jsp.submit.complete.link                                        = Aller \u00E0 votre \u00AB zone personnelle \u00BB
+jsp.submit.complete.link                                        = Aller \u00E0 votre espace personnel
 jsp.submit.complete.title                                       = Soumission compl\u00E9t\u00E9e
 jsp.submit.creative-commons.choice1                             = Cliquer, au bas de cette page, sur le bouton "Suivant" si vous d\u00E9sirez <strong>conserver</strong> la licence choisie pr\u00E9alablement.
 jsp.submit.creative-commons.choice2                             = Cliquer, au bas de cette page, sur le bouton "Sauter cette \u00E9tape" si vous d\u00E9sirez <strong>supprimer</strong> la licence choisie pr\u00E9alablement et renoncer \u00E0 adjoindre une licence <i>Creative Commons</i>
@@ -664,6 +759,7 @@ jsp.submit.edit-metadata.button.add                             = Ajouter
 jsp.submit.edit-metadata.button.remove                          = Retirer
 jsp.submit.edit-metadata.button.remove2                         = Retirer
 jsp.submit.edit-metadata.cancelsave                             = Annuler/Enregistrer...
+jsp.submit.edit-metadata.controlledvocabulary                   = Cat\u00E9gories de Sujets
 jsp.submit.edit-metadata.day                                    = Jour&nbsp;:
 jsp.submit.edit-metadata.firstname                              = Pr\u00E9nom(s) + initiales<br/> e.g. <strong>Donald R.</strong>
 jsp.submit.edit-metadata.heading                                = Soumission&nbsp;: Description du document (ii)
@@ -703,7 +799,7 @@ jsp.submit.initial-questions.heading                            = Soumission&nbs
 jsp.submit.initial-questions.info                               = Veuillez cocher les \u00E9nonc\u00E9s qui s'appliquent, le cas \u00E9ch\u00E9ant, \u00E0 votre document puis faire suivant.
 jsp.submit.initial-questions.title                              = Description (i)
 jsp.submit.license-rejected.heading                             = Soumission&nbsp;: Licence rejet\u00E9e
-jsp.submit.license-rejected.info1                               = Vous avez choisi de ne pas accorder la licence permettant de distribuer votre document par le biais de DSpace. Votre soumission n'a pas \u00E9t\u00E9 supprim\u00E9e. Elle demeure accessible \u00E0 partir de votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB. Vous pourrez accepter la licence plus tard si vous le d\u00E9sirez ou retirer la soumission.
+jsp.submit.license-rejected.info1                               = Vous avez choisi de ne pas accorder la licence permettant de distribuer votre document par le biais de DSpace. Votre soumission n'a pas \u00E9t\u00E9 supprim\u00E9e. Elle demeure accessible \u00E0 partir de votre espace personnel. Vous pourrez accepter la licence plus tard si vous le d\u00E9sirez ou retirer la soumission.
 jsp.submit.license-rejected.info2                               = Veuillez contacter les gestionnaires du d\u00E9p\u00F4t si vous avez des doutes ou des questions \u00E0 l'\u00E9gard de la licence de distribution.
 jsp.submit.license-rejected.title                               = Licence rejet\u00E9e
 jsp.submit.no-theses.info1                                      = DSpace n'accepte actuellement pas les th\u00E8ses soumises individuellement, mais vous \u00EAtes encourag\u00E9\u00E9 \u00E0 utiliser le site s\u00E9par\u00E9, site encourag\u00E9 par les biblioth\u00E8ques et par le MIT Information System pour soumettre votre th\u00E8se \u00E0 <a href="http://thesis.mit.edu">Digital Library of MIT Theses</a>. Pour apprendre comment soumettre \u00E0 ce syst\u00E8me, voir <a href="http://web.mit.edu/etheses/www/etheses-home.html">.
@@ -742,16 +838,17 @@ jsp.submit.review.title                                         = V\u00E9rificat
 jsp.submit.review.unknown                                       = (inconnu)
 jsp.submit.review.upload1                                       = Fichiers&nbsp;t\u00E9l\u00E9charg\u00E9s&nbsp;:
 jsp.submit.review.upload2                                       = Fichier&nbsp;t\u00E9l\u00E9charg\u00E9&nbsp;:
-jsp.submit.saved.info                                           = La soumission de votre document a \u00E9t\u00E9 enregistr\u00E9e. Pour la poursuivre, il suffira d'acc\u00E9der \u00E0 votre \u00AB&nbsp;zone personnelle&nbsp;\u00BB, \u00E0 n'importe quelle moment, et de cliquer sur le bouton \u00AB&nbsp;Reprendre&nbsp;\u00BB s'appliquant \u00E0 la soumission interrompue.
+jsp.submit.saved.info                                           = La soumission de votre document a \u00E9t\u00E9 enregistr\u00E9e. Pour la poursuivre, il suffira d'acc\u00E9der \u00E0 votre espace personnel, \u00E0 n'importe quelle moment, et de cliquer sur le bouton \u00AB&nbsp;Reprendre&nbsp;\u00BB s'appliquant \u00E0 la soumission interrompue.
 jsp.submit.saved.title                                          = Soumission enregistr\u00E9e
 jsp.submit.select-collection.collection                         = Collection
 jsp.submit.select-collection.heading                            = Soumission&nbsp;: Choix de la collection
 jsp.submit.select-collection.info1                              = Choisissez la collection \u00E0 laquelle vous souhaitez soumettre un document dans le menu ci-dessous. Cliquez ensuite sur \u00AB&nbsp;Suivant&nbsp;\u00BB.
+jsp.submit.select-collection.none-authorized                    = Vous n'&ecirc;tes pas autoris\u00E9 &agrave; soumettre des documents, et ce pour toutes les collections.
 jsp.submit.select-collection.title                              = Choix de la collection
 jsp.submit.show-license.grant.button                            = J'accorde la licence
 jsp.submit.show-license.heading1                                = Soumission&nbsp;: Accorder la licence de distribution
 jsp.submit.show-license.info1                                   = <strong>Vous voici rendu \u00E0 la derni\u00E8re \u00E9tape</strong>. Veuillez prendre le temps de lire les termes de cette licence et d\u00E9cider si vous acceptez les conditions qui y sont mentionn\u00E9es. Cliquez ensuite sur l'un des boutons situ\u00E9s au bas de la page. En cliquant sur \u00AB Accorder la licence \u00BB, vous indiquez que vous acceptez les termes de la licence.
-jsp.submit.show-license.info2                                   = <strong>Refuser d'accorder la licence ne supprimera pas votre soumission</strong>. Votre document demeurera dans votre \u00AB zone personnelle \u00BB du d\u00E9p\u00F4t institutionnel. Vous pourrez alors retirer la soumission du syst\u00E8me ou accorder la licence plus tard, lorsque vous n'aurez plus de doutes ou de questions \u00E0 cet \u00E9gard.
+jsp.submit.show-license.info2                                   = <strong>Refuser d'accorder la licence ne supprimera pas votre soumission</strong>. Votre document demeurera dans votre espace personnel du d\u00E9p\u00F4t institutionnel. Vous pourrez alors retirer la soumission du syst\u00E8me ou accorder la licence plus tard, lorsque vous n'aurez plus de doutes ou de questions \u00E0 cet \u00E9gard.
 jsp.submit.show-license.notgrant.button                         = Je refuse d'accorder la licence
 jsp.submit.show-license.title                                   = Licence de distribution
 jsp.submit.show-uploaded-file.checksum                          = Somme de contr\u00F4le
@@ -821,6 +918,20 @@ jsp.submit.verify-prune.notproceed.button                       = Non&nbsp;: ann
 jsp.submit.verify-prune.proceed.button                          = Oui&nbsp;: appliquer les modifications
 jsp.submit.verify-prune.question                                = \u00CAtes-vous certain de vouloir appliquer les modifications&nbsp;?
 jsp.submit.verify-prune.title                                   = Modification aux r\u00E9ponses pr\u00E9c\u00E9demment fournies
+jsp.suggest.button.cancel                                       = Annuler
+jsp.suggest.button.send                                         = Envoyer la recommandation
+jsp.suggest.heading                                             = Document recommand\u00E9
+jsp.suggest.invitation                                          = Pour recommander un document &agrave; quelqu'un, veuillez compl\u00E9ter le formulaire ci-dessous. Les zones obligatoires sont marqu\u00E9es avec une \u00E9toile.
+jsp.suggest.message                                             = Message personnel:
+jsp.suggest.recipemail                                          = Courriel du destinataire*:
+jsp.suggest.recipname                                           = Nom du destinataire:
+jsp.suggest.senderemail                                         = Votre courriel:
+jsp.suggest.sendername                                          = Votre nom:
+jsp.suggest.title                                               = Recommander un document
+jsp.suggest.warning                                             = Veuillez compl\u00E9ter toutes les cases obligatoires
+jsp.suggestok.button.close                                      = Fermer
+jsp.suggestok.heading                                           = Votre recommandation a \u00E9t\u00E9 envoy\u00E9e avec succ&egrave;s!
+jsp.suggestok.title                                             = Recommandation envoy\u00E9e
 jsp.tombstone.text                                              = Nous sommes d\u00E9sol\u00E9s, le document auquel vous tentez d'acc\u00E9der a \u00E9t\u00E9 retir\u00E9 de DSpace. Au besoin, contactez les administrateurs&nbsp;:
 jsp.tombstone.title                                             = Document retir\u00E9
 jsp.tools.confirm-delete-collection.confirm                     = Etes-vous sur de vouloir surpprimer la Collection <strong>{0}</strong>? Cel\u00E0 supprimera&nbsp;:
@@ -841,57 +952,61 @@ jsp.tools.confirm-delete-item.title                             = Supprimer le d
 jsp.tools.confirm-withdraw-item.question                        = \u00CAtes-vous s\u00FBr que ce document devrait \u00EAtre retir\u00E9 du d\u00E9p\u00F4t (il restera cependant dans la base de donn\u00E9es mais sera inaccesible aux internautes).
 jsp.tools.confirm-withdraw-item.title                           = Retirer le document
 jsp.tools.confirm-withdraw-item.withdraw.button                 = Retirer
-jsp.tools.edit-collection.button.delete                         = Delete this Collection...
+jsp.tools.creative-commons-edit.heading1                        = Ajouter ou remplacer la licence "Creative Commons"
-jsp.tools.edit-collection.form.button.add-logo                  = Upload new logo...
+jsp.tools.creative-commons-edit.title                           = Licence de distribution de DSpace
-jsp.tools.edit-collection.form.button.cancel                    = Cancel
+jsp.tools.edit-collection.button.delete                         = D\u00E9truire cette Collection...
-jsp.tools.edit-collection.form.button.create                    = Create...
+jsp.tools.edit-collection.form.button.add-logo                  = T\u00E9l\u00E9charger un nouveau logo...
-jsp.tools.edit-collection.form.button.create2                   = Create
+jsp.tools.edit-collection.form.button.cancel                    = Annuler
-jsp.tools.edit-collection.form.button.delete                    = Delete
+jsp.tools.edit-collection.form.button.create                    = Cr\u00E9er...
-jsp.tools.edit-collection.form.button.delete-logo               = Delete (no logo)
+jsp.tools.edit-collection.form.button.create2                   = Cr\u00E9er
-jsp.tools.edit-collection.form.button.edit                      = Edit...
+jsp.tools.edit-collection.form.button.delete                    = D\u00E9truire
-jsp.tools.edit-collection.form.button.set-logo                  = Upload a logo...
+jsp.tools.edit-collection.form.button.delete-logo               = D\u00E9truire (pas de logo)
-jsp.tools.edit-collection.form.button.update                    = Update
+jsp.tools.edit-collection.form.button.edit                      = &Eacute;diter...
-jsp.tools.edit-collection.form.label1                           = Name&nbsp;:
+jsp.tools.edit-collection.form.button.set-logo                  = T\u00E9l\u00E9charger un logo...
-jsp.tools.edit-collection.form.label10                          = Submitters&nbsp;:
+jsp.tools.edit-collection.form.button.update                    = Mise-&agrave;-jour
-jsp.tools.edit-collection.form.label11                          = Step&nbsp;:
+jsp.tools.edit-collection.form.label1                           = Nom&nbsp;:
-jsp.tools.edit-collection.form.label12                          = Collection Administrators&nbsp;:
+jsp.tools.edit-collection.form.label10                          = Soumissionnaires&nbsp;:
-jsp.tools.edit-collection.form.label13                          = Item template&nbsp;:
+jsp.tools.edit-collection.form.label11                          = &Eacute;tape&nbsp;:
-jsp.tools.edit-collection.form.label14                          = Collection's Authorizations&nbsp;:
+jsp.tools.edit-collection.form.label12                          = Administrateurs de Collections&nbsp;:
-jsp.tools.edit-collection.form.label2                           = Short Description
+jsp.tools.edit-collection.form.label13                          = Mod&egrave;le de document&nbsp;:
-jsp.tools.edit-collection.form.label3                           = Introductory text (HTML)&nbsp;:
+jsp.tools.edit-collection.form.label14                          = Politique d'acc&egrave;s des collections&nbsp;:
-jsp.tools.edit-collection.form.label4                           = Copyright text (plain text)&nbsp;:
+jsp.tools.edit-collection.form.label2                           = Courte description
-jsp.tools.edit-collection.form.label5                           = Side bar text (HTML)&nbsp;:
+jsp.tools.edit-collection.form.label3                           = Texte d'introduction (HTML)&nbsp;:
+jsp.tools.edit-collection.form.label4                           = Texte de Copyright&nbsp;:
+jsp.tools.edit-collection.form.label5                           = Texte affich\u00E9 sur le cot\u00E9 (HTML)&nbsp;:
 jsp.tools.edit-collection.form.label6                           = Licence&nbsp;:
 jsp.tools.edit-collection.form.label7                           = Provenance&nbsp;:
 jsp.tools.edit-collection.form.label8                           = Logo&nbsp;:
-jsp.tools.edit-collection.form.label9                           = Submission Workflow
+jsp.tools.edit-collection.form.label9                           = Proc\u00E9dure de soumission
-jsp.tools.edit-collection.heading1                              = Create Collection
+jsp.tools.edit-collection.heading1                              = Cr\u00E9er une Collection
-jsp.tools.edit-collection.heading2                              = Edit Collection {0}
+jsp.tools.edit-collection.heading2                              = &Eacute;diter la Collection {0}
-jsp.tools.edit-collection.title                                 = Edit Collection
+jsp.tools.edit-collection.title                                 = &Eacute;diter une Collection
-jsp.tools.edit-collection.wf-role1                              = Accept/Reject
+jsp.tools.edit-collection.wf-role1                              = Accepter/Rejeter
-jsp.tools.edit-collection.wf-role2                              = Accept/Reject/Edit Metadata
+jsp.tools.edit-collection.wf-role2                              = Accepter/Rejeter/&Eacute;diter les M\u00E9ta-donn\u00E9es
-jsp.tools.edit-collection.wf-role3                              = Edit Metadata
+jsp.tools.edit-collection.wf-role3                              = &Eacute;diter les M\u00E9ta-donn\u00E9es
-jsp.tools.edit-community.button.delete                          = Delete this Community...
+jsp.tools.edit-community.button.delete                          = D\u00E9truire une communaut\u00E9...
-jsp.tools.edit-community.form.button.add-logo                   = Upload new logo...
+jsp.tools.edit-community.form.button.add-logo                   = T\u00E9l\u00E9charger un logo...
-jsp.tools.edit-community.form.button.cancel                     = Cancel
+jsp.tools.edit-community.form.button.cancel                     = Annuler
-jsp.tools.edit-community.form.button.create                     = Create
+jsp.tools.edit-community.form.button.create                     = Cr\u00E9er
-jsp.tools.edit-community.form.button.delete-logo                = Delete (no logo)
+jsp.tools.edit-community.form.button.delete-logo                = D\u00E9truire (sans logo)
-jsp.tools.edit-community.form.button.edit                       = Edit...
+jsp.tools.edit-community.form.button.edit                       = &Eacute;diter...
-jsp.tools.edit-community.form.button.set-logo                   = Upload a logo...
+jsp.tools.edit-community.form.button.set-logo                   = T\u00E9l\u00E9charger un logo...
-jsp.tools.edit-community.form.button.update                     = Update
+jsp.tools.edit-community.form.button.update                     = Mise &agrave; jour
-jsp.tools.edit-community.form.label1                            = Name&nbsp;:
+jsp.tools.edit-community.form.label1                            = Nom&nbsp;:
-jsp.tools.edit-community.form.label2                            = Short Description
+jsp.tools.edit-community.form.label2                            = Description courte
-jsp.tools.edit-community.form.label3                            = Introductory text (HTML)&nbsp;:
+jsp.tools.edit-community.form.label3                            = Texte d'introduction (HTML)&nbsp;:
-jsp.tools.edit-community.form.label4                            = Copyright text (plain text)&nbsp;:
+jsp.tools.edit-community.form.label4                            = Texte du Copyright (texte simple)&nbsp;:
-jsp.tools.edit-community.form.label5                            = Side bar text (HTML)&nbsp;:
+jsp.tools.edit-community.form.label5                            = Texte pour l'affichage de c&ocirc;t\u00E9 (HTML)&nbsp;:
 jsp.tools.edit-community.form.label6                            = Logo&nbsp;:
-jsp.tools.edit-community.form.label7                            = Community's Authorizations&nbsp;:
+jsp.tools.edit-community.form.label7                            = Politique d'acc&egrave;s de la Communaut\u00E9&nbsp;:
-jsp.tools.edit-community.heading1                               = Create Community
+jsp.tools.edit-community.heading1                               = Cr\u00E9er une communaut\u00E9
-jsp.tools.edit-community.heading2                               = Edit Community {0}
+jsp.tools.edit-community.heading2                               = &Eacute;diter la Community {0}
-jsp.tools.edit-community.title                                  = Edit Community
+jsp.tools.edit-community.title                                  = &Eacute;diter une Community
 jsp.tools.edit-item-form.addbit.button                          = Ajouter un Fichier
+jsp.tools.edit-item-form.addcc.button                           = Ajouter une licence "Creative Commons"
 jsp.tools.edit-item-form.collections                            = Appartient \u00E0 la (aux) collection(s)&nbsp;:
 jsp.tools.edit-item-form.delete-w-confirm.button                = Supprimer...
+jsp.tools.edit-item-form.elem0                                  = Sch\u00E9ma
 jsp.tools.edit-item-form.elem1                                  = Element
 jsp.tools.edit-item-form.elem10                                 = Format
 jsp.tools.edit-item-form.elem11                                 = Description&nbsp;du<br />format&nbsp;de<br />l'utilisateur
@@ -914,6 +1029,7 @@ jsp.tools.edit-item-form.note                                   = REMARQUE&nbsp;
 jsp.tools.edit-item-form.note1                                  = Note&nbsp;: Les changements faits au bitstreams ne seront pas automatiquement report\u00E9s dans les m\u00E9tadonn\u00E9es Dublin Core ci-dessus (e.g. <code>format.extent</code>, <code>format.mimetype</code>). Vous devrez les mettre \u00E0 jour vous-m\u00EAme.
 jsp.tools.edit-item-form.note3                                  = Notez aussi que si le champ "Description du format de l'utilisateur" n'est pas vide, le format sera toujours mis en "Inconnu", donc, videz le champ "Description du format de l'utilisateur avant de changer le champ de format.
 jsp.tools.edit-item-form.reinstate.button                       = R\u00E9int\u00E9grer
+jsp.tools.edit-item-form.replacecc.button                       = Remplacer la licence "Creative Commons"
 jsp.tools.edit-item-form.title                                  = \u00C9diter le document
 jsp.tools.edit-item-form.withdraw-w-confirm.button              = Retirer...
 jsp.tools.eperson-list.close.button                             = Fermer
@@ -949,6 +1065,8 @@ jsp.tools.get-item-id.info1                                     = <strong>L'ID q
 jsp.tools.get-item-id.info2                                     = Entrez le Handle l'ID interne du document que vous voulez \u00E9diter ou supprimer.
 jsp.tools.get-item-id.internal                                  = ID interne&nbsp;:
 jsp.tools.get-item-id.title                                     = \u00C9diter le document
+jsp.tools.group-edit.eperson                                    = E-personnes membres de ce groupe
+jsp.tools.group-edit.group                                      = Groupes membres de ce groupe
 jsp.tools.group-edit.heading                                    = Membres actuels du groupe&nbsp;:
 jsp.tools.group-edit.name                                       = Nom&nbsp;:
 jsp.tools.group-edit.title                                      = \u00C9diter le groupe
@@ -959,9 +1077,24 @@ jsp.tools.group-list.name                                       = Nom
 jsp.tools.group-list.note1                                      = Notez que vous n'avez pas besoin d'ajouter manuellement les utilisateurs au groupe "Anonymes" - tous les utilisateurs en sont implicitement membre.
 jsp.tools.group-list.note2                                      = Attention - si vous essayez de supprimer un groupe auquel r\u00E9f\u00E8re une politique d'autorisation ou qui est un groupe de Workflow, vous aurez une "Internal server error".
 jsp.tools.group-list.title                                      = \u00C9diteur de groupes
+jsp.tools.group-select-list.close.button                        = Fermer
+jsp.tools.group-select-list.heading                             = Groupes {0} \u00E0 {1} de {2}
+jsp.tools.group-select-list.info1                               = Cliquer sur "Ajouter" pour ajouter un group &agrave; la liste du formulaire principal.
+jsp.tools.group-select-list.jump.first                          = Premier
+jsp.tools.group-select-list.jump.five-back                      = &lt; 5 pages
+jsp.tools.group-select-list.jump.five-forward                   = 5 pages &gt;
+jsp.tools.group-select-list.jump.last                           = Dernier
+jsp.tools.group-select-list.jump.one-back                       = &lt; 1 page
+jsp.tools.group-select-list.jump.one-forward                    = 1 page &gt;
+jsp.tools.group-select-list.th.id                               = ID
+jsp.tools.group-select-list.th.id.sortedby                      = ID &uarr;
+jsp.tools.group-select-list.th.name                             = Nom
+jsp.tools.group-select-list.th.name.sortedby                    = Nom &uarr;
+jsp.tools.group-select-list.title                               = S\u00E9lectionner les groupes
+jsp.tools.itemmap-browse.add                                    = Cocher les cases pr&egrave;s des documents que vous voulez ajouter et faire "Ajouter".
 jsp.tools.itemmap-browse.heading-authors                        = Parcourir les documents de l&#39;auteur "{0}"
 jsp.tools.itemmap-browse.heading-collection                     = Parcourir la collection {0}
-jsp.tools.itemmap-browse.infomsg                                = Cochez la case \u00E0 c\u00F4t\u00E9 d'un document que vous voulez ajouter ou supprimer, et choisissez "ajouter" ou "supprimer".
+jsp.tools.itemmap-browse.remove                                 = Cocher les cases pr&egrave;s des documents que vous voulez supprimer et faire "Supprimer".
 jsp.tools.itemmap-browse.th.action                              = Action
 jsp.tools.itemmap-browse.th.author                              = Premier auteur
 jsp.tools.itemmap-browse.th.date                                = Date
@@ -972,7 +1105,6 @@ jsp.tools.itemmap-info.button.continue                          = Continuer
 jsp.tools.itemmap-info.heading                                  = Informations sur le lien du document
 jsp.tools.itemmap-info.msg.added                                = Ajouter l'item {0}
 jsp.tools.itemmap-info.msg.none-selected                        = Aucun item s\u00E9lectionn\u00E9; aucun item ajout\u00E9.
-# In the following 2 messages the only parameter is an item ID
 jsp.tools.itemmap-info.msg.remove                               = Supprimer l'item {0}
 jsp.tools.itemmap-info.title                                    = Informations sur le lien du document
 jsp.tools.itemmap-main.collection                               = Collection&nbsp;: "{0}"
@@ -989,9 +1121,9 @@ jsp.tools.upload-bitstream.info                                 = Choisissez le
 jsp.tools.upload-bitstream.title                                = T\u00E9l\u00E9charger le fichier
 jsp.tools.upload-bitstream.upload                               = T\u00E9l\u00E9charger
 jsp.workspace.ws-error.errormsg1                                = Le syst\u00E8me est incapable de proc\u00E9der correctement \u00E0 votre requ\u00EAte. Vous devez sp\u00E9cifier un document.
-jsp.workspace.ws-error.errormsg2                                = Revenez \u00E0 "Ma zone personnelle" et choisissez "Reprendre" pour le document de l'espace de travail sur lequel vous voulez travailler. Si vous continuez \u00E0 avoir des probl\u00E8mes, n'h\u00E9sitez pas \u00E0 prendre contact avec nous, et nous ferons de notre mieux pour les r\u00E9soudre.
+jsp.workspace.ws-error.errormsg2                                = Revenez \u00E0 "Espace personnel" et choisissez "Reprendre" pour le document de l'espace de travail sur lequel vous voulez travailler. Si vous continuez \u00E0 avoir des probl\u00E8mes, n'h\u00E9sitez pas \u00E0 prendre contact avec nous, et nous ferons de notre mieux pour les r\u00E9soudre.
-jsp.workspace.ws-error.heading                                  = Erreur - Document de "Ma zone personnelle"
+jsp.workspace.ws-error.heading                                  = Erreur - Document de votre espace personnel
-jsp.workspace.ws-error.title                                    = "Ma zone personnelle" - Erreur
+jsp.workspace.ws-error.title                                    = Espace personnel - Erreur
 jsp.workspace.ws-main.button.edit                               = \u00C9diter
 jsp.workspace.ws-main.button.remove                             = Supprimer
 jsp.workspace.ws-main.button.view                               = Consulter
@@ -1000,15 +1132,17 @@ jsp.workspace.ws-main.editmsg                                   = \u00C9diter le
 jsp.workspace.ws-main.optionheading                             = Option
 jsp.workspace.ws-main.removemsg                                 = Supprimer le document (m\u00E9tadonn\u00E9es et fichier(s)).
 jsp.workspace.ws-main.submitmsg                                 = Le document est soumis \u00E0 cette collection&nbsp;:
-jsp.workspace.ws-main.title                                     = "Ma zone personnelle"
+jsp.workspace.ws-main.title                                     = Espace personnel
 jsp.workspace.ws-main.viewmsg                                   = Voir l'\u00E9tat actuel des m\u00E9tadonn\u00E9es inscrites pour cette soumission.
-jsp.workspace.ws-main.wsitem                                    = Document de "Ma zone personnelle"
+jsp.workspace.ws-main.wsitem                                    = Document de votre espace personnel
 jsp.workspace.wsv-error.errormsg1                               = Le syst\u00E8me est incapable de proc\u00E9der correctement \u00E0 votre requ\u00EAte. Vous devez sp\u00E9cifier un document.
-jsp.workspace.wsv-error.errormsg2                               = Revenez \u00E0 "Ma zone personnelle" et choisissez "Reprendre" pour le document de l'espace de travail sur lequel vous voulez travailler, cliquez ensuite sur "Consulter" dans la liste des options. Si vous avez toujours des probl\u00E8mes, n'h\u00E9sitez pas \u00E0 prendre contact avec nous, et nous ferons de notre mieux pour les r\u00E9soudre.
+jsp.workspace.wsv-error.errormsg2                               = Revenez \u00E0 "Espace personnel" et choisissez "Reprendre" pour le document de l'espace de travail sur lequel vous voulez travailler, cliquez ensuite sur "Consulter" dans la liste des options. Si vous avez toujours des probl\u00E8mes, n'h\u00E9sitez pas \u00E0 prendre contact avec nous, et nous ferons de notre mieux pour les r\u00E9soudre.
 jsp.workspace.wsv-error.heading                                 = Erreur - Voir le document de l'espace de travail
-jsp.workspace.wsv-error.title                                   = "Ma zone personnelle" - Voir les erreurs des documents de l'espace de travail
+jsp.workspace.wsv-error.title                                   = Espace personnel - Voir les erreurs des documents de l'espace de travail
 
 metadata.dc.contributor.*           = Auteur(s)
+metadata.dc.contributor.author      = Auteur(s)
+metadata.dc.contributor.editor      = &Eacute;diteur(s)
 metadata.dc.date.issued             = Date de publication
 metadata.dc.description             = Description
 metadata.dc.description.abstract    = R\u00E9sum\u00E9
@@ -1041,9 +1175,92 @@ org.dspace.app.webui.jsptag.ItemTag.filesize                 = Taille
 org.dspace.app.webui.jsptag.ItemTag.full                                        = Affichage complet
 org.dspace.app.webui.jsptag.ItemTag.itemprotected                               = Ce document est prot\u00E9g\u00E9 par copyright
 org.dspace.app.webui.jsptag.ItemTag.lang                                        = Langue
+org.dspace.app.webui.jsptag.ItemTag.submitted                                   = Soumission &agrave; la collection:
+org.dspace.app.webui.jsptag.ItemTag.thumbnail                                   = Miniature
 org.dspace.app.webui.jsptag.ItemTag.value                                       = Valeur
 org.dspace.app.webui.jsptag.ItemTag.view                                        = Voir/Ouvrir
 org.dspace.app.webui.jsptag.ItemTag.viewlicence                                 = Voir la licence
 org.dspace.app.webui.jsptag.SelectEPersonTag.removeSelected                     = Supprimer les E-personnes s\u00E9lectionn\u00E9es
 org.dspace.app.webui.jsptag.SelectEPersonTag.selectPeople                       = Choisir les E-personnes...
 org.dspace.app.webui.jsptag.SelectEPersonTag.selectPerson                       = Choisir les E-personnes...
+org.dspace.app.webui.jsptag.SelectGroupTag.removeSelected                       = Retirer les s\u00E9lections
+org.dspace.app.webui.jsptag.SelectGroupTag.selectGroup                          = S\u00E9lectionner un groupe...
+org.dspace.app.webui.jsptag.SelectGroupTag.selectGroups                         = S\u00E9lectionner des groupes...
+org.dspace.app.webui.servlet.FeedServlet.feed-type.collection                   = Collection
+org.dspace.app.webui.servlet.FeedServlet.feed-type.community                    = Communaut\u00E9
+org.dspace.app.webui.servlet.FeedServlet.feed.title                             = DSpace {0}: {1}
+org.dspace.app.webui.servlet.FeedServlet.general-feed.description               = Le syst&egrave;me de d\u00E9p\u00F4t institutionnel DSpace obtient, conserve, indexe et distribue les documents \u00E9lectroniques.
+org.dspace.app.webui.servlet.FeedServlet.logo.title                             = Ic\u00F4ne pour ce canal
+org.dspace.app.webui.servlet.FeedServlet.notitle                                = sans titre
+org.dspace.app.webui.servlet.FeedServlet.search.description                     = Chercher dans ce canal
+org.dspace.app.webui.servlet.FeedServlet.search.name                            = chercher
+org.dspace.app.webui.servlet.FeedServlet.search.title                           = Le moteur de recherche {0}
+org.dspace.app.webui.servlet.FeedServlet.search.title.default                   = Le moteur de recherche de DSpace
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.badelemchar     = L'\u00E9l\u00E9ment ne doit pas contenir de points, soulign\u00E9s ou espaces.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.badqualchar     = Le qualificatif ne doit pas contenir de points, soulign\u00E9s ou espaces.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.createfailed    = La zone demand\u00E9e ne peut pas &ecirc;tre cr\u00E9\u00E9e parce qu'il y en a d\u00E9j&agrave; une de ce nom.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.elemempty       = L'\u00E9l\u00E9ment ne peut pas &ecirc;tre vide.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.elemtoolong     = L'\u00E9l\u00E9ment doit avoir moins de 64 caract&egrave;res.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.movearguments   = Choisir une zone &agrave; d\u00E9placer et un sch\u00E9ma de destination.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.movefailed      = La ou les zones requises ne peuvent pas &ecirc;tre d\u00E9plac\u00E9es parce qu'une zone identique existe d\u00E9j&agrave; dans le sch\u00E9ma de destination.
+org.dspace.app.webui.servlet.admin.MetadataFieldRegistryServlet.qualtoolong     = Le qualificatif doit avoir moins de 64 caract&egrave;res.
+org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet.emptyname      = Le nom court ne peut pas &ecirc;tre vide.
+org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet.emptynamespace = L'espace de nommage ne peut pas &ecirc;tre vide.
+org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet.illegalchar    = Le nom court ne doit pas contenir de points, soulign\u00E9s ou espaces.
+org.dspace.app.webui.servlet.admin.MetadataSchemaRegistryServlet.nametolong     = Le nom court doit avoir 32 caract&egrave;res ou moins.
+org.dspace.checker.ResultsLogger.bitstream-format                               = Format du Bitstream
+org.dspace.checker.ResultsLogger.bitstream-found                                = Bitstream trouv\u00E9
+org.dspace.checker.ResultsLogger.bitstream-id                                   = Bitstream ID
+org.dspace.checker.ResultsLogger.bitstream-info-found                           = Info du Bitstream trouv\u00E9e
+org.dspace.checker.ResultsLogger.bitstream-marked-deleted                       = Bitstream marqu\u00E9 comme d\u00E9truit
+org.dspace.checker.ResultsLogger.checksum-algorithm                             = Total de contr\u00F4le
+org.dspace.checker.ResultsLogger.checksum-comparison-result                     = R\u00E9sultat de la comparaison des totaux de contr\u00F4le
+org.dspace.checker.ResultsLogger.internal-id                                    = ID interne
+org.dspace.checker.ResultsLogger.name                                           = Nom
+org.dspace.checker.ResultsLogger.new-checksum                                   = Nouveau total de contr\u00F4le
+org.dspace.checker.ResultsLogger.previous-checksum                              = Total pr\u00E9c\u00E9dent
+org.dspace.checker.ResultsLogger.previous-checksum-data                         = Donn\u00E9es du total pr\u00E9c\u00E9dent
+org.dspace.checker.ResultsLogger.previous-checksum-date                         = Date du total pr\u00E9c\u00E9dent
+org.dspace.checker.ResultsLogger.run-start-time                                 = D\u00E9marrage de cette v\u00E9rification
+org.dspace.checker.ResultsLogger.size                                           = Taille
+org.dspace.checker.ResultsLogger.source                                         = Source
+org.dspace.checker.ResultsLogger.store-number                                   = Rayon num\u00E9ro
+org.dspace.checker.ResultsLogger.to-be-processed                                = &Agrave; traiter
+org.dspace.checker.ResultsLogger.user-format-description                        = Description du format "utilisateur"
+org.dspace.checker.SimpleReporterImpl.bitstream-id                              = Bitstream Id
+org.dspace.checker.SimpleReporterImpl.bitstream-not-found-report                = Ceci est un rapport "BITSTREAM NOT FOUND" pour
+org.dspace.checker.SimpleReporterImpl.bitstream-will-no-longer-be-processed     = Ceci est un rapport "BITSTREAM WILL NO LONGER BE PROCESSED" pour
+org.dspace.checker.SimpleReporterImpl.check-id                                  = ID v\u00E9rification
+org.dspace.checker.SimpleReporterImpl.checksum                                  = Total de contr&ocirc;le
+org.dspace.checker.SimpleReporterImpl.checksum-algorithm                        = Algorithme de calcul
+org.dspace.checker.SimpleReporterImpl.checksum-calculated                       = Total calcul\u00E9
+org.dspace.checker.SimpleReporterImpl.checksum-did-not-match                    = Ceci est un rapport "CHECKSUM DID NOT MATCH" pour
+org.dspace.checker.SimpleReporterImpl.checksum-expected                         = Total de contr&ocirc;le attendu
+org.dspace.checker.SimpleReporterImpl.date-range-to                             = &agrave;
+org.dspace.checker.SimpleReporterImpl.deleted                                   = D\u00E9truit
+org.dspace.checker.SimpleReporterImpl.deleted-bitstream-intro                   = Ceci est un rapport "BITSTREAM SET DELETED" pour
+org.dspace.checker.SimpleReporterImpl.description                               = Description
+org.dspace.checker.SimpleReporterImpl.format-id                                 = ID de format
+org.dspace.checker.SimpleReporterImpl.howto-add-unchecked-bitstreams            = Pour ajouter ces "bitstream" &agrave; la v\u00E9rification, ajouter l'option -u
+org.dspace.checker.SimpleReporterImpl.internal-id                               = ID interne
+org.dspace.checker.SimpleReporterImpl.name                                      = Nom
+org.dspace.checker.SimpleReporterImpl.no-bitstreams-changed                     = Aucun "bitstream" n'a chang\u00E9 de total de contr&ocirc;le
+org.dspace.checker.SimpleReporterImpl.no-bitstreams-to-delete                   = Aucun "bitstream" n'a \u00E9t\u00E9 d\u00E9truit aujourd'hui
+org.dspace.checker.SimpleReporterImpl.no-bitstreams-to-no-longer-be-processed   = Aucun "bitstream" n'est marqu\u00E9 &agrave; ne plus traiter
+org.dspace.checker.SimpleReporterImpl.no-changed-bitstreams                     = Aucun "bitstream" n'a chang\u00E9 de total de contr&ocirc;le
+org.dspace.checker.SimpleReporterImpl.no-unchecked-bitstreams                   = Aucun "bitstream" n'est pas v\u00E9rifi\u00E9 par le programme de validation
+org.dspace.checker.SimpleReporterImpl.process-end-date                          = Fin du traitement
+org.dspace.checker.SimpleReporterImpl.process-start-date                        = D\u00E9but du traitement
+org.dspace.checker.SimpleReporterImpl.result                                    = R\u00E9sultat
+org.dspace.checker.SimpleReporterImpl.size                                      = Taille
+org.dspace.checker.SimpleReporterImpl.source                                    = Source
+org.dspace.checker.SimpleReporterImpl.store-number                              = Rayon num\u00E9ro
+org.dspace.checker.SimpleReporterImpl.unchecked-bitstream-report                = Ceci est un rapport "UN-CHECKED BITSTREAM REPORT" pour
+org.dspace.content.Collection.untitled                                          = Sans titre
+org.dspace.content.Community.untitled                                           = Sans titre
+org.dspace.eperson.LDAPAuthentication.title                                     = Entrer votre identifiant LDAP et votre mot de passe
+org.dspace.eperson.PasswordAuthentication.title                                 = Entrer votre identifiant DSpace et votre mot de passe
+org.dspace.workflow.WorkflowManager.step1                                       = Ceci doit &ecirc;tre relu.
+org.dspace.workflow.WorkflowManager.step2                                       = La soumission doit &ecirc;tre v\u00E9rifi\u00E9e avant d'&ecirc;tre publi\u00E9e.
+org.dspace.workflow.WorkflowManager.step3                                       = Les m\u00E9ta-donn\u00E9es doivent &ecirc;tre v\u00E9rifi\u00E9es pour s'assurer du suivi des standards de catalogage de la collection. Elles seront modifi\u00E9es au besoin.
+org.dspace.workflow.WorkflowManager.untitled                                    = Sans titre