Merge branch 'master' into 2.2.0_stable

Goobi/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.7

Goobi/.settings/org.eclipse.wst.validation.prefs

@@ -1,7 +1,7 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorList
 USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.500.v201303130500
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.600.v201501211647
 eclipse.preferences.version=1
 override=true
 suspend=false
@@ -11,12 +11,16 @@ vals/org.eclipse.jst.jsf.ui.JSFNonELAttributeValueValidator/groups=0107include01
 vals/org.eclipse.jst.jsp.core.JSPBatchValidator/groups=0107include01113projectNature131org.eclipse.jdt.core.javanature0107include110111contentType134org.eclipse.jst.jsp.core.jspsourceT111contentType142org.eclipse.jst.jsp.core.jspfragmentsourceT111contentType134org.eclipse.jst.jsp.core.tagsourceT07fileext03jspF07fileext04jspfF07fileext03jsfF07fileext03tagF07fileext04tagfF07fileext03jsvF07fileext04jtplF0107exclude0104file112webapp/ui/jsT02
 vals/org.eclipse.jst.jsp.core.JSPContentValidator/groups=0107include09111contentType134org.eclipse.jst.jsp.core.jspsourceT111contentType142org.eclipse.jst.jsp.core.jspfragmentsourceT07fileext03jspF07fileext04jspfF07fileext03jsfF07fileext03tagF07fileext04tagfF07fileext03jsvF07fileext04jtplF0107exclude0104file112webapp/ui/jsT02
 vals/org.eclipse.jst.jsp.core.TLDValidator/groups=0107include04111contentType134org.eclipse.jst.jsp.core.tldsourceT111contentType135org.eclipse.jst.jsp.core.tagxsourceT07fileext03tldF07fileext04tagxF0107exclude0104file112webapp/ui/jsT02
+vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
 vals/org.eclipse.wst.dtd.core.dtdDTDValidator/groups=0107include04111contentType134org.eclipse.wst.dtd.core.dtdsourceT07fileext03dtdF07fileext03entF07fileext03modF0107exclude0104file112webapp/ui/jsT02
 vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file112webapp/ui/jsT02
 vals/org.eclipse.wst.jsdt.web.core.JsBatchValidator/groups=0107include01113projectNature134org.eclipse.wst.jsdt.core.jsNature0107include11007fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03jspF07fileext03jsfF07fileext03jsvF07fileext04jtplF111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType134org.eclipse.jst.jsp.core.jspsourceT0107exclude0104file112webapp/ui/jsT02
 vals/org.eclipse.wst.wsdl.validation.wsdl/groups=0107include0107fileext04wsdlF0107exclude0104file112webapp/ui/jsT02
+vals/org.eclipse.wst.xml.core.xml/global=TT03
 vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file112webapp/ui/jsT02
+vals/org.eclipse.wst.xsd.core.xsd/global=TT02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
 vals/org.eclipse.wst.xsd.core.xsd/groups=0107include0107fileext03xsdF0107exclude0104file112webapp/ui/jsT02
+vals/org.eclipse.wst.xsl.core.xsl/global=TT02
 vals/org.eclipse.wst.xsl.core.xsl/groups=0107include0207fileext03xslF111contentType134org.eclipse.wst.xml.core.xslsourceT0107exclude0104file112webapp/ui/jsT02
 vals/org.jboss.tools.jsf.xhtml/groups=0107include06111contentType111jsf.faceletT111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType142org.eclipse.jst.jsp.core.jspfragmentsourceT111contentType134org.eclipse.jst.jsp.core.tagsourceT07fileext05xhtmlF07fileext03jsfF0107exclude0104file112webapp/ui/jsT02
 vf.version=3

Goobi/src/de/sub/goobi/helper/GoobiScript.java

@@ -209,8 +209,8 @@ public void execute(List<Integer> inProzesse, String inScript) {
                 unloadRuleset();
             }
 
-            else if (myParameters.get("action").equalsIgnoreCase("updateFileSize")) {
-                updateFileSize(inProzesse);
+            else if (myParameters.get("action").equalsIgnoreCase("countImages")) {
+                countImages(inProzesse);
             } else if (myParameters.get("action").equalsIgnoreCase("countMetadata")) {
                 countMetadata(inProzesse);
             } else {
@@ -1184,7 +1184,7 @@ private void exportDms(List<Integer> processes, String exportImages, boolean exp
         }
     }
 
-    private void updateFileSize(List<Integer> processes) {
+    private void countImages(List<Integer> processes) {
         for (Integer processId : processes) {
             Process p = ProcessManager.getProcessById(processId);
             if (p.getSortHelperImages() == 0) {

Goobi/src/messages/messages_en.properties

@@ -1,5 +1,5 @@
 #Created by JInto - www.guh-software.de
-#Mon Feb 29 21:46:01 CET 2016
+#Fri Mar 04 14:19:39 CET 2016
 AND=Contains
 AddNewGroup=Add new group
 Anlegen\ eines\ Prozesses\ (auf\ Bandebene)=Process creation (at volume level)
@@ -319,7 +319,7 @@ creationDate=Creation date
 dashboard=Dashboard
 dashboard_nagiosNotLoaded=Daten vom Monitoring noch nicht vollst\u00E4ndig geladen. zzz
 dashboard_noItmConnection=Daten vom TaskManager noch nicht vollst\u00E4ndig geladen. zzz
-dashboard_processesPerMonth=Vorg\u00E4nge pro Monat zzz
+dashboard_processesPerMonth=Processes per month
 dashboard_rssNotLoaded=Daten vom RSS-Feed noch nicht vollst\u00E4ndig geladen. zzz
 dateIssued=Date of publication
 datei=File
@@ -1018,9 +1018,9 @@ metadataDurchschnitt=Metadata average
 metadataFileNotFound=Metadata file not found\:
 metadataGesamt=Metadata total
 metadataGroups=Metadata groups
-metadataSaveTime=Metadaten automatisch speichern zzz
+metadataSaveTime=Save metadata automatically
 metadataSaveTimeError=Der eingegebene Zeitraum muss zwischen 10 und 30 Minuten liegen. zzz
-metadataShortcut=Shortcut f\u00FCr den METS-Editor zzz
+metadataShortcut=Shortcut for the METS-Editor
 metadataValid=The metadata values are valid
 metadaten=Metadata
 metadatenAusZentralblattdateiImportieren=Import metadata from ZBL file
@@ -1061,7 +1061,7 @@ metsRightsOwnerSite=METS Rights owner URL
 metsRightsSponsor=METS Sponsor
 metsRightsSponsorLogo=METS Sponsor logo
 metsRightsSponsorSiteURL=METS Sponsor URL
-mets_ErrorRegularExpression=Error during the validation of '{0}\: The value '{1}' does not match the regular expression '{2}'.zzz
+mets_ErrorRegularExpression=Error during the validation of '{0}\: The value '{1}' does not match the regular expression '{2}'.
 mets_addTheseImages=Assign these images to the current structure element
 mets_authority_data=Authority data
 mets_bookmarkAdd=Add bookmark
@@ -1074,12 +1074,12 @@ mets_key_ctrl=Ctrl
 mets_key_ctrlAlt=Ctrl + Alt
 mets_key_ctrlShift=Ctrl + Shift
 mets_leaveMetsEditor=Exit the METS Editor
-mets_metadataOfCurrentDocStruct=Metadaten des ausgew\u00E4hlten Strukturelements zzz
+mets_metadataOfCurrentDocStruct=Metadata of the selected structure element
 mets_namePart=Epithet
 mets_no_metadata_assigned=No metadata assigned
 mets_no_metadatagroups_assigned=No metadata groups assigned
 mets_no_persons_assigned=No persons assigned
-mets_personsOfCurrentDocStruct=Personen des ausgew\u00E4hlten Strukturelements zzz
+mets_personsOfCurrentDocStruct=Persons of the selected structure element
 mets_printThisPage=Print this page
 mets_removeTheseImages=Remove these images from the list of assigned pages
 mets_resetPagination=Reset pagination completely
@@ -1103,10 +1103,10 @@ mets_treelevel=Display the hierarchical level in the structure hierarchy
 mets_treelevel_hide=Hide the hierarchical level in the structure hierarchy
 mets_zoomIn=Zoom in
 mets_zoomOut=Zoom out
-metseditorFinish=Leave METS-Editor zzz
-metseditorOpen=Open METS-editor zzz
+metseditorFinish=Exit METS-Editor
+metseditorOpen=Open METS-editor
 metseditorSaveExplanation=Es liegen Sicherheitskopien der automatischen Speicherung vor, die aktueller sind als die METS-Datei. Wie soll mit diesen Sicherheitskopien verfahren werden? zzz
-metseditorTemporaryDataExplanation=Es liegt eine Sicherheitskopie der automatischen Speicherung vor, die aktueller ist als die METS-Datei. Sollen diese Sicherheitskopie \u00FCbernommen oder verworfen werden? zzz
+metseditorTemporaryDataExplanation=There is an automatic backup of this METS file available that is newer than the last saved version. Would you like to use this backup instead of the older version?
 metseditor_pages_overview=Overview
 metseditor_pages_quickassign=Quick assignment
 metsfilegroups=METS file groups
@@ -1506,7 +1506,7 @@ unbekannterFehler=Unknown error
 unknownErrorMsgWithLinkToStartPage=An unexpected error occurred. You may have to restart. To continue please click <a href\='../newpages/Main.jsf'>here</a>.<p>You may ignore the Stack Trace or send an <a href\='replaceThisForErrorEmail'><b><b><b>email to the developers</b></b></b></a>.</p>
 unknownFolderConfigurationError=There was an unknown folder configured.
 unnummeriert=uncounted
-updateMetadataIndex=Update metadata index on exitzzz
+updateMetadataIndex=Update metadata index when finishing
 upload=Upload images?
 uploadFailed=Upload failed.
 uploadFile=Upload file