From 3e5eeb702abbceab228b3c7b6c94afc69bd7a034 Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Tue, 23 Jan 2018 16:24:13 +0200
Subject: [PATCH 001/100] Add submenu to payments settings menu

---
 templates/common/header.tpl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/common/header.tpl b/templates/common/header.tpl
index a69eabe7fd4..f24583a1001 100644
--- a/templates/common/header.tpl
+++ b/templates/common/header.tpl
@@ -18,7 +18,17 @@
 		</li>
 	{/if}
 	{if $currentJournal && $currentJournal->getSetting('paymentsEnabled') && array_intersect(array(ROLE_ID_SITE_ADMIN, ROLE_ID_MANAGER, ROLE_ID_SUBSCRIPTION_MANAGER), (array)$userRoles)}
-		<li><a name="payments" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="payments"}">{translate key="common.payments"}</a></li>
+		<li>
+			<a name="payments" href="#">{translate key="common.payments"}</a>
+			<ul>
+				<li><a name="individualSubscription" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="individualSubscription"}">{translate key="subscriptionManager.individualSubscriptions"}</a></li>
+				<li><a name="institutionalSubscriptions" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="institutionalSubscriptions"}">{translate key="subscriptionManager.institutionalSubscriptions"}</a></li>
+				<li><a name="subscriptionTypes" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="subscriptionTypes"}">{translate key="subscriptionManager.subscriptionTypes"}</a></li>
+				<li><a name="subscriptionPolicies" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="subscriptionPolicies"}">{translate key="manager.subscriptionPolicies"}</a></li>
+				<li><a name="paymentTypes" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="paymentTypes"}">{translate key="manager.paymentTypes"}</a></li>
+				<li><a name="payments" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="payments"}">{translate key="common.payments"}</a></li>
+			</ul>
+		</li>
 	{/if}
 {/capture}
 {include file="core:common/header.tpl" appSpecificMenuItems=$appSpecificMenuItems}

From 0abd5f516f6ffd9cb20d8f13f38e2aac1e19909a Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Tue, 23 Jan 2018 16:40:51 +0200
Subject: [PATCH 002/100] add aria attributes to payment menu

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

diff --git a/templates/common/header.tpl b/templates/common/header.tpl
index f24583a1001..a8bf740681f 100644
--- a/templates/common/header.tpl
+++ b/templates/common/header.tpl
@@ -18,7 +18,7 @@
 		</li>
 	{/if}
 	{if $currentJournal && $currentJournal->getSetting('paymentsEnabled') && array_intersect(array(ROLE_ID_SITE_ADMIN, ROLE_ID_MANAGER, ROLE_ID_SUBSCRIPTION_MANAGER), (array)$userRoles)}
-		<li>
+		<li aria-haspopup="true" aria-expanded="false">
 			<a name="payments" href="#">{translate key="common.payments"}</a>
 			<ul>
 				<li><a name="individualSubscription" href="{url router=$smarty.const.ROUTE_PAGE page="payments" anchor="individualSubscription"}">{translate key="subscriptionManager.individualSubscriptions"}</a></li>

From 6d2a70e457b20356eb8ffb49089d0aa39ec0628e Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Tue, 6 Mar 2018 16:39:22 +0000
Subject: [PATCH 003/100] pkp/pkp-lib#3379 Show full titles in article summary
 template

---
 templates/frontend/objects/article_summary.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/frontend/objects/article_summary.tpl b/templates/frontend/objects/article_summary.tpl
index 2ef8f9bed5b..4bd8e5a58d1 100644
--- a/templates/frontend/objects/article_summary.tpl
+++ b/templates/frontend/objects/article_summary.tpl
@@ -31,7 +31,7 @@
 
 	<div class="title">
 		<a {if $journal}href="{url journal=$journal->getPath() page="article" op="view" path=$articlePath}"{else}href="{url page="article" op="view" path=$articlePath}"{/if}>
-			{$article->getLocalizedTitle()|strip_unsafe_html}
+			{$article->getLocalizedFullTitle()|strip_unsafe_html}
 		</a>
 	</div>
 

From bbe30e86599bb2f502a1037b18fce3e4ac5d2119 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Wed, 7 Mar 2018 11:45:12 +0000
Subject: [PATCH 004/100] pkp/pkp-lib#3379 Style subtitles in article summaries
 on separate line

---
 .../themes/default/styles/objects/article_summary.less | 10 +++++++++-
 templates/frontend/objects/article_summary.tpl         |  7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/plugins/themes/default/styles/objects/article_summary.less b/plugins/themes/default/styles/objects/article_summary.less
index 1f6102b374b..85b0a34afb5 100644
--- a/plugins/themes/default/styles/objects/article_summary.less
+++ b/plugins/themes/default/styles/objects/article_summary.less
@@ -5,7 +5,7 @@
  * Copyright (c) 2003-2018 John Willinsky
  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
  *
- * @brief Styles applying to a view of an article with all details
+ * @brief Styles applying to a summary view of an article for lists
  * @link templates/frontend/objects/article_details.tpl
  */
 .obj_article_summary {
@@ -33,6 +33,14 @@
 		}
 	}
 
+	.subtitle {
+		display: block;
+		margin-top: 0.25em;
+		margin-bottom: 0.5em;
+		font-weight: @normal;
+		color: @text-light;
+	}
+
 	.meta {
 		position: relative;
 		padding-top: @half;
diff --git a/templates/frontend/objects/article_summary.tpl b/templates/frontend/objects/article_summary.tpl
index 4bd8e5a58d1..739fb5d4a06 100644
--- a/templates/frontend/objects/article_summary.tpl
+++ b/templates/frontend/objects/article_summary.tpl
@@ -31,7 +31,12 @@
 
 	<div class="title">
 		<a {if $journal}href="{url journal=$journal->getPath() page="article" op="view" path=$articlePath}"{else}href="{url page="article" op="view" path=$articlePath}"{/if}>
-			{$article->getLocalizedFullTitle()|strip_unsafe_html}
+			{$article->getLocalizedTitle()|strip_unsafe_html}
+			{if $article->getLocalizedSubtitle()}
+				<span class="subtitle">
+					{$article->getLocalizedSubtitle()|escape}
+				</span>
+			{/if}
 		</a>
 	</div>
 

From 07a9aa433f1725cc897ba36b1e587b8d019fec4c Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 7 Mar 2018 15:43:14 -0800
Subject: [PATCH 005/100] Fix notification error at
 https://forum.pkp.sfu.ca/t/paypal-payments-not-working-still/38785/12

---
 classes/subscription/SubscriptionAction.inc.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/classes/subscription/SubscriptionAction.inc.php b/classes/subscription/SubscriptionAction.inc.php
index 9762301d747..3fe32d6fb4c 100644
--- a/classes/subscription/SubscriptionAction.inc.php
+++ b/classes/subscription/SubscriptionAction.inc.php
@@ -48,16 +48,6 @@ function sendOnlinePaymentNotificationEmail($request, $subscription, $mailTempla
 		$subscriptionTypeDao = DAORegistry::getDAO('SubscriptionTypeDAO');
 		$subscriptionType = $subscriptionTypeDao->getById($subscription->getTypeId(), $journal->getId());
 
-		$roleDao = DAORegistry::getDAO('RoleDAO');
-		$role = $roleDao->newDataObject();
-		if ($roleDao->getJournalUsersRoleCount($journal->getId(), ROLE_ID_SUBSCRIPTION_MANAGER) > 0) {
-			$role->setId(ROLE_ID_SUBSCRIPTION_MANAGER);
-			$rolePath = $role->getPath();
-		} else {
-			$role->setId(ROLE_ID_MANAGER);
-			$rolePath = $role->getPath();
-		}
-
 		$paramArray = array(
 			'subscriptionType' => $subscriptionType->getSummaryString(),
 			'userDetails' => $user->getContactSignature(),
@@ -67,11 +57,11 @@ function sendOnlinePaymentNotificationEmail($request, $subscription, $mailTempla
 		switch($mailTemplateKey) {
 			case 'SUBSCRIPTION_PURCHASE_INDL':
 			case 'SUBSCRIPTION_RENEW_INDL':
-				$paramArray['subscriptionUrl'] = $request->url($journal->getPath(), $rolePath, 'editSubscription', 'individual', array($subscription->getId()));
+				$paramArray['subscriptionUrl'] = $request->url($journal->getPath(), 'payments', null, null, null, 'individual');
 				break;
 			case 'SUBSCRIPTION_PURCHASE_INSTL':
 			case 'SUBSCRIPTION_RENEW_INSTL':
-				$paramArray['subscriptionUrl'] = $request->url($journal->getPath(), $rolePath, 'editSubscription', 'institutional', array($subscription->getId()));
+				$paramArray['subscriptionUrl'] = $request->url($journal->getPath(), 'payments', null, null, null, 'institutional');
 				$paramArray['institutionName'] = $subscription->getInstitutionName();
 				$paramArray['institutionMailingAddress'] = $subscription->getInstitutionMailingAddress();
 				$paramArray['domain'] = $subscription->getDomain();

From 68bc5ee65b207e65f3deb2b1c2ef4190788418fe Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Wed, 14 Feb 2018 18:21:18 +0200
Subject: [PATCH 006/100] pkp/pkp-lib#3287 Change default NMs titles -
 "Navigation Menu" postfix added

---
 registry/navigationMenus.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registry/navigationMenus.xml b/registry/navigationMenus.xml
index eb6c4c60648..4dd9ec4b4a1 100644
--- a/registry/navigationMenus.xml
+++ b/registry/navigationMenus.xml
@@ -14,7 +14,7 @@
 <!DOCTYPE navigationMenus SYSTEM "../lib/pkp/dtd/navigationMenus.dtd">
 
 <navigationMenus>
-	<navigationMenu title="User" area="user" site="1">
+	<navigationMenu title="User Navigation Menu" area="user" site="1">
 		<navigationMenuItem title="navigation.register" type="NMI_TYPE_USER_REGISTER" site="1" />
 		<navigationMenuItem title="navigation.login" type="NMI_TYPE_USER_LOGIN" site="1" />
 		<navigationMenuItem title="{$loggedInUsername}" type="NMI_TYPE_USER_DASHBOARD" site="1">
@@ -25,7 +25,7 @@
 		</navigationMenuItem>
 	</navigationMenu>
 
-	<navigationMenu title="Primary" area="primary">
+	<navigationMenu title="Primary Navigation Menu" area="primary">
 		<navigationMenuItem title="navigation.current" type="NMI_TYPE_CURRENT" />
 		<navigationMenuItem title="navigation.archives" type="NMI_TYPE_ARCHIVES" />
 		<navigationMenuItem title="manager.announcements" type="NMI_TYPE_ANNOUNCEMENTS" />

From 110e8388dc83af005d229135ee0bfe7caa124770 Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Thu, 8 Mar 2018 20:22:27 +0200
Subject: [PATCH 007/100] Submodule update
 ##defstat/i3287-update-nm-titles-if-not-in-area##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 9edfd3964fd..f6ccaf31b68 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 9edfd3964fde16e4e47d4f261235dd74d793abc0
+Subproject commit f6ccaf31b689808e83b2bde79a553bf46d7d57ad

From a2acf43baa6513ced78e26c0eb4b136b9ce20f0f Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 8 Mar 2018 12:15:46 -0800
Subject: [PATCH 008/100] Submodule updates

---
 docs/manual                           | 2 +-
 lib/pkp                               | 2 +-
 lib/ui-library                        | 2 +-
 plugins/generic/citationStyleLanguage | 2 +-
 plugins/generic/googleAnalytics       | 2 +-
 plugins/generic/lensGalley            | 2 +-
 plugins/generic/orcidProfile          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/manual b/docs/manual
index 0b3b8b4fc90..83c7460a7ca 160000
--- a/docs/manual
+++ b/docs/manual
@@ -1 +1 @@
-Subproject commit 0b3b8b4fc90805e94bcc085f2b5fcd71198a2516
+Subproject commit 83c7460a7caaa4d84382ac2354d02b10477855ab
diff --git a/lib/pkp b/lib/pkp
index f6ccaf31b68..717a243a240 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit f6ccaf31b689808e83b2bde79a553bf46d7d57ad
+Subproject commit 717a243a2401f72cdca62603569dbfbf421947be
diff --git a/lib/ui-library b/lib/ui-library
index 28ca6fea14f..a11262e2ce9 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 28ca6fea14f239fa5adb817a0be40751a395581c
+Subproject commit a11262e2ce904da3636d18f153fa903d9566a7af
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
index 311125f3e79..836fac8d768 160000
--- a/plugins/generic/citationStyleLanguage
+++ b/plugins/generic/citationStyleLanguage
@@ -1 +1 @@
-Subproject commit 311125f3e79de5099e712d0588838ddc99a46fc8
+Subproject commit 836fac8d7687b4a87a4c05c0d383d16379b743b4
diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics
index 71e11746eda..50a88876155 160000
--- a/plugins/generic/googleAnalytics
+++ b/plugins/generic/googleAnalytics
@@ -1 +1 @@
-Subproject commit 71e11746eda777ce26b87c9e4f94cb5ad9695f65
+Subproject commit 50a88876155382edd22024c549e1962b0b8fd2dc
diff --git a/plugins/generic/lensGalley b/plugins/generic/lensGalley
index e92229e92a5..92fb9237121 160000
--- a/plugins/generic/lensGalley
+++ b/plugins/generic/lensGalley
@@ -1 +1 @@
-Subproject commit e92229e92a5dd942da83eec0f2cd29da28d48233
+Subproject commit 92fb923712194cf4c1b9a9b9f202e81ec6501c12
diff --git a/plugins/generic/orcidProfile b/plugins/generic/orcidProfile
index 1111e36d9e5..36086e966b3 160000
--- a/plugins/generic/orcidProfile
+++ b/plugins/generic/orcidProfile
@@ -1 +1 @@
-Subproject commit 1111e36d9e54c82069cc68cc1005807f08f22ba8
+Subproject commit 36086e966b33475038efe7179c0a9aeb25a4f104

From e272051615831b7c13d84d9ba8073e11481693db Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 8 Mar 2018 13:49:00 -0800
Subject: [PATCH 009/100] Submodule update

---
 plugins/generic/lensGalley | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/lensGalley b/plugins/generic/lensGalley
index 92fb9237121..5a0465cfee3 160000
--- a/plugins/generic/lensGalley
+++ b/plugins/generic/lensGalley
@@ -1 +1 @@
-Subproject commit 92fb923712194cf4c1b9a9b9f202e81ec6501c12
+Subproject commit 5a0465cfee3193a4aae188ac89370b692952a82c

From 9d249cdf503e8eca951563f742ae026ea64b0d56 Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Fri, 9 Mar 2018 20:07:12 +0200
Subject: [PATCH 010/100] pkp/pkp-lib#520 Submodule Update
 ##defstat/i520-improve-submission-library-utility##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 717a243a240..7fdd84d3fac 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 717a243a2401f72cdca62603569dbfbf421947be
+Subproject commit 7fdd84d3fac369f41876ad83a4faad9ace0a4e79

From 01d8b634e0bf167e67362a5c75ea73996c6d8ae6 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@kb.dk>
Date: Mon, 12 Mar 2018 08:51:27 +0100
Subject: [PATCH 011/100] Extend delayed open access months

---
 classes/subscription/form/SubscriptionPolicyForm.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/subscription/form/SubscriptionPolicyForm.inc.php b/classes/subscription/form/SubscriptionPolicyForm.inc.php
index d4e6522a67d..b153d2ec1ac 100644
--- a/classes/subscription/form/SubscriptionPolicyForm.inc.php
+++ b/classes/subscription/form/SubscriptionPolicyForm.inc.php
@@ -14,7 +14,7 @@
  */
 
 define('SUBSCRIPTION_OPEN_ACCESS_DELAY_MIN', '1');
-define('SUBSCRIPTION_OPEN_ACCESS_DELAY_MAX', '24');
+define('SUBSCRIPTION_OPEN_ACCESS_DELAY_MAX', '60');
 define('SUBSCRIPTION_EXPIRY_REMINDER_BEFORE_MONTHS_MIN', '1');
 define('SUBSCRIPTION_EXPIRY_REMINDER_BEFORE_MONTHS_MAX', '12');
 define('SUBSCRIPTION_EXPIRY_REMINDER_BEFORE_WEEKS_MIN', '1');

From a03ddc716925962f89c8adde03898191b84e83a5 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Mon, 12 Mar 2018 10:55:24 +0100
Subject: [PATCH 012/100] Removing display:block on journal description (index)
 in default theme (it introduces ugly linebreaks after links).

---
 plugins/themes/default/styles/pages/indexSite.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/themes/default/styles/pages/indexSite.less b/plugins/themes/default/styles/pages/indexSite.less
index b6d42109a46..cac81b1cbe6 100644
--- a/plugins/themes/default/styles/pages/indexSite.less
+++ b/plugins/themes/default/styles/pages/indexSite.less
@@ -25,7 +25,6 @@
 			margin: @triple 0;
 		}
 
-		a,
 		img {
 			display: block;
 			max-height: 20em;

From fdff81a2fa58f9b20291b1449497ff58ec82df34 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Mon, 12 Mar 2018 12:11:31 -0700
Subject: [PATCH 013/100] Remove old reading tools code

---
 .../RelatedItemsBlockPlugin.inc.php           |  52 ---------------
 plugins/blocks/relatedItems/block.tpl         |  61 ------------------
 .../blocks/relatedItems/icons/lookupTerms.png | Bin 1629 -> 0 bytes
 .../relatedItems/icons/magnifier_zoom_in.png  | Bin 680 -> 0 bytes
 .../relatedItems/icons/magnifier_zoom_out.png | Bin 657 -> 0 bytes
 plugins/blocks/relatedItems/index.php         |  23 -------
 .../relatedItems/locale/ar_IQ/locale.xml      |  20 ------
 .../relatedItems/locale/da_DK/locale.xml      |  21 ------
 .../relatedItems/locale/de_DE/locale.xml      |  20 ------
 .../relatedItems/locale/en_US/locale.xml      |  20 ------
 .../relatedItems/locale/es_ES/locale.xml      |  20 ------
 .../relatedItems/locale/eu_ES/locale.xml      |  20 ------
 .../relatedItems/locale/fi_FI/locale.xml      |  20 ------
 .../relatedItems/locale/fr_CA/locale.xml      |  20 ------
 .../relatedItems/locale/id_ID/locale.xml      |  20 ------
 .../relatedItems/locale/it_IT/locale.xml      |  21 ------
 .../relatedItems/locale/nl_NL/locale.xml      |  21 ------
 .../relatedItems/locale/pl_PL/locale.xml      |  20 ------
 .../relatedItems/locale/pt_BR/locale.xml      |  20 ------
 .../relatedItems/locale/pt_PT/locale.xml      |  21 ------
 .../relatedItems/locale/ru_RU/locale.xml      |  20 ------
 .../locale/sr_RS@latin/locale.xml             |  21 ------
 .../relatedItems/locale/sv_SE/locale.xml      |  20 ------
 .../relatedItems/locale/tr_TR/locale.xml      |  21 ------
 .../relatedItems/locale/uk_UA/locale.xml      |  23 -------
 .../relatedItems/locale/zh_CN/locale.xml      |  21 ------
 plugins/blocks/relatedItems/settings.xml      |  29 ---------
 plugins/blocks/relatedItems/version.xml       |  20 ------
 28 files changed, 595 deletions(-)
 delete mode 100644 plugins/blocks/relatedItems/RelatedItemsBlockPlugin.inc.php
 delete mode 100644 plugins/blocks/relatedItems/block.tpl
 delete mode 100644 plugins/blocks/relatedItems/icons/lookupTerms.png
 delete mode 100644 plugins/blocks/relatedItems/icons/magnifier_zoom_in.png
 delete mode 100644 plugins/blocks/relatedItems/icons/magnifier_zoom_out.png
 delete mode 100644 plugins/blocks/relatedItems/index.php
 delete mode 100644 plugins/blocks/relatedItems/locale/ar_IQ/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/da_DK/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/de_DE/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/en_US/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/es_ES/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/eu_ES/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/fi_FI/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/fr_CA/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/id_ID/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/it_IT/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/nl_NL/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/pl_PL/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/pt_BR/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/pt_PT/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/ru_RU/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/sr_RS@latin/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/sv_SE/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/tr_TR/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/uk_UA/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/locale/zh_CN/locale.xml
 delete mode 100644 plugins/blocks/relatedItems/settings.xml
 delete mode 100644 plugins/blocks/relatedItems/version.xml

diff --git a/plugins/blocks/relatedItems/RelatedItemsBlockPlugin.inc.php b/plugins/blocks/relatedItems/RelatedItemsBlockPlugin.inc.php
deleted file mode 100644
index 30920add999..00000000000
--- a/plugins/blocks/relatedItems/RelatedItemsBlockPlugin.inc.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file plugins/blocks/relatedItems/RelatedItemsBlockPlugin.inc.php
- *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
- * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
- *
- * @class RelatedItemsBlockPlugin
- * @ingroup plugins_blocks_related_items
- *
- * @brief Class for related items block plugin
- */
-
-import('lib.pkp.classes.plugins.BlockPlugin');
-
-class RelatedItemsBlockPlugin extends BlockPlugin {
-	/**
-	 * Get the display name of this plugin.
-	 * @return String
-	 */
-	function getDisplayName() {
-		return __('plugins.block.relatedItems.displayName');
-	}
-
-	/**
-	 * Get a description of the plugin.
-	 */
-	function getDescription() {
-		return __('plugins.block.relatedItems.description');
-	}
-
-	/**
-	 * Get the supported contexts (e.g. BLOCK_CONTEXT_...) for this block.
-	 * @return array
-	 */
-	function getSupportedContexts() {
-		return array(BLOCK_CONTEXT_SIDEBAR);
-	}
-
-	/**
-	 * @see BlockPlugin::getContents
-	 */
-	function getContents($templateMgr, $request = null) {
-		$journal = $request->getJournal();
-
-		return parent::getContents($templateMgr, $request);
-	}
-}
-
-?>
diff --git a/plugins/blocks/relatedItems/block.tpl b/plugins/blocks/relatedItems/block.tpl
deleted file mode 100644
index 710e81f649a..00000000000
--- a/plugins/blocks/relatedItems/block.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-{**
- * plugins/blocks/relatedItems/block.tpl
- *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
- * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
- *
- * Keyword cloud block plugin
- *
- *}
-
-{if $journalRt && $journalRt->getEnabled() && $journalRt->getDefineTerms() && $version}
-
-<script>
-	{literal}
-	$(document).ready(function(){
-		$("#relatedItems").hide();
-		$("#toggleRelatedItems").show();
-	    $("#hideRelatedItems").click(function() {
-			$("#relatedItems").hide('slow');
-			$("#hideRelatedItems").hide();
-			$("#showRelatedItems").show();
-		});
-		$("#showRelatedItems").click(function() {
-			$("#relatedItems").show('slow');
-			$("#showRelatedItems").hide();
-			$("#hideRelatedItems").show();
-		});
-	});
-	{/literal}
-</script>
-
-<div class="pkp_block block_rt_related_items">
-	<span class="title">{translate key="plugins.block.relatedItems.title"}</span>
-	<div class="content">
-		<table>
-			<tr>
-				<td valign="top" style="width:26px;">
-					<img src="{$baseUrl}/plugins/blocks/relatedItems/icons/lookupTerms.png" class="articleToolIcon" />
-				</td>
-				<td valign="top">
-					<div id="relatedItems">
-						<ul class="plain">
-						{foreach from=$version->getContexts() item=context}
-							{if !$context->getDefineTerms()}
-								<li><a href="javascript:openRTWindowWithToolbar('{url router=$smarty.const.ROUTE_PAGE page="rt" op="context" path=$articleId|to_array:$galleyId:$context->getContextId()}');">{$context->getTitle()|escape}</a></li>
-							{/if}
-						{/foreach}
-						</ul>
-					</div>
-					<div id="toggleRelatedItems">
-						<span id="hideRelatedItems" style="display:none;"><img src="{$baseUrl}/plugins/blocks/relatedItems/icons/magnifier_zoom_out.png" /> {translate key="plugins.block.relatedItems.hide"}</span>
-						<span id="showRelatedItems"><img src="{$baseUrl}/plugins/blocks/relatedItems/icons/magnifier_zoom_in.png" /> {translate key="plugins.block.relatedItems.show"}</span>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
-</div>
-
-{/if}
diff --git a/plugins/blocks/relatedItems/icons/lookupTerms.png b/plugins/blocks/relatedItems/icons/lookupTerms.png
deleted file mode 100644
index 9ea42afed70b7bb2e7e85d471d0cef5acf7d8af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1629
zcmd^=`#0MM0L9bCs<l2mPPOTdQyXp9>QGeIp4ys~O*Th8M@JJu-ib)XGs@a-lz4>}
z@lC!2p+;2|Q7uymN%-cWB$Rk_LOm-w<v6wM@7O)(-p{$e-d}FIx7SaHj87QDV6a0-
z4>w-}kN@ZWdki^PE$=Y^&TtQ6_|b5TILvJ<3=u&K!&)J!7(CV&i-|~}%dl5rustwu
zPk;BwQe_Y)C+&?(xjK^CX;V4v_#2QHRjL%cEQ$m*XmSFPqxN*aCRz$7gYx{*bEINv
zYQH0yfRD_qBZG?YtVX?FA62G`h|jGUq!ZZ9w*{KiM(yzM@X$hUX2~-;D5dvVC(BOU
zk(|aAh&AuJ)eBt|Q2wA%ODgW}SV9H)dg3^}SuJBM;pqDMhm7<GB%UfBXvZb8F+n~O
z8H8gCMO{)V>xrw2W56%h8I>w}xr$z<!sj%hxm-8bOPE0Kj*iaF%}pWzk$G}ziGo_9
z6t*`IxpI6lL;)3)5+wnEn%kaHxe@|bPT|S19LW2}@1g~LL_nUPv7?m@DEoUwVhI&g
z-~lL<!VJldtC+HvX!%rrKL~=Dc1sNDZWtq-%vH><PsC91<TL>qI#x05A%D|@W@H8y
zKGbTp1ZG|=o!UNB71CrKCpup>b+KaVTX4emt`e5hI!*%EcxGOJ?~S1ap=73XaJ`nq
zQ*?JpgS?R}ehUtOu({1QW5Y=KEpc5o$yG&!LUDr3p1|pocB#;TzAU+81h*jzy51=g
z7l;wSDEzOnq=CUc_4~5u^6{ZH!LYvic1{hds1_qXp_qJfU*iBl^0a}A_XQ$+$Fbb1
z9*XQ_r7Fv(>2OSo51HHjR$otpY&fG<;jHK6j9N1HEu$NrD1irb8T-_mqT0<uc_r9_
z0dk3gf<;Gy(!|~iOh5{ZIB4d&Gz;BZTU(XWr)5g<;~Cq;bY7_jS)ul0l{Tf-_h+(L
z*;&~--CU92QDli?_I(cp=*FW0NdR=O&qA~Os(L(CG9h59Po_7I{w_Ve_|FU(&_wZ-
z^l~+kCy(wwlfY>u7Il+~#8Dk~6HAb0wVF|-ArwPQwH1jAG5WtIaplljlyo%`TBA`j
zpVC=ETK3ame=iDu;7_qHjX%IDZzFOc^^A;KsuF0JG``XgiMSPT0~_q`aqV(OM#j+4
z(9X^d1#jB{gYAMbe7*b(_5UoG--gjC!xlQE8^S++I81fvsBz>BlI^hX-u5{YPW0T2
zVIBBdHZ9ImcQf8oIQ1^zmg}uUoEk^CIl`<VW!wnZz7TBs)!5>+xrybB`TAs*xyRJ_
zIQsjP9islov&re_m?+F@_F**3rmw*|BG|QrIq|uvJ$o<4=D^v{Mn>AfBoyjOpIr|7
zl-to->h9(jd*@qHw~`an&hs}#`d;G7mN(j-7c9N9=uD+tb-y~QJ+6IK!H)4D4sWf#
zc=@s_v9(3}L+qo+8Guy&7&xdb1Lyt-w)#TQshD`zqmZ>d0+?GP`)tY;t*xW$E{phx
zi0}xO>!~<PyU7%NTJXl=ER+X9P@Z3VisyZ}dfp-)bP}#KS*+Niz8NbtA1E~=FOPe=
zrif6)6dB~?6m;g~t9|(<ZB@(5J=CY-Ey8leM`F$NLxfq|uewi-`;(lULxkAt^CIin
zG;(a=*%j<Zd}!D#;qpQqo84E}^I^L%5T{n7CTK=KZ^zWnAe}GfWM(c-1~CLJQOZG<
z9&A{|=DNO~?(nm+PidUjPi4!aUF>X!8`phtdFSpAC4ITHp$@rblCN#GS=_XAcP}u)
z)Estz-T7My-~9<6cffJi>)nXgJU@h4l$FJ#K{}mo(v*M1BowxB)0ub7^kA~#FJMS_
LFSoiMLht<xK-=d8

diff --git a/plugins/blocks/relatedItems/icons/magnifier_zoom_in.png b/plugins/blocks/relatedItems/icons/magnifier_zoom_in.png
deleted file mode 100644
index af4fe07477243b9b2099899d1ef47b8e3fd87b09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!I!Q!9R5;6}
zl3Qq!aTvyjf!76HL|p{CS*&QSh*)&G7|~S})mV*Mv$>FJNMp+(Bt!=q9U!ZZOlw$c
zuAy5i+nTd|<_>NivLu&tYWf+obh7aHN%Hi45`pBR)x`t<o8RyMyf1GNfTI7&uZO|=
zoijX>A#^U98gM4FFC6h~&)aWQw>e5Y84Gj%C?Fa5wL3#v12nvm3<6OafjJt}U((Qj
zn8!nMmXr-qoCO7XcZRS8(x9RlIA>F^1(GoPldw}sc)rpQ>IL9yYf!7MN);5mno3dL
zFr9-f3^@5I0h2d@QBNW#I`RB4IwvonO1T#W1?;?jrZNjp_!1ar;E|a)8g&BH^;Scq
zt%uAgf}pb+yKn5ouFDnCJb}hGpY=s(m>77B`PIn4hUqw48S;@<+#YViwZYT4_>vEC
z?=fr<mm^Q0GDWDVpY`9k;~*JW|1k!hst)^Pd%$bokMn)UaX?y$&7v}t2}@IX0;MrT
z^xNm)3Z-+iv#`z?%gNpcQ*31jyAEPg^ZLR&xUUa#?hg1#%|r-Re*%urDZFE1^28t?
z^kIi&JIb5ZVQXV)w&z?$Nx?(9+2`T3X<WpmE+-}FaAd{p_H2vX8f=p)y%uFNLgsGR
z9=AXx+z@_rYE8*+f`!sAspLLu-KHKT>Jc<3Fn+HA3jXTwUklhgJ-d<Hab~T0==vde
zv{ymYuE3%MY#uZeb7j0$YQ@Q7NNbi|S+s!7oukW_+&Z#!Wx*x>YkmNL^YBTW!uzZM
O0000<MNUMnLSTa76f-UW

diff --git a/plugins/blocks/relatedItems/icons/magnifier_zoom_out.png b/plugins/blocks/relatedItems/icons/magnifier_zoom_out.png
deleted file mode 100644
index 81f28199ac1c979f440f0586e6e0da48672e74a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!BS}O-R5;6}
zl5a>8VI0S0!CoiyA}k0DS`b78y(oGU6a>AkUK9~n*^7|=kr7cwRFWv6%Z}9bXJxHq
zv!bQ7t!|lawm;5>vpILy?iOC&HfG!Hc8BBJ-HKqfMb?WCJa0aq=l6SfssL2|4?ho1
zYF_hZS|)5^i5(2(3eSVtLjTwt+viCU4@P*+9|NQ!zmCYHkC8wnWH2cSOj5$smpmL3
zY1}4f$SympsTgoXWWvkj!KP${W<>az96Yfc0&EV^Sqav$1oSUxqGI6Xq{vddRFu7n
z`2LdsHzi;=Dtr$y0$QI$*opyl-<UG8Dv#0vT#Ec|It%H-dCVVefPA11;?CX3ZrhHz
z4V#c!wKi1}u=vvjIw8TW$Ro<FLyGL2$`<9X4?B^*+m2*+8+d&)xYmnE)T~5Fz~oM_
zlRw6P8_9xHWXH!0GRIH;dUH{ptzIsc1dKx*F%U>1%;k%_tFkSWDaJm;MHp-}I<6Z;
z`=uSavTxAsh-+>P#z@O32VYD;@Uw_<1$Q)qo>w&5O)gAWuE2V33*Ucwqps{ny7nxp
zX|aTf%a1~AQ*W?v_D-PC*yD@0=#7-ucnX}S5B~d&FdbXR-#fBe_gkP615I1CPtR;N
z4-*FwcN*ZjSr5aZ75rZZR34vLukCGEW45>LLezQ{#QvpNP(bBYeXX{uZkgF|xEA`o
r)y)eIsC4dIvZ!Ov;+nFL_^*5eZM*&99<oKX00000NkvXXu0mjf(?usy

diff --git a/plugins/blocks/relatedItems/index.php b/plugins/blocks/relatedItems/index.php
deleted file mode 100644
index 17323747a51..00000000000
--- a/plugins/blocks/relatedItems/index.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @defgroup plugins_blocks_related_items Related Items Block Plugin
- */
-
-/**
- * @file plugins/blocks/relatedItems/index.php
- *
- * Copyright (c) 2014-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
- * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
- *
- * @ingroup plugins_blocks_related_items
- * @brief Wrapper for related items block plugin.
- *
- */
-
-require_once('RelatedItemsBlockPlugin.inc.php');
-
-return new RelatedItemsBlockPlugin();
-
-?>
diff --git a/plugins/blocks/relatedItems/locale/ar_IQ/locale.xml b/plugins/blocks/relatedItems/locale/ar_IQ/locale.xml
deleted file mode 100644
index 690bf8037de..00000000000
--- a/plugins/blocks/relatedItems/locale/ar_IQ/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/ar_IQ/locale.xml
-  *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings.
-  -->
-
-<locale name="ar_IQ" full_name="العربية">
-	<message key="plugins.block.relatedItems.displayName">كتلة الفقرات ذات الصلة</message>
-	<message key="plugins.block.relatedItems.description">هذه الإضافة تعرض كتلة تتضمن الفقرات ذات الصلة على الشريط الجانبي لأدوات القراءة.</message>
-	<message key="plugins.block.relatedItems.title">الفقرات ذات الصلة</message>
-	<message key="plugins.block.relatedItems.hide">إخفاء</message>
-	<message key="plugins.block.relatedItems.show">إظهار الكل</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/da_DK/locale.xml b/plugins/blocks/relatedItems/locale/da_DK/locale.xml
deleted file mode 100644
index 136bbd982f5..00000000000
--- a/plugins/blocks/relatedItems/locale/da_DK/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/da_DK/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the da_DK (Dansk) locale.
-  *
-  -->
-
-<locale name="da_DK" full_name="Dansk">
-	<message key="plugins.block.relatedItems.displayName">Relaterede emner (blok)</message>
-	<message key="plugins.block.relatedItems.description">Dette plugin fremviser relaterede artikler  i sidemenuen under læseværktøjer.</message>
-	<message key="plugins.block.relatedItems.title">Relaterede artikler</message>
-	<message key="plugins.block.relatedItems.hide">Skjul</message>
-	<message key="plugins.block.relatedItems.show">Vis alle</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/de_DE/locale.xml b/plugins/blocks/relatedItems/locale/de_DE/locale.xml
deleted file mode 100644
index af86f131739..00000000000
--- a/plugins/blocks/relatedItems/locale/de_DE/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/de_DE/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_German_(de_DE)
-  * Localization strings.
-  -->
-
-<locale name="de_DE" full_name="Deutsch (Deutschland)">
-	<message key="plugins.block.relatedItems.displayName">Verwandte-Beiträge-Block</message>
-	<message key="plugins.block.relatedItems.description">Dieses Plugin erzeugt einen Block, der verwandte Beiträge enthält, in der Lesewerkzeuge-Sidebar.</message>
-	<message key="plugins.block.relatedItems.title">Verwandte Beiträge</message>
-	<message key="plugins.block.relatedItems.hide">Verstecken</message>
-	<message key="plugins.block.relatedItems.show">Alle zeigen</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/en_US/locale.xml b/plugins/blocks/relatedItems/locale/en_US/locale.xml
deleted file mode 100644
index 113be8a1b9a..00000000000
--- a/plugins/blocks/relatedItems/locale/en_US/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/en_US/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=Translating_OxS
-  * Localization strings.
-  -->
-
-<locale name="en_US" full_name="U.S. English">
-	<message key="plugins.block.relatedItems.displayName">Related Items Block</message>
-	<message key="plugins.block.relatedItems.description">This plugin displays a block containing related items in the reading tools sidebar.</message>
-	<message key="plugins.block.relatedItems.title">Related Items</message>
-	<message key="plugins.block.relatedItems.hide">Hide</message>
-	<message key="plugins.block.relatedItems.show">Show all</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/es_ES/locale.xml b/plugins/blocks/relatedItems/locale/es_ES/locale.xml
deleted file mode 100644
index 466b1001090..00000000000
--- a/plugins/blocks/relatedItems/locale/es_ES/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/es_ES/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Spanish_(es_ES)
-  * Localization strings.
-  -->
-
-<locale name="es_ES" full_name="Español (España)">
-	<message key="plugins.block.relatedItems.displayName">Bloque de ítems relacionados</message>
-	<message key="plugins.block.relatedItems.description">Este módulo muestra un bloque de ítems relacionados con el artículo en la barra lateral de las herramientas de lectura.</message>
-	<message key="plugins.block.relatedItems.title">Ítems relacionados</message>
-	<message key="plugins.block.relatedItems.hide">Ocultar</message>
-	<message key="plugins.block.relatedItems.show">Mostrar todos</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/eu_ES/locale.xml b/plugins/blocks/relatedItems/locale/eu_ES/locale.xml
deleted file mode 100644
index b2adcb07c92..00000000000
--- a/plugins/blocks/relatedItems/locale/eu_ES/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/eu_ES/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings.
-  -->
-
-<locale name="eu_ES" full_name="Euskara">
-	<message key="plugins.block.relatedItems.displayName">Erlazionatutako itemen blokea</message>
-	<message key="plugins.block.relatedItems.description">Plugin honek erlazionatutako itemak dituen bloke bat bistaratzen du irakurketa tresnen alboko barran.</message>
-	<message key="plugins.block.relatedItems.title">Erlazionatutako itemak</message>
-	<message key="plugins.block.relatedItems.hide">Ezkutatu</message>
-	<message key="plugins.block.relatedItems.show">Erakutsi guztia</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/fi_FI/locale.xml b/plugins/blocks/relatedItems/locale/fi_FI/locale.xml
deleted file mode 100644
index ceb2d73b1e4..00000000000
--- a/plugins/blocks/relatedItems/locale/fi_FI/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/fi_FI/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=Translating_OxS
-  * Localization strings.
-  -->
-
-<locale name="fi_FI" full_name="Suomi">
-	<message key="plugins.block.relatedItems.displayName">Samankaltaiset sisällöt -lohko</message>
-	<message key="plugins.block.relatedItems.description">Tämä lisäosa näyttää lukutyökalu-sivupalkissa lohkon, joka sisältää samankaltaisia sisältöjä.</message>
-	<message key="plugins.block.relatedItems.title">Samankaltaiset sisällöt</message>
-	<message key="plugins.block.relatedItems.hide">Piilota</message>
-	<message key="plugins.block.relatedItems.show">Näytä kaikki</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/fr_CA/locale.xml b/plugins/blocks/relatedItems/locale/fr_CA/locale.xml
deleted file mode 100644
index b7ebb32e44b..00000000000
--- a/plugins/blocks/relatedItems/locale/fr_CA/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/fr_CA/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_French_(fr_CA)
-  * Localization strings.
-  -->
-
-<locale name = "fr_CA" full_name = "Français (Canada)">
-	<message key="plugins.block.relatedItems.displayName">Bloc d'éléments connexes</message>
-	<message key="plugins.block.relatedItems.description">Ce plugiciel affiche un bloc contenant des éléments connexes dans le menu latéral des outils de lecture.</message>
-	<message key="plugins.block.relatedItems.title">Éléments connexes</message>
-	<message key="plugins.block.relatedItems.hide">Masquer</message>
-	<message key="plugins.block.relatedItems.show">Afficher tout</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/id_ID/locale.xml b/plugins/blocks/relatedItems/locale/id_ID/locale.xml
deleted file mode 100644
index 0ef48f7e908..00000000000
--- a/plugins/blocks/relatedItems/locale/id_ID/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/id_ID/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings.
-  -->
-
-<locale name="id_ID" full_name="Bahasa Indonesia">
-	<message key="plugins.block.relatedItems.displayName">Blok Item Terkait</message>
-	<message key="plugins.block.relatedItems.description">Plugin ini menampilkan blok yang berisi item terkait di bagian alat membaca.</message>
-	<message key="plugins.block.relatedItems.title">Item Terkait</message>
-	<message key="plugins.block.relatedItems.hide">Sembunyikan</message>
-	<message key="plugins.block.relatedItems.show">Tampilkan Semua</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/it_IT/locale.xml b/plugins/blocks/relatedItems/locale/it_IT/locale.xml
deleted file mode 100644
index 39fa2253547..00000000000
--- a/plugins/blocks/relatedItems/locale/it_IT/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/it_IT/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the it_IT (Italiano) locale.
-  *
-  -->
-
-<locale name="it_IT" full_name="Italiano">
-	<message key="plugins.block.relatedItems.displayName">Blocco delle risorse correlate</message>
-	<message key="plugins.block.relatedItems.description">Questo plugin mostra nella barra laterale degli strumenti di lettura un blocco contenente risorse correlate.</message>
-	<message key="plugins.block.relatedItems.title">Risorse correlate</message>
-	<message key="plugins.block.relatedItems.hide">Nascondi</message>
-	<message key="plugins.block.relatedItems.show">Mostra tutte</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/nl_NL/locale.xml b/plugins/blocks/relatedItems/locale/nl_NL/locale.xml
deleted file mode 100644
index 75d488816b9..00000000000
--- a/plugins/blocks/relatedItems/locale/nl_NL/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/nl_NL/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the nl_NL (Nederlands) locale.
-  *
-  -->
-
-<locale name="nl_NL" full_name="Nederlands">
-	<message key="plugins.block.relatedItems.displayName">Gerelateerde onderdelen blok</message>
-	<message key="plugins.block.relatedItems.description">Deze plugin toont een blok met gerelateerde onderdelen in de leesgereedschappen sidebar.</message>
-	<message key="plugins.block.relatedItems.title">Gerelateerd</message>
-	<message key="plugins.block.relatedItems.hide">Verberg</message>
-	<message key="plugins.block.relatedItems.show">Toon alle</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/pl_PL/locale.xml b/plugins/blocks/relatedItems/locale/pl_PL/locale.xml
deleted file mode 100644
index 6c7762d573c..00000000000
--- a/plugins/blocks/relatedItems/locale/pl_PL/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/pl_PL/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Polish_(pl_PL)
-  * Localization strings.
-  -->
-
-<locale name="pl_PL" full_name="Język Polski">
-	<message key="plugins.block.relatedItems.displayName">Powiązane elementy</message>
-	<message key="plugins.block.relatedItems.description">Wtyczka wyświetla elementy powiązane w kontekście treści wyświetlanej w oknie głównym.</message>
-	<message key="plugins.block.relatedItems.title">Powiązane elementy</message>
-	<message key="plugins.block.relatedItems.hide">Ukryj</message>
-	<message key="plugins.block.relatedItems.show">Pokaż wszystkie</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/pt_BR/locale.xml b/plugins/blocks/relatedItems/locale/pt_BR/locale.xml
deleted file mode 100644
index a852a4a0f7f..00000000000
--- a/plugins/blocks/relatedItems/locale/pt_BR/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/pt_BR/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Portuguese_(pt_BR)
-  * Localization strings.
-  -->
-
-<locale name="pt_BR" full_name="Português (Brasil)">
-	<message key="plugins.block.relatedItems.displayName">Itens relacionados</message>
-	<message key="plugins.block.relatedItems.description">Este plugin exibe um bloco de itens relacionados ao documento na barra de ferramentas de leitura.</message>
-	<message key="plugins.block.relatedItems.title">Itens relacionados</message>
-	<message key="plugins.block.relatedItems.hide">Ocultar</message>
-	<message key="plugins.block.relatedItems.show">Exibir todos</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/pt_PT/locale.xml b/plugins/blocks/relatedItems/locale/pt_PT/locale.xml
deleted file mode 100644
index 95edf25a7fb..00000000000
--- a/plugins/blocks/relatedItems/locale/pt_PT/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/pt_PT/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the pt_PT (Português (Portugal)) locale.
-  *
-  -->
-
-<locale name="pt_PT" full_name="Português (Portugal)">
-	<message key="plugins.block.relatedItems.displayName">Bloco Itens Relacionados</message>
-	<message key="plugins.block.relatedItems.description">Este plugin mostra um bloco contendo itens relacionados nas ferramentas de leitura disponível da barra lateral</message>
-	<message key="plugins.block.relatedItems.title">Itens Relacionados</message>
-	<message key="plugins.block.relatedItems.hide">Ocultar</message>
-	<message key="plugins.block.relatedItems.show">Mostrar Todos</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/ru_RU/locale.xml b/plugins/blocks/relatedItems/locale/ru_RU/locale.xml
deleted file mode 100644
index 93b5e567d62..00000000000
--- a/plugins/blocks/relatedItems/locale/ru_RU/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/ru_RU/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Russian_(ru_RU)
-  * Localization strings.
-  -->
-
-<locale name="ru_RU" full_name="Русский">
-	<message key="plugins.block.relatedItems.displayName">Блок «Связанные элементы»</message>
-	<message key="plugins.block.relatedItems.description">Отображает блок, содержащий связанные элементы в «Инструменты читателя» на боковую панель.</message>
-	<message key="plugins.block.relatedItems.title">Связанные элементы</message>
-	<message key="plugins.block.relatedItems.hide">Скрыть</message>
-	<message key="plugins.block.relatedItems.show">Показать все</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/sr_RS@latin/locale.xml b/plugins/blocks/relatedItems/locale/sr_RS@latin/locale.xml
deleted file mode 100644
index 06dc4912d3e..00000000000
--- a/plugins/blocks/relatedItems/locale/sr_RS@latin/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/sr_RS@latin/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the sr_RS@latin (Srpski) locale.
-  *
-  -->
-
-<locale name="sr_RS@latin" full_name="Srpski">
-	<message key="plugins.block.relatedItems.displayName">Blok povezanih stavki</message>
-	<message key="plugins.block.relatedItems.description">Ovaj blok prikazuje povezane stavke u alatkama za čitanje.</message>
-	<message key="plugins.block.relatedItems.title">Povezane stavke</message>
-	<message key="plugins.block.relatedItems.hide">Sakrij</message>
-	<message key="plugins.block.relatedItems.show">Prikaži sve</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/sv_SE/locale.xml b/plugins/blocks/relatedItems/locale/sv_SE/locale.xml
deleted file mode 100644
index 85026a395b9..00000000000
--- a/plugins/blocks/relatedItems/locale/sv_SE/locale.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/sv_SE/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Swedish_(sv_SE)
-  * Localization strings.
-  -->
-
-<locale name="sv_SE" full_name="Svenska">
-	<message key="plugins.block.relatedItems.displayName">Relaterade objekt-block</message>
-	<message key="plugins.block.relatedItems.description">Detta plugin lägger till ett block innehållandes relaterade objekt i sidofältet för läsverktyg.</message>
-	<message key="plugins.block.relatedItems.title">Relaterat</message>
-	<message key="plugins.block.relatedItems.hide">Göm</message>
-	<message key="plugins.block.relatedItems.show">Visa alla</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/tr_TR/locale.xml b/plugins/blocks/relatedItems/locale/tr_TR/locale.xml
deleted file mode 100644
index 4d4e0451011..00000000000
--- a/plugins/blocks/relatedItems/locale/tr_TR/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/tr_TR/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the tr_TR (Türkçe) locale.
-  *
-  -->
-
-<locale name="tr_TR" full_name="Türkçe">
-	<message key="plugins.block.relatedItems.displayName">İlgili Başlıklar Bloğu</message>
-	<message key="plugins.block.relatedItems.description">Bu eklenti ilgili başlıklar taşıyıcı bloğunun yan tarafta görüntülenmesini sağlar.</message>
-	<message key="plugins.block.relatedItems.title">İlgili Başlıklar</message>
-	<message key="plugins.block.relatedItems.hide">Sakla</message>
-	<message key="plugins.block.relatedItems.show">Tümünü göster</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/uk_UA/locale.xml b/plugins/blocks/relatedItems/locale/uk_UA/locale.xml
deleted file mode 100644
index 894b40745c7..00000000000
--- a/plugins/blocks/relatedItems/locale/uk_UA/locale.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/uk_UA/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the uk_UA (Українська) locale.
-  *
-  * Translated by Denys Solovianenko, 2011
-  * V. I. Vernadsky National Library of Ukraine
-  -->
-
-<locale name="uk_UA" full_name="Українська">
-       <message key="plugins.block.relatedItems.displayName">Блок споріднених об'єктів</message>
-       <message key="plugins.block.relatedItems.description">Цей модуль відображає на панелі інструментів для читання блок, що містить інструменти для пошуку споріднених об'єктів.</message>
-       <message key="plugins.block.relatedItems.title">Споріднені об'єкти</message>
-       <message key="plugins.block.relatedItems.hide">Приховати</message>
-       <message key="plugins.block.relatedItems.show">Показати все</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/locale/zh_CN/locale.xml b/plugins/blocks/relatedItems/locale/zh_CN/locale.xml
deleted file mode 100644
index 4cea1b869be..00000000000
--- a/plugins/blocks/relatedItems/locale/zh_CN/locale.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/locale/zh_CN/locale.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Localization strings for the zh_CN (简体中文) locale.
-  *
-  -->
-
-<locale name="zh_CN" full_name="简体中文">
-	<message key="plugins.block.relatedItems.displayName">Related Items Block</message>
-	<message key="plugins.block.relatedItems.description">This plugin displays a block containing related items in the reading tools sidebar.</message>
-	<message key="plugins.block.relatedItems.title">Related Items</message>
-	<message key="plugins.block.relatedItems.hide">Hide</message>
-	<message key="plugins.block.relatedItems.show">Show all</message>
-</locale>
diff --git a/plugins/blocks/relatedItems/settings.xml b/plugins/blocks/relatedItems/settings.xml
deleted file mode 100644
index 6f42f99eab5..00000000000
--- a/plugins/blocks/relatedItems/settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin_settings SYSTEM "../../../lib/pkp/dtd/pluginSettings.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/settings.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Default plugin settings.
-  *
-  -->
-
-<plugin_settings>
-	<setting type="bool">
-		<name>enabled</name>
-		<value>true</value>
-	</setting>
-	<setting type="int">
-		<name>seq</name>
-		<value>2</value>
-	</setting>
-	<setting type="int">
-		<name>context</name>
-		<value>1</value><!-- BLOCK_CONTEXT_SIDEBAR -->
-	</setting>
-</plugin_settings>
-
diff --git a/plugins/blocks/relatedItems/version.xml b/plugins/blocks/relatedItems/version.xml
deleted file mode 100644
index 4c10f66b303..00000000000
--- a/plugins/blocks/relatedItems/version.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE version SYSTEM "../../../lib/pkp/dtd/pluginVersion.dtd">
-
-<!--
-  * plugins/blocks/relatedItems/version.xml
-  *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
-  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
-  *
-  * Plugin version information.
-  -->
-<version>
-	<application>relatedItems</application>
-	<type>plugins.blocks</type>
-	<release>1.0.0.0</release>
-	<date>2010-04-05</date>
-	<lazy-load>1</lazy-load>
-	<class>RelatedItemsBlockPlugin</class>
-</version>

From 8ff86e6b9d8e7464bbe875da5401eb4bc11b12f8 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 7 Mar 2018 15:35:33 +0100
Subject: [PATCH 014/100] pkp/pkp-lib#3459 sitemap fix

---
 pages/sitemap/SitemapHandler.inc.php | 90 +++++++++++++++++-----------
 1 file changed, 56 insertions(+), 34 deletions(-)

diff --git a/pages/sitemap/SitemapHandler.inc.php b/pages/sitemap/SitemapHandler.inc.php
index 70ccadcaa67..dfb8a0ea177 100644
--- a/pages/sitemap/SitemapHandler.inc.php
+++ b/pages/sitemap/SitemapHandler.inc.php
@@ -10,7 +10,7 @@
  * @class SitemapHandler
  * @ingroup pages_sitemap
  *
- * @brief Produce a sitemap in XML format for submitting to search engines. 
+ * @brief Produce a sitemap in XML format for submitting to search engines.
  */
 
 import('lib.pkp.classes.xml.XMLCustomWriter');
@@ -38,14 +38,14 @@ function index() {
 			XMLCustomWriter::printXML($doc);
 		}
 	}
-	 
+
 	/**
 	 * Construct a sitemap index listing each journal's individual sitemap
 	 * @return XMLNode
 	 */
 	function _createSitemapIndex() {
 		$journalDao = DAORegistry::getDAO('JournalDAO');
-		
+
 		$doc = XMLCustomWriter::createDocument();
 		$root = XMLCustomWriter::createElement($doc, 'sitemapindex');
 		XMLCustomWriter::setAttribute($root, 'xmlns', SITEMAP_XSD_URL);
@@ -57,7 +57,7 @@ function _createSitemapIndex() {
 			XMLCustomWriter::createChildWithText($doc, $sitemap, 'loc', $sitemapUrl, false);
 			XMLCustomWriter::appendChild($root, $sitemap);
 		}
-		
+
 		XMLCustomWriter::appendChild($doc, $root);
 		return $doc;
 	}
@@ -70,50 +70,72 @@ function _createJournalSitemap() {
 		$issueDao = DAORegistry::getDAO('IssueDAO');
 		$publishedArticleDao = DAORegistry::getDAO('PublishedArticleDAO');
 		$galleyDao = DAORegistry::getDAO('ArticleGalleyDAO');
-		
+
 		$journal = Request::getJournal();
 		$journalId = $journal->getId();
-		
+
 		$doc = XMLCustomWriter::createDocument();
 		$root = XMLCustomWriter::createElement($doc, 'urlset');
 		XMLCustomWriter::setAttribute($root, 'xmlns', SITEMAP_XSD_URL);
-		
+
 		// Journal home
 		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(),'index','index')));
-		// About page
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'editorialTeam')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'editorialPolicies')));
+		// User register
+		if ($journal->getSetting('disableUserReg') != 1) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'user', 'register')));
+		}
+		// User login
+		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'login')));
+		// Announcements (the URL for each announcement is not considered)
+		if ($journal->getSetting('enableAnnouncements') == 1) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'announcement')));
+		}
+		// About: journal
+		if (!empty($journal->getSetting('about'))) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about')));
+		}
+		// About: submissions
 		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'submissions')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'siteMap')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'aboutThisPublishingSystem')));
+		// About: editorial team
+		if (!empty($journal->getSetting('editorialTeam'))) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'editorialTeam')));
+		}
+		// About: contact
+		if (!empty($journal->getSetting('mailingAddress')) || !empty($journal->getSetting('contactName'))) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'contact')));
+		}
 		// Search
 		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'search')));
 		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'search', 'authors')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'search', 'titles')));
 		// Issues
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'current')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'archive')));
-		$publishedIssues = $issueDao->getPublishedIssues($journalId);
-		while ($issue = $publishedIssues->next()) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'view', $issue->getId())));
-			// Articles for issue
-			$articles = $publishedArticleDao->getPublishedArticles($issue->getId());
-			foreach($articles as $article) {
-				// Abstract
-				XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId()))));
-				// Galley files
-				$galleys = $galleyDao->getBySubmissionId($article->getId());
-				while ($galley = $galleys->next()) {
-					XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId(), $galley->getId()))));
+		if ($journal->getSetting('publishingMode') != PUBLISHING_MODE_NONE) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'current')));
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'archive')));
+			$publishedIssues = $issueDao->getPublishedIssues($journalId);
+			while ($issue = $publishedIssues->next()) {
+				XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'view', $issue->getId())));
+				// Articles for issue
+				$articles = $publishedArticleDao->getPublishedArticles($issue->getId());
+				foreach($articles as $article) {
+					// Abstract
+					XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId()))));
+					// Galley files
+					$galleys = $galleyDao->getBySubmissionId($article->getId());
+					while ($galley = $galleys->next()) {
+						XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId(), $galley->getBestGalleyId()))));
+					}
 				}
 			}
 		}
-		
+
 		XMLCustomWriter::appendChild($doc, $root);
+
+		// Enable plugins to change the sitemap
+		HookRegistry::call('SitemapHandler::createJournalSitemap', array(&$doc));
+
 		return $doc;
 	}
-	
+
 	/**
 	 * Create a url entry with children
 	 * @param $doc XMLNode Reference to the XML document object
@@ -123,17 +145,17 @@ function _createJournalSitemap() {
 	 * @param $priority string Subjective priority assessment of page (optional)
 	 * @return XMLNode
 	 */
-	function _createUrlTree(&$doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {		
+	function _createUrlTree(&$doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {
 		$url =& XMLCustomWriter::createElement($doc, 'url');
-		
+
 		XMLCustomWriter::createChildWithText($doc, $url, htmlentities('loc'), $loc, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'lastmod', $lastmod, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'changefreq', $changefreq, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'priority', $priority, false);
-		
+
 		return $url;
 	}
-	
+
 }
 
 ?>

From 00be20808c34c5c60c50e7488a38e6e8bb599d04 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 8 Mar 2018 17:19:31 +0100
Subject: [PATCH 015/100] pkp/pkp-lib#3459 consider announcements and custom
 pages urls

---
 pages/sitemap/SitemapHandler.inc.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pages/sitemap/SitemapHandler.inc.php b/pages/sitemap/SitemapHandler.inc.php
index dfb8a0ea177..0ad00bed047 100644
--- a/pages/sitemap/SitemapHandler.inc.php
+++ b/pages/sitemap/SitemapHandler.inc.php
@@ -86,9 +86,14 @@ function _createJournalSitemap() {
 		}
 		// User login
 		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'login')));
-		// Announcements (the URL for each announcement is not considered)
+		// Announcements
 		if ($journal->getSetting('enableAnnouncements') == 1) {
 			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'announcement')));
+			$announcementDao = DAORegistry::getDAO('AnnouncementDAO');
+			$announcementsResult = $announcementDao->getByAssocId(ASSOC_TYPE_JOURNAL, $journalId);
+			while ($announcement = $announcementsResult->next()) {
+				XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'announcement', 'view', $announcement->getId())));
+			}
 		}
 		// About: journal
 		if (!empty($journal->getSetting('about'))) {
@@ -127,6 +132,12 @@ function _createJournalSitemap() {
 				}
 			}
 		}
+		// Custom pages (navigation menu items)
+		$navigationMenuItemDao = DAORegistry::getDAO('NavigationMenuItemDAO');
+		$menuItemsResult = $navigationMenuItemDao->getByType(NMI_TYPE_CUSTOM, $journalId);
+		while ($menuItem = $menuItemsResult->next()) {
+			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), $menuItem->getPath())));
+		}
 
 		XMLCustomWriter::appendChild($doc, $root);
 
@@ -148,7 +159,7 @@ function _createJournalSitemap() {
 	function _createUrlTree(&$doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {
 		$url =& XMLCustomWriter::createElement($doc, 'url');
 
-		XMLCustomWriter::createChildWithText($doc, $url, htmlentities('loc'), $loc, false);
+		XMLCustomWriter::createChildWithText($doc, $url, 'loc', $loc, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'lastmod', $lastmod, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'changefreq', $changefreq, false);
 		XMLCustomWriter::createChildWithText($doc, $url, 'priority', $priority, false);

From 6ed9b96f19f2e70f5b6c071c87d6b7c54b8ce015 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 8 Mar 2018 18:23:29 +0100
Subject: [PATCH 016/100] pkp/pkp-lib#3459 replace custom XML with standard
 DOM, introduce request variable

---
 pages/sitemap/SitemapHandler.inc.php | 97 +++++++++++++++-------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/pages/sitemap/SitemapHandler.inc.php b/pages/sitemap/SitemapHandler.inc.php
index 0ad00bed047..ee81f800bbb 100644
--- a/pages/sitemap/SitemapHandler.inc.php
+++ b/pages/sitemap/SitemapHandler.inc.php
@@ -23,19 +23,19 @@ class SitemapHandler extends Handler {
 	 * Generate an XML sitemap for webcrawlers
 	 * Creates a sitemap index if in site context, else creates a sitemap
 	 */
-	function index() {
-		if (Request::getRequestedJournalPath() == 'index') {
+	function index($args, $request) {
+		if ($request->getRequestedJournalPath() == 'index') {
 			$doc = $this->_createSitemapIndex();
 			header("Content-Type: application/xml");
 			header("Cache-Control: private");
 			header("Content-Disposition: inline; filename=\"sitemap_index.xml\"");
-			XMLCustomWriter::printXML($doc);
+			echo $doc->saveXml();
 		} else {
-			$doc = $this->_createJournalSitemap();
+			$doc = $this->_createJournalSitemap($request);
 			header("Content-Type: application/xml");
 			header("Cache-Control: private");
 			header("Content-Disposition: inline; filename=\"sitemap.xml\"");
-			XMLCustomWriter::printXML($doc);
+			echo $doc->saveXml();
 		}
 	}
 
@@ -46,19 +46,19 @@ function index() {
 	function _createSitemapIndex() {
 		$journalDao = DAORegistry::getDAO('JournalDAO');
 
-		$doc = XMLCustomWriter::createDocument();
-		$root = XMLCustomWriter::createElement($doc, 'sitemapindex');
-		XMLCustomWriter::setAttribute($root, 'xmlns', SITEMAP_XSD_URL);
+		$doc = new DOMDocument('1.0', 'utf-8');
+		$root = $doc->createElement('sitemapindex');
+		$root->setAttribute('xmlns', SITEMAP_XSD_URL);
 
 		$journals = $journalDao->getAll(true);
 		while ($journal = $journals->next()) {
-			$sitemapUrl = Request::url($journal->getPath(), 'sitemap');
-			$sitemap = XMLCustomWriter::createElement($doc, 'sitemap');
-			XMLCustomWriter::createChildWithText($doc, $sitemap, 'loc', $sitemapUrl, false);
-			XMLCustomWriter::appendChild($root, $sitemap);
+			$sitemapUrl = $request->url($journal->getPath(), 'sitemap');
+			$sitemap = $doc->createElement('sitemap');
+			$sitemap->appendChild($doc->createElement('loc', $sitemapUrl));
+			$root->appendChild($sitemap);
 		}
 
-		XMLCustomWriter::appendChild($doc, $root);
+		$doc->appendChild($root);
 		return $doc;
 	}
 
@@ -66,68 +66,69 @@ function _createSitemapIndex() {
 	 * Construct the sitemap
 	 * @return XMLNode
 	 */
-	function _createJournalSitemap() {
+	function _createJournalSitemap($request) {
 		$issueDao = DAORegistry::getDAO('IssueDAO');
 		$publishedArticleDao = DAORegistry::getDAO('PublishedArticleDAO');
 		$galleyDao = DAORegistry::getDAO('ArticleGalleyDAO');
 
-		$journal = Request::getJournal();
+		$journal = $request->getJournal();
 		$journalId = $journal->getId();
 
-		$doc = XMLCustomWriter::createDocument();
-		$root = XMLCustomWriter::createElement($doc, 'urlset');
-		XMLCustomWriter::setAttribute($root, 'xmlns', SITEMAP_XSD_URL);
+		$doc = new DOMDocument('1.0', 'utf-8');
+
+		$root = $doc->createElement('urlset');
+		$root->setAttribute('xmlns', SITEMAP_XSD_URL);
 
 		// Journal home
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(),'index','index')));
+		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(),'index','index')));
 		// User register
 		if ($journal->getSetting('disableUserReg') != 1) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'user', 'register')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'user', 'register')));
 		}
 		// User login
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'login')));
+		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'login')));
 		// Announcements
 		if ($journal->getSetting('enableAnnouncements') == 1) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'announcement')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'announcement')));
 			$announcementDao = DAORegistry::getDAO('AnnouncementDAO');
 			$announcementsResult = $announcementDao->getByAssocId(ASSOC_TYPE_JOURNAL, $journalId);
 			while ($announcement = $announcementsResult->next()) {
-				XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'announcement', 'view', $announcement->getId())));
+				$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'announcement', 'view', $announcement->getId())));
 			}
 		}
 		// About: journal
 		if (!empty($journal->getSetting('about'))) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about')));
 		}
 		// About: submissions
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'submissions')));
+		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'submissions')));
 		// About: editorial team
 		if (!empty($journal->getSetting('editorialTeam'))) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'editorialTeam')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'editorialTeam')));
 		}
 		// About: contact
 		if (!empty($journal->getSetting('mailingAddress')) || !empty($journal->getSetting('contactName'))) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'about', 'contact')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'contact')));
 		}
 		// Search
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'search')));
-		XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'search', 'authors')));
+		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'search')));
+		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'search', 'authors')));
 		// Issues
 		if ($journal->getSetting('publishingMode') != PUBLISHING_MODE_NONE) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'current')));
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'archive')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'issue', 'current')));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'issue', 'archive')));
 			$publishedIssues = $issueDao->getPublishedIssues($journalId);
 			while ($issue = $publishedIssues->next()) {
-				XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'issue', 'view', $issue->getId())));
+				$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'issue', 'view', $issue->getId())));
 				// Articles for issue
 				$articles = $publishedArticleDao->getPublishedArticles($issue->getId());
 				foreach($articles as $article) {
 					// Abstract
-					XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId()))));
+					$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'article', 'view', array($article->getBestArticleId()))));
 					// Galley files
 					$galleys = $galleyDao->getBySubmissionId($article->getId());
 					while ($galley = $galleys->next()) {
-						XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), 'article', 'view', array($article->getBestArticleId(), $galley->getBestGalleyId()))));
+						$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'article', 'view', array($article->getBestArticleId(), $galley->getBestGalleyId()))));
 					}
 				}
 			}
@@ -136,10 +137,10 @@ function _createJournalSitemap() {
 		$navigationMenuItemDao = DAORegistry::getDAO('NavigationMenuItemDAO');
 		$menuItemsResult = $navigationMenuItemDao->getByType(NMI_TYPE_CUSTOM, $journalId);
 		while ($menuItem = $menuItemsResult->next()) {
-			XMLCustomWriter::appendChild($root, $this->_createUrlTree($doc, Request::url($journal->getPath(), $menuItem->getPath())));
+			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), $menuItem->getPath())));
 		}
 
-		XMLCustomWriter::appendChild($doc, $root);
+		$doc->appendChild($root);
 
 		// Enable plugins to change the sitemap
 		HookRegistry::call('SitemapHandler::createJournalSitemap', array(&$doc));
@@ -149,21 +150,25 @@ function _createJournalSitemap() {
 
 	/**
 	 * Create a url entry with children
-	 * @param $doc XMLNode Reference to the XML document object
+	 * @param $doc DOMDocument Reference to the XML document object
 	 * @param $loc string URL of page (required)
 	 * @param $lastmod string Last modification date of page (optional)
 	 * @param $changefreq Frequency of page modifications (optional)
 	 * @param $priority string Subjective priority assessment of page (optional)
-	 * @return XMLNode
+	 * @return DOMNode
 	 */
-	function _createUrlTree(&$doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {
-		$url =& XMLCustomWriter::createElement($doc, 'url');
-
-		XMLCustomWriter::createChildWithText($doc, $url, 'loc', $loc, false);
-		XMLCustomWriter::createChildWithText($doc, $url, 'lastmod', $lastmod, false);
-		XMLCustomWriter::createChildWithText($doc, $url, 'changefreq', $changefreq, false);
-		XMLCustomWriter::createChildWithText($doc, $url, 'priority', $priority, false);
-
+	function _createUrlTree($doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {
+		$url = $doc->createElement('url');
+		$url->appendChild($doc->createElement('loc', $loc));
+		if ($lastmod) {
+			$url->appendChild($doc->createElement('lastmod', $lastmod));
+		}
+		if ($changefreq) {
+			$url->appendChild($doc->createElement('changefreq', $changefreq));
+		}
+		if ($priority) {
+			$url->appendChild($doc->createElement('priority', $priority));
+		}
 		return $url;
 	}
 

From 97b5fb814cbf22348414c674c01617707599bf0c Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Fri, 9 Mar 2018 14:52:30 +0100
Subject: [PATCH 017/100] pkp/pkp-lib#3459 fix function parameters descriptions

---
 pages/sitemap/SitemapHandler.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/sitemap/SitemapHandler.inc.php b/pages/sitemap/SitemapHandler.inc.php
index ee81f800bbb..fb8ca85faa6 100644
--- a/pages/sitemap/SitemapHandler.inc.php
+++ b/pages/sitemap/SitemapHandler.inc.php
@@ -22,6 +22,8 @@ class SitemapHandler extends Handler {
 	/**
 	 * Generate an XML sitemap for webcrawlers
 	 * Creates a sitemap index if in site context, else creates a sitemap
+	 * @param $args array
+	 * @param $request Request
 	 */
 	function index($args, $request) {
 		if ($request->getRequestedJournalPath() == 'index') {
@@ -41,7 +43,7 @@ function index($args, $request) {
 
 	/**
 	 * Construct a sitemap index listing each journal's individual sitemap
-	 * @return XMLNode
+	 * @return DOMDocument
 	 */
 	function _createSitemapIndex() {
 		$journalDao = DAORegistry::getDAO('JournalDAO');
@@ -64,7 +66,8 @@ function _createSitemapIndex() {
 
 	 /**
 	 * Construct the sitemap
-	 * @return XMLNode
+	 * @param $request Request
+	 * @return DOMDocument
 	 */
 	function _createJournalSitemap($request) {
 		$issueDao = DAORegistry::getDAO('IssueDAO');

From ed8234ff6a24ae8e30fdbaba4b75bea4bd2f9388 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Fri, 9 Mar 2018 18:21:55 +0100
Subject: [PATCH 018/100] pkp/pkp-lib#3459 move shared code to pkp-lib

---
 pages/sitemap/SitemapHandler.inc.php | 132 ++-------------------------
 1 file changed, 9 insertions(+), 123 deletions(-)

diff --git a/pages/sitemap/SitemapHandler.inc.php b/pages/sitemap/SitemapHandler.inc.php
index fb8ca85faa6..736b6aca2df 100644
--- a/pages/sitemap/SitemapHandler.inc.php
+++ b/pages/sitemap/SitemapHandler.inc.php
@@ -13,110 +13,26 @@
  * @brief Produce a sitemap in XML format for submitting to search engines.
  */
 
-import('lib.pkp.classes.xml.XMLCustomWriter');
-import('classes.handler.Handler');
+import('lib.pkp.pages.sitemap.PKPSitemapHandler');
 
-define('SITEMAP_XSD_URL', 'http://www.sitemaps.org/schemas/sitemap/0.9');
+class SitemapHandler extends PKPSitemapHandler {
 
-class SitemapHandler extends Handler {
 	/**
-	 * Generate an XML sitemap for webcrawlers
-	 * Creates a sitemap index if in site context, else creates a sitemap
-	 * @param $args array
-	 * @param $request Request
+	 * @copydoc PKPSitemapHandler_createContextSitemap()
 	 */
-	function index($args, $request) {
-		if ($request->getRequestedJournalPath() == 'index') {
-			$doc = $this->_createSitemapIndex();
-			header("Content-Type: application/xml");
-			header("Cache-Control: private");
-			header("Content-Disposition: inline; filename=\"sitemap_index.xml\"");
-			echo $doc->saveXml();
-		} else {
-			$doc = $this->_createJournalSitemap($request);
-			header("Content-Type: application/xml");
-			header("Cache-Control: private");
-			header("Content-Disposition: inline; filename=\"sitemap.xml\"");
-			echo $doc->saveXml();
-		}
-	}
-
-	/**
-	 * Construct a sitemap index listing each journal's individual sitemap
-	 * @return DOMDocument
-	 */
-	function _createSitemapIndex() {
-		$journalDao = DAORegistry::getDAO('JournalDAO');
-
-		$doc = new DOMDocument('1.0', 'utf-8');
-		$root = $doc->createElement('sitemapindex');
-		$root->setAttribute('xmlns', SITEMAP_XSD_URL);
-
-		$journals = $journalDao->getAll(true);
-		while ($journal = $journals->next()) {
-			$sitemapUrl = $request->url($journal->getPath(), 'sitemap');
-			$sitemap = $doc->createElement('sitemap');
-			$sitemap->appendChild($doc->createElement('loc', $sitemapUrl));
-			$root->appendChild($sitemap);
-		}
-
-		$doc->appendChild($root);
-		return $doc;
-	}
-
-	 /**
-	 * Construct the sitemap
-	 * @param $request Request
-	 * @return DOMDocument
-	 */
-	function _createJournalSitemap($request) {
-		$issueDao = DAORegistry::getDAO('IssueDAO');
-		$publishedArticleDao = DAORegistry::getDAO('PublishedArticleDAO');
-		$galleyDao = DAORegistry::getDAO('ArticleGalleyDAO');
+	function _createContextSitemap($request) {
+		$doc = parent::_createContextSitemap($request);
+		$root = $doc->documentElement;
 
 		$journal = $request->getJournal();
 		$journalId = $journal->getId();
 
-		$doc = new DOMDocument('1.0', 'utf-8');
-
-		$root = $doc->createElement('urlset');
-		$root->setAttribute('xmlns', SITEMAP_XSD_URL);
-
-		// Journal home
-		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(),'index','index')));
-		// User register
-		if ($journal->getSetting('disableUserReg') != 1) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'user', 'register')));
-		}
-		// User login
-		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'login')));
-		// Announcements
-		if ($journal->getSetting('enableAnnouncements') == 1) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'announcement')));
-			$announcementDao = DAORegistry::getDAO('AnnouncementDAO');
-			$announcementsResult = $announcementDao->getByAssocId(ASSOC_TYPE_JOURNAL, $journalId);
-			while ($announcement = $announcementsResult->next()) {
-				$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'announcement', 'view', $announcement->getId())));
-			}
-		}
-		// About: journal
-		if (!empty($journal->getSetting('about'))) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about')));
-		}
-		// About: submissions
-		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'submissions')));
-		// About: editorial team
-		if (!empty($journal->getSetting('editorialTeam'))) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'editorialTeam')));
-		}
-		// About: contact
-		if (!empty($journal->getSetting('mailingAddress')) || !empty($journal->getSetting('contactName'))) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'about', 'contact')));
-		}
 		// Search
 		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'search')));
-		$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'search', 'authors')));
 		// Issues
+		$issueDao = DAORegistry::getDAO('IssueDAO');
+		$publishedArticleDao = DAORegistry::getDAO('PublishedArticleDAO');
+		$galleyDao = DAORegistry::getDAO('ArticleGalleyDAO');
 		if ($journal->getSetting('publishingMode') != PUBLISHING_MODE_NONE) {
 			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'issue', 'current')));
 			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), 'issue', 'archive')));
@@ -136,12 +52,6 @@ function _createJournalSitemap($request) {
 				}
 			}
 		}
-		// Custom pages (navigation menu items)
-		$navigationMenuItemDao = DAORegistry::getDAO('NavigationMenuItemDAO');
-		$menuItemsResult = $navigationMenuItemDao->getByType(NMI_TYPE_CUSTOM, $journalId);
-		while ($menuItem = $menuItemsResult->next()) {
-			$root->appendChild($this->_createUrlTree($doc, $request->url($journal->getPath(), $menuItem->getPath())));
-		}
 
 		$doc->appendChild($root);
 
@@ -151,30 +61,6 @@ function _createJournalSitemap($request) {
 		return $doc;
 	}
 
-	/**
-	 * Create a url entry with children
-	 * @param $doc DOMDocument Reference to the XML document object
-	 * @param $loc string URL of page (required)
-	 * @param $lastmod string Last modification date of page (optional)
-	 * @param $changefreq Frequency of page modifications (optional)
-	 * @param $priority string Subjective priority assessment of page (optional)
-	 * @return DOMNode
-	 */
-	function _createUrlTree($doc, $loc, $lastmod = null, $changefreq = null, $priority = null) {
-		$url = $doc->createElement('url');
-		$url->appendChild($doc->createElement('loc', $loc));
-		if ($lastmod) {
-			$url->appendChild($doc->createElement('lastmod', $lastmod));
-		}
-		if ($changefreq) {
-			$url->appendChild($doc->createElement('changefreq', $changefreq));
-		}
-		if ($priority) {
-			$url->appendChild($doc->createElement('priority', $priority));
-		}
-		return $url;
-	}
-
 }
 
 ?>

From 2a5acc07504fd14d1cb91ffbb0209aa61e156bbb Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 12 Mar 2018 21:13:54 +0100
Subject: [PATCH 019/100] pkp/pkp-lib#3459 submodule update ##bozana/3459##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 7fdd84d3fac..c9e952804a9 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 7fdd84d3fac369f41876ad83a4faad9ace0a4e79
+Subproject commit c9e952804a910d3a221b870b8d8812c5b79b5185

From 0252e4715274d968df61dbf11971d330cf031460 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 12 Mar 2018 22:10:44 +0100
Subject: [PATCH 020/100] pkp/pkp-lib#3444 submodule update ##bozana/3444##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index c9e952804a9..c684829a6ce 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit c9e952804a910d3a221b870b8d8812c5b79b5185
+Subproject commit c684829a6ceab9191d1f22c623dd8c05fccb655c

From fdc287c094591101539760e7e5aca7b5ec3979d1 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Mon, 12 Mar 2018 14:46:47 -0700
Subject: [PATCH 021/100] Update minified JS

---
 js/pkp.min.js | 80 ++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/js/pkp.min.js b/js/pkp.min.js
index 487337d7bbd..f01563297ec 100644
--- a/js/pkp.min.js
+++ b/js/pkp.min.js
@@ -108,10 +108,9 @@ f+=h;t=[];if("[object Array]"===Object.prototype.toString.apply(g)){m=g.length;f
 e=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,f,h,j={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},i;"function"!==typeof JSON.stringify&&(JSON.stringify=function(a,b,d){var e;h=f="";if("number"===typeof d)for(e=0;e<d;e+=1)h+=" ";else"string"===typeof d&&(h=d);if((i=b)&&"function"!==typeof b&&("object"!==typeof b||"number"!==typeof b.length))throw Error("JSON.stringify");return c("",{"":a})});
 "function"!==typeof JSON.parse&&(JSON.parse=function(a,b){function c(a,d){var e,f,g=a[d];if(g&&"object"===typeof g)for(e in g)Object.prototype.hasOwnProperty.call(g,e)&&(f=c(g,e),void 0!==f?g[e]=f:delete g[e]);return b.call(a,d,g)}var e,a=String(a);d.lastIndex=0;d.test(a)&&(a=a.replace(d,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
 "]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return e=eval("("+a+")"),"function"===typeof b?c({"":e},""):e;throw new SyntaxError("JSON.parse");})})();function confirmAction(a,b){return confirm(b)?(a&&(document.location.href=a),!0):!1}function openHelp(a){window.open(a,"Help","width=700,height=600,screenX=100,screenY=100,toolbar=0,scrollbars=1")}function openComments(a){window.open(a,"Comments","width=700,height=600,screenX=100,screenY=100,toolbar=0,resizable=1,scrollbars=1")}function openWindow(a){window.open(a,"Window","width=600,height=550,screenX=100,screenY=100,toolbar=0,resizable=1,scrollbars=1")}
-function openRTWindow(a){window.open(a,"RT","width=700,height=500,screenX=100,screenY=100,toolbar=0,resizable=1,scrollbars=1")}function openRTWindowWithToolbar(a){window.open(a,"RT","width=700,height=500,screenX=100,screenY=100,toolbar=1,resizable=1,scrollbars=1")}function getBrowserObject(a,b){var c=0,d;document.getElementById?d=document.getElementById(a):document.all?d=document.all[a]:document.layers&&(d=document.layers[a],c=1);b&&!c&&(d=d.style);return d}
-function loadUrl(a){document.location.href=a}function createCookie(a,b,c){if(c){var d=new Date;d.setTime(d.getTime()+864E5*c);c="; expires="+d.toGMTString()}else c="";document.cookie=a+"="+b+c+"; path=/"}function readCookie(a){for(var a=a+"=",b=document.cookie.split(";"),c=0;c<b.length;c++){for(var d=b[c];" "==d.charAt(0);)d=d.substring(1,d.length);if(0==d.indexOf(a))return d.substring(a.length,d.length)}return null}
-function makeAsyncRequest(){return window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP")}function sendAsyncRequest(a,b,c,d){a.open(d,b,!0);a.setRequestHeader("Content-Type","text/html; Charset=utf-8");a.send(c)}function changeFormAction(a,b){document.getElementById(a).action=b;document.getElementById(a).submit()}
-function urlEncode(a){return encodeURIComponent(a).replace(/\%20/g,"+").replace(/!/g,"%21").replace(/'/g,"%27").replace(/\(/g,"%28").replace(/\)/g,"%29").replace(/\*/g,"%2A").replace(/\~/g,"%7E")}function escapeHTML(a){return $("<div/>").text(a).html()}function unescapeHTML(a){return $("<div/>").html(a).text()};(function(a){a.pkp=a.pkp||{};a.pkp.classes=a.pkp.classes||{};a.pkp.controllers=a.pkp.controllers||{};a.pkp.plugins=a.pkp.plugins||{};a.pkp.plugins.blocks=a.pkp.plugins.blocks||{};a.pkp.plugins.generic=a.pkp.plugins.generic||{};a.pkp.plugins.pubIds=a.pkp.plugins.pubIds||{};a.pkp.plugins.importexport=a.pkp.plugins.importexport||{};a.pkp.classes.Helper=function(){throw Error("Trying to instantiate the Helper singleton!");};a.pkp.classes.Helper.CHARS_="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split("");
+function getBrowserObject(a,b){var c=0,d;document.getElementById?d=document.getElementById(a):document.all?d=document.all[a]:document.layers&&(d=document.layers[a],c=1);b&&!c&&(d=d.style);return d}function loadUrl(a){document.location.href=a}function createCookie(a,b,c){if(c){var d=new Date;d.setTime(d.getTime()+864E5*c);c="; expires="+d.toGMTString()}else c="";document.cookie=a+"="+b+c+"; path=/"}
+function readCookie(a){for(var a=a+"=",b=document.cookie.split(";"),c=0;c<b.length;c++){for(var d=b[c];" "==d.charAt(0);)d=d.substring(1,d.length);if(0==d.indexOf(a))return d.substring(a.length,d.length)}return null}function makeAsyncRequest(){return window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP")}function sendAsyncRequest(a,b,c,d){a.open(d,b,!0);a.setRequestHeader("Content-Type","text/html; Charset=utf-8");a.send(c)}
+function changeFormAction(a,b){document.getElementById(a).action=b;document.getElementById(a).submit()}function urlEncode(a){return encodeURIComponent(a).replace(/\%20/g,"+").replace(/!/g,"%21").replace(/'/g,"%27").replace(/\(/g,"%28").replace(/\)/g,"%29").replace(/\*/g,"%2A").replace(/\~/g,"%7E")}function escapeHTML(a){return $("<div/>").text(a).html()}function unescapeHTML(a){return $("<div/>").html(a).text()};(function(a){a.pkp=a.pkp||{};a.pkp.classes=a.pkp.classes||{};a.pkp.controllers=a.pkp.controllers||{};a.pkp.plugins=a.pkp.plugins||{};a.pkp.plugins.blocks=a.pkp.plugins.blocks||{};a.pkp.plugins.generic=a.pkp.plugins.generic||{};a.pkp.plugins.pubIds=a.pkp.plugins.pubIds||{};a.pkp.plugins.importexport=a.pkp.plugins.importexport||{};a.pkp.classes.Helper=function(){throw Error("Trying to instantiate the Helper singleton!");};a.pkp.classes.Helper.CHARS_="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split("");
 a.pkp.classes.Helper.uuid=function(){var b=a.pkp.classes.Helper.CHARS_,c=Array(36),d=0,e,f;for(f=0;36>f;f++)8==f||13==f||18==f||23==f?c[f]="-":14==f?c[f]="4":(2>=d&&(d=33554432+16777216*Math.random()|0),e=d&15,d>>=4,c[f]=b[19==f?e&3|8:e]);return c.join("")};a.pkp.classes.Helper.inherits=function(a,c){var d=function(){};d.prototype=c.prototype;a.parent_=c.prototype;a.prototype=new d;a.prototype.constructor=a;c.prototype.constructor==Object.prototype.constructor&&(c.prototype.constructor=c)};a.pkp.classes.Helper.objectFactory=
 function(b,c){var d,e;d=a.pkp.classes.Helper.resolveObjectName(b);e=a.pkp.classes.Helper.getObjectProxyInstance();a.extend(!0,e,a.pkp.classes.ObjectProxy);a.pkp.classes.Helper.inherits(e,d);a.extend(!0,e.prototype,a.pkp.classes.ObjectProxy.prototype);return new e(b,c)};a.pkp.classes.Helper.resolveObjectName=function(b){var c,d,e;c=b.split(".");if("$"!=c.shift())throw Error(['Namespace "',c[0],'" for object "',b,'" is currently not supported!'].join(""));e=c[c.length-1];if(e.charAt(0).toUpperCase()!==
 e.charAt(0))throw Error(['The name "',b,'" does not point to aconstructor which must always be upper case!'].join(""));e=a;for(d in c)if(e=e[c[d]],void 0===e)throw Error(['Constructor for object "',b,'" not found!'].join(""));if(!a.isFunction(e))throw Error(['The name "',b,'" does not point to a,constructor which must always be a function!'].join());return e};a.pkp.classes.Helper.getObjectProxyInstance=function(){var a=function(a,b){this.objectName_=a;this.parent.apply(this,b)};a.objectName_="";a.prototype.parent=
@@ -188,18 +187,19 @@ this))};a.pkp.classes.features.CollapsibleGridFeature.prototype.addFeatureHtml=f
 this.getGridHtmlElement().find("div.grid_header span.options").toggle();return!1}})(jQuery);(function(a){a.pkp.controllers.SiteHandler=function(b,c){this.parent(b,c);this.options_=c;this.unsavedFormElements_=[];a(".go").button();this.bind("redirectRequested",this.redirectToUrl);this.bind("notifyUser",this.fetchNotificationHandler_);this.bind("updateHeader",this.updateHeaderHandler_);this.bind("callWhenClickOutside",this.callWhenClickOutsideHandler_);this.bind("mousedown",this.mouseDownHandler_);a(window).bind("beforeunload",this.pageUnloadHandler_);a.ajaxSetup({cache:!1});c.hasSystemNotifications&&
 this.trigger("notifyUser");this.bind("formChanged",this.callbackWrapper(this.registerUnsavedFormElement_));this.bind("unregisterChangedForm",this.callbackWrapper(this.unregisterUnsavedFormElement_));this.bind("unregisterAllForms",this.callbackWrapper(this.unregisterAllFormElements_));this.bind("pkpModalOpen",this.callbackWrapper(this.openModal_));this.bind("pkpModalClose",this.callbackWrapper(this.closeModal_));this.bind("pkpObserveScrolling",this.callbackWrapper(this.registerScrollingObserver_));
 this.bind("pkpRemoveScrollingObserver",this.callbackWrapper(this.unregisterScrollingObserver_));this.outsideClickChecks_={};this.initializeTinyMCE()};a.pkp.classes.Helper.inherits(a.pkp.controllers.SiteHandler,a.pkp.classes.Handler);a.pkp.controllers.SiteHandler.prototype.helpContext_=null;a.pkp.controllers.SiteHandler.prototype.options_=null;a.pkp.controllers.SiteHandler.prototype.outsideClickChecks_=null;a.pkp.controllers.SiteHandler.prototype.unsavedFormElements_=null;a.pkp.controllers.SiteHandler.prototype.initializeTinyMCE=
-function(){if("undefined"!==typeof tinyMCE){tinyMCE.PluginManager.load("jbimages",a.pkp.app.baseUrl+"/plugins/generic/tinymce/plugins/justboil.me/plugin.js");tinyMCE.PluginManager.load("pkpTags",a.pkp.app.baseUrl+"/plugins/generic/tinymce/plugins/pkpTags/plugin.js");var b;b={width:"100%",resize:"both",entity_encoding:"raw",plugins:"paste,fullscreen,link,code,-jbimages,-pkpTags,noneditable",convert_urls:!1,forced_root_block:"p",paste_auto_cleanup_on_paste:!0,apply_source_formatting:!1,theme:"modern",
-toolbar:"copy paste | bold italic underline | link unlink code fullscreen | jbimages | pkpTags",richToolbar:"copy paste | bold italic underline | bullist numlist | superscript subscript | link unlink code fullscreen | jbimages | pkpTags",statusbar:!1,content_css:a.pkp.app.baseUrl+"/plugins/generic/tinymce/styles/content.css"};b="undefined"!==typeof a.pkp.plugins.tinymceplugin&&typeof a.pkp.plugins.tinymceplugin.tinymceParams?a.extend({},b,a.pkp.plugins.tinymceplugin.tinymceParams):a.extend({},b);
-b.init_instance_callback=a.pkp.controllers.SiteHandler.prototype.triggerTinyMCEInitialized;b.setup=a.pkp.controllers.SiteHandler.prototype.triggerTinyMCESetup;tinyMCE.init(b)}};a.pkp.controllers.SiteHandler.prototype.triggerTinyMCEInitialized=function(b){a("#"+a.pkp.classes.Helper.escapeJQuerySelector(b.id)).trigger("tinyMCEInitialized",[b])};a.pkp.controllers.SiteHandler.prototype.triggerTinyMCESetup=function(b){var c=a("#"+a.pkp.classes.Helper.escapeJQuerySelector(b.id));c.attr("readonly")&&(b.settings.readonly=
-!0);c=c.attr("rows")||10;b.settings.height=(20*c).toString()+"px";b.on("init",function(b){var c=a("#"+b.id),f,h;f=a("#"+b.id).attr("placeholder");""!==f&&(h=a("<span></span>"),h.html(f),h.addClass("mcePlaceholder"),h.attr("id","mcePlaceholder-"+b.id),b.target.getContent().length&&h.hide(),b=a("<div></div>"),b.addClass("mcePlaceholderParent"),c.wrap(b),c.parent().append(h))});b.on("activate",function(b){a("#mcePlaceholder-"+b.id).hide()});b.on("deactivate",function(b){b.target.getContent().length||
-a("#mcePlaceholder-"+b.id).show();b.target.dom.addClass(b.target.dom.select("li"),"show")});b.on("BeforeSetContent",function(c){var e=a.pkp.classes.TinyMCEHelper.prototype.getVariableMap("#"+a.pkp.classes.Helper.escapeJQuerySelector(b.id));c.content=c.content.replace(/\{\$([a-zA-Z]+)\}(?![^<]*>)/g,function(c,d){return void 0!==e[d]?a.pkp.classes.TinyMCEHelper.prototype.getVariableElement(d,e[d],"#"+b.id).html():c})});b.on("SaveContent",function(b){var c=a("<div>"+b.content+"</div>");c.find(".pkpTag").replaceWith(function(){return"{$"+
-a(this).attr("data-symbolic")+"}"});b.content=c.html()});b.on("FullscreenStateChanged init",function(b){var b=b.target,c=a(b.editorContainer);b.plugins.fullscreen&&(b.plugins.fullscreen.isFullscreen()?c.find(".mce-toolbar[role='menubar']").show():c.find(".mce-toolbar[role='menubar']").hide())})};a.pkp.controllers.SiteHandler.prototype.getWindowDimensions=function(){return{height:a(window).height(),width:a(window).width()}};a.pkp.controllers.SiteHandler.prototype.redirectToUrl=function(a,c,d){window.location=
-d};a.pkp.controllers.SiteHandler.prototype.registerUnsavedFormElement_=function(b,c,d){b=a(d.target.lastElementChild).attr("id");-1==a.inArray(b,this.unsavedFormElements_)&&this.unsavedFormElements_.push(b)};a.pkp.controllers.SiteHandler.prototype.unregisterUnsavedFormElement_=function(b,c,d){b=a(d.target.lastElementChild).attr("id");b=a.inArray(b,this.unsavedFormElements_);-1!==b&&delete this.unsavedFormElements_[b]};a.pkp.controllers.SiteHandler.prototype.unregisterAllFormElements_=function(){this.unsavedFormElements_=
-[]};a.pkp.controllers.SiteHandler.prototype.fetchNotificationHandler_=function(b,c,d){void 0!==d?this.showNotification_(d):a.ajax({url:this.options_.fetchNotificationUrl,data:this.options_.requestOptions,success:this.callbackWrapper(this.showNotificationResponseHandler_),dataType:"json",async:!1})};a.pkp.controllers.SiteHandler.prototype.updateHeaderHandler_=function(){a.pkp.classes.Handler.getHandler(a("#navigationUserWrapper")).reload()};a.pkp.controllers.SiteHandler.prototype.callWhenClickOutsideHandler_=
-function(a,c,d){void 0!==d.container&&void 0!==d.callback&&(a=d.container.attr("id"),this.outsideClickChecks_[a]=d)};a.pkp.controllers.SiteHandler.prototype.mouseDownHandler_=function(b,c){var d;if(!a.isEmptyObject(this.outsideClickChecks_))for(d in this.outsideClickChecks_)this.processOutsideClickCheck_(this.outsideClickChecks_[d],c);return!0};a.pkp.controllers.SiteHandler.prototype.processOutsideClickCheck_=function(a,c){if("click"!==c.type&&"mousedown"!==c.type&&"mouseup"!==c.type)throw Error("Can not check outside click with the passed event: "+
-c.type+".");var d=a.container;return d.is(":hidden")?!1:0===d.has(c.target).length?(delete this.outsideClickChecks_[d.attr("id")],a.callback(),!0):!1};a.pkp.controllers.SiteHandler.prototype.pageUnloadHandler_=function(){var b,c,d;b=a.pkp.classes.Handler.getHandler(a("body"));c=0;for(d in b.unsavedFormElements_)d&&c++;if(0<c)return a.pkp.locale.form_dataHasChanged};a.pkp.controllers.SiteHandler.prototype.isFormUnsaved=function(a){return null!==this.unsavedFormElements_&&void 0!==this.unsavedFormElements_[a]?
-!0:!1};a.pkp.controllers.SiteHandler.prototype.showNotificationResponseHandler_=function(a,c){this.showNotification_(c)};a.pkp.controllers.SiteHandler.prototype.showNotification_=function(a){var c,d,a=this.handleJson(a);if(!1!==a&&a.content.general)for(c in a=a.content.general,a)for(d in a[c])new PNotify(a[c][d])};a.pkp.controllers.SiteHandler.prototype.openModal_=function(){this.getHtmlElement().addClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.closeModal_=function(){var a=this.getHtmlElement();
-a.find(".pkp_modal.is_visible").length||a.removeClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.registerScrollingObserver_=function(b,c,d,e){a(document).scroll(e);return!1};a.pkp.controllers.SiteHandler.prototype.unregisterScrollingObserver_=function(b,c,d,e){a(document).unbind("scroll",e);return!1}})(jQuery);(function(a){a.pkp.controllers.UrlInDivHandler=function(a,c){this.parent(a,c);this.sourceUrl_=c.sourceUrl;this.reload();c.refreshOn&&this.bindGlobal(c.refreshOn,this.reload)};a.pkp.classes.Helper.inherits(a.pkp.controllers.UrlInDivHandler,a.pkp.classes.Handler);a.pkp.controllers.UrlInDivHandler.sourceUrl_=null;a.pkp.controllers.UrlInDivHandler.prototype.reload=function(){a.get(this.sourceUrl_,this.callbackWrapper(this.handleLoadedContent_),"json")};a.pkp.controllers.UrlInDivHandler.prototype.getSourceUrl=
+function(){if("undefined"!==typeof tinyMCE){tinyMCE.PluginManager.load("jbimages",a.pkp.app.baseUrl+"/plugins/generic/tinymce/plugins/justboil.me/plugin.js");tinyMCE.PluginManager.load("pkpTags",a.pkp.app.baseUrl+"/plugins/generic/tinymce/plugins/pkpTags/plugin.js");tinyMCE.PluginManager.load("pkpwordcount",a.pkp.app.baseUrl+"/plugins/generic/tinymce/plugins/pkpWordcount/plugin.js");var b;b={width:"100%",resize:"both",entity_encoding:"raw",plugins:"paste,fullscreen,link,lists,code,-jbimages,-pkpTags,noneditable",
+convert_urls:!1,forced_root_block:"p",paste_auto_cleanup_on_paste:!0,apply_source_formatting:!1,theme:"modern",toolbar:"copy paste | bold italic underline | link unlink code fullscreen | jbimages | pkpTags",richToolbar:"copy paste | bold italic underline | bullist numlist | superscript subscript | link unlink code fullscreen | jbimages | pkpTags",statusbar:!1,content_css:a.pkp.app.baseUrl+"/plugins/generic/tinymce/styles/content.css"};b="undefined"!==typeof a.pkp.plugins.tinymceplugin&&typeof a.pkp.plugins.tinymceplugin.tinymceParams?
+a.extend({},b,a.pkp.plugins.tinymceplugin.tinymceParams):a.extend({},b);b.init_instance_callback=a.pkp.controllers.SiteHandler.prototype.triggerTinyMCEInitialized;b.setup=a.pkp.controllers.SiteHandler.prototype.triggerTinyMCESetup;tinyMCE.init(b)}};a.pkp.controllers.SiteHandler.prototype.triggerTinyMCEInitialized=function(b){a("#"+a.pkp.classes.Helper.escapeJQuerySelector(b.id)).trigger("tinyMCEInitialized",[b])};a.pkp.controllers.SiteHandler.prototype.triggerTinyMCESetup=function(b){var c=a("#"+
+a.pkp.classes.Helper.escapeJQuerySelector(b.id));c.attr("readonly")&&(b.settings.readonly=!0);c.attr("wordCount")&&0<c.attr("wordCount")&&(b.settings.plugins+=",pkpwordcount",b.settings.statusbar=!0);c=c.attr("rows")||10;b.settings.height=(20*c).toString()+"px";b.on("init",function(b){var c=a("#"+b.id),f,h;f=a("#"+b.id).attr("placeholder");""!==f&&(h=a("<span></span>"),h.html(f),h.addClass("mcePlaceholder"),h.attr("id","mcePlaceholder-"+b.id),b.target.getContent().length&&h.hide(),b=a("<div></div>"),
+b.addClass("mcePlaceholderParent"),c.wrap(b),c.parent().append(h))});b.on("activate",function(b){a("#mcePlaceholder-"+b.id).hide()});b.on("deactivate",function(b){b.target.getContent().length||a("#mcePlaceholder-"+b.id).show();b.target.dom.addClass(b.target.dom.select("li"),"show")});b.on("BeforeSetContent",function(c){var e=a.pkp.classes.TinyMCEHelper.prototype.getVariableMap("#"+a.pkp.classes.Helper.escapeJQuerySelector(b.id));c.content=c.content.replace(/\{\$([a-zA-Z]+)\}(?![^<]*>)/g,function(c,
+d){return void 0!==e[d]?a.pkp.classes.TinyMCEHelper.prototype.getVariableElement(d,e[d],"#"+b.id).html():c})});b.on("SaveContent",function(b){var c=a("<div>"+b.content+"</div>");c.find(".pkpTag").replaceWith(function(){return"{$"+a(this).attr("data-symbolic")+"}"});b.content=c.html()});b.on("FullscreenStateChanged init",function(b){var b=b.target,c=a(b.editorContainer);b.plugins.fullscreen&&(b.plugins.fullscreen.isFullscreen()?c.find(".mce-toolbar[role='menubar']").show():c.find(".mce-toolbar[role='menubar']").hide())})};
+a.pkp.controllers.SiteHandler.prototype.getWindowDimensions=function(){return{height:a(window).height(),width:a(window).width()}};a.pkp.controllers.SiteHandler.prototype.redirectToUrl=function(a,c,d){window.location=d};a.pkp.controllers.SiteHandler.prototype.registerUnsavedFormElement_=function(b,c,d){b=a(d.target.lastElementChild).attr("id");-1==a.inArray(b,this.unsavedFormElements_)&&this.unsavedFormElements_.push(b)};a.pkp.controllers.SiteHandler.prototype.unregisterUnsavedFormElement_=function(b,
+c,d){b=a(d.target.lastElementChild).attr("id");b=a.inArray(b,this.unsavedFormElements_);-1!==b&&delete this.unsavedFormElements_[b]};a.pkp.controllers.SiteHandler.prototype.unregisterAllFormElements_=function(){this.unsavedFormElements_=[]};a.pkp.controllers.SiteHandler.prototype.fetchNotificationHandler_=function(b,c,d){void 0!==d?this.showNotification_(d):a.ajax({url:this.options_.fetchNotificationUrl,data:this.options_.requestOptions,success:this.callbackWrapper(this.showNotificationResponseHandler_),
+dataType:"json",async:!1})};a.pkp.controllers.SiteHandler.prototype.updateHeaderHandler_=function(){a.pkp.classes.Handler.getHandler(a("#navigationUserWrapper")).reload()};a.pkp.controllers.SiteHandler.prototype.callWhenClickOutsideHandler_=function(a,c,d){void 0!==d.container&&void 0!==d.callback&&(a=d.container.attr("id"),this.outsideClickChecks_[a]=d)};a.pkp.controllers.SiteHandler.prototype.mouseDownHandler_=function(b,c){var d;if(!a.isEmptyObject(this.outsideClickChecks_))for(d in this.outsideClickChecks_)this.processOutsideClickCheck_(this.outsideClickChecks_[d],
+c);return!0};a.pkp.controllers.SiteHandler.prototype.processOutsideClickCheck_=function(a,c){if("click"!==c.type&&"mousedown"!==c.type&&"mouseup"!==c.type)throw Error("Can not check outside click with the passed event: "+c.type+".");var d=a.container;return d.is(":hidden")?!1:0===d.has(c.target).length?(delete this.outsideClickChecks_[d.attr("id")],a.callback(),!0):!1};a.pkp.controllers.SiteHandler.prototype.pageUnloadHandler_=function(){var b,c,d;b=a.pkp.classes.Handler.getHandler(a("body"));c=0;
+for(d in b.unsavedFormElements_)d&&c++;if(0<c)return a.pkp.locale.form_dataHasChanged};a.pkp.controllers.SiteHandler.prototype.isFormUnsaved=function(a){return null!==this.unsavedFormElements_&&void 0!==this.unsavedFormElements_[a]?!0:!1};a.pkp.controllers.SiteHandler.prototype.showNotificationResponseHandler_=function(a,c){this.showNotification_(c)};a.pkp.controllers.SiteHandler.prototype.showNotification_=function(a){var c,d,a=this.handleJson(a);if(!1!==a&&a.content.general)for(c in a=a.content.general,
+a)for(d in a[c])new PNotify(a[c][d])};a.pkp.controllers.SiteHandler.prototype.openModal_=function(){this.getHtmlElement().addClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.closeModal_=function(){var a=this.getHtmlElement();a.find(".pkp_modal.is_visible").length||a.removeClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.registerScrollingObserver_=function(b,c,d,e){a(document).scroll(e);return!1};a.pkp.controllers.SiteHandler.prototype.unregisterScrollingObserver_=
+function(b,c,d,e){a(document).unbind("scroll",e);return!1}})(jQuery);(function(a){a.pkp.controllers.UrlInDivHandler=function(a,c){this.parent(a,c);this.sourceUrl_=c.sourceUrl;this.reload();c.refreshOn&&this.bindGlobal(c.refreshOn,this.reload)};a.pkp.classes.Helper.inherits(a.pkp.controllers.UrlInDivHandler,a.pkp.classes.Handler);a.pkp.controllers.UrlInDivHandler.sourceUrl_=null;a.pkp.controllers.UrlInDivHandler.prototype.reload=function(){a.get(this.sourceUrl_,this.callbackWrapper(this.handleLoadedContent_),"json")};a.pkp.controllers.UrlInDivHandler.prototype.getSourceUrl=
 function(){return this.sourceUrl_};a.pkp.controllers.UrlInDivHandler.prototype.setSourceUrl=function(a){this.sourceUrl_=a};a.pkp.controllers.UrlInDivHandler.prototype.handleLoadedContent_=function(a,c){var d=this.handleJson(c);!0===d.status?void 0===d.content?this.getHtmlElement().hide():(/msie/.test(navigator.userAgent.toLowerCase())?this.html(d.content):(this.getHtmlElement().hide(),this.html(d.content),this.getHtmlElement().fadeIn(400)),this.trigger("urlInDivLoaded",[this.getHtmlElement().attr("id")])):
 alert(d.content);return!1}})(jQuery);(function(a){a.pkp.controllers.ExtrasOnDemandHandler=function(b,c){this.parent(b,c);a(".toggleExtras",b).click(this.callbackWrapper(this.toggleExtras))};a.pkp.classes.Helper.inherits(a.pkp.controllers.ExtrasOnDemandHandler,a.pkp.classes.Handler);a.pkp.controllers.ExtrasOnDemandHandler.prototype.toggleExtras=function(a,c){var d=this.getHtmlElement(),e;c.preventDefault();d.toggleClass("active");d.hasClass("active")&&(e=d.closest(".scrollable"),0<e.size()&&this.scrollToMakeVisible_(d,e))};a.pkp.controllers.ExtrasOnDemandHandler.prototype.scrollToMakeVisible_=
 function(a,c){var d,e,f;d=a.position().top;e=c.position().top;f=parseInt(c.scrollTop(),10);d>e?(d=Math.ceil(d+a.height()-c.height()),0<d&&c.scrollTop(f+d)):(f=Math.max(Math.floor(f+d-e),0),c.scrollTop(f))}})(jQuery);(function(a){a.pkp.controllers.PageHandler=function(a,c){this.parent(a,c);this.bind("redirectRequested",this.redirectToUrl);this.bind("notifyUser",this.redirectNotifyUserEventHandler_);this.bind("redirectDataChangedToGrid",this.redirectDataChangedEventHandler_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.PageHandler,a.pkp.classes.Handler);a.pkp.controllers.PageHandler.prototype.redirectToUrl=function(a,c,d){window.location=d};a.pkp.controllers.PageHandler.prototype.redirectNotifyUserEventHandler_=
@@ -221,9 +221,7 @@ function(a,c){c.refresh()};a.pkp.controllers.UploaderHandler.prototype.updateSta
 this.jLabelText_);a("#"+this.textInput.attr("id")).jLabel();this.textInput.attr("title","");this.textLabel_=b.find("label");this.hiddenInput_=b.find("input:hidden");this.bind("autocompleteselect",this.itemSelected);this.bind("autocompletefocus",this.itemFocused);this.textInput.blur(this.callbackWrapper(this.textInputBlurHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.AutocompleteHandler,a.pkp.classes.Handler);a.pkp.controllers.AutocompleteHandler.textLabel_=null;a.pkp.controllers.AutocompleteHandler.jLabelText_=
 null;a.pkp.controllers.AutocompleteHandler.disableSync_=null;a.pkp.controllers.AutocompleteHandler.DEFAULT_PROPERTIES_={minLength:2};a.pkp.controllers.AutocompleteHandler.prototype.hiddenInput_=null;a.pkp.controllers.AutocompleteHandler.prototype.sourceUrl_=null;a.pkp.controllers.AutocompleteHandler.prototype.textInput=null;a.pkp.controllers.AutocompleteHandler.prototype.itemSelected=function(a,c,d){a=this.hiddenInput_;c=this.textInput;""!==d.item.value&&(a.val(d.item.value),c.val(d.item.label),c.trigger("keyup"));
 return!1};a.pkp.controllers.AutocompleteHandler.prototype.itemFocused=function(a,c,d){a=this.textInput;""!==d.item.value&&a.val(d.item.label);return!1};a.pkp.controllers.AutocompleteHandler.prototype.fetchAutocomplete=function(b,c,d){var e;e=this.textInput;e.addClass("spinner");a.post(this.getAutocompleteUrl(),{term:c.term},function(a){e.removeClass("spinner");d(a.content)},"json")};a.pkp.controllers.AutocompleteHandler.prototype.getAutocompleteUrl=function(){return this.sourceUrl_};a.pkp.controllers.AutocompleteHandler.prototype.setAutocompleteUrl=
-function(a){this.sourceUrl_=a};a.pkp.controllers.AutocompleteHandler.prototype.textInputBlurHandler_=function(){""===this.hiddenInput_.val()&&this.textInput.val("")};a.pkp.controllers.AutocompleteHandler.prototype.synchronizeFields_=function(){this.hiddenInput_.val(String(this.textInput.val()))}})(jQuery);(function(a){a.pkp.controllers.RangeSliderHandler=function(b,c){this.parent(b,c);if(!c.min||!c.max)throw Error('The "min" and "max"settings are required in a RangeSliderHandler');this.slider_=b.find(".pkp_controllers_rangeSlider_slider");this.labelMin_=b.find(".pkp_controllers_rangeSlider_sliderValueMin");this.labelMax_=b.find(".pkp_controllers_rangeSlider_sliderValueMax");var d={};d.min=c.min;d.max=c.max;d.values="undefined"===typeof c.values?[c.min,c.max]:c.values;d=a.extend({},this.self("DEFAULT_PROPERTIES_"),
-d);this.slider_.slider(d);this.bind("slide",this.sliderAdjusted);"undefined"!==typeof c.toggleable&&c.toggleable&&(this.toggleCheckbox_=this.getHtmlElement().find(".toggle input"),this.toggleCheckbox_.on("change",this.callbackWrapper(this.toggleField)))};a.pkp.classes.Helper.inherits(a.pkp.controllers.RangeSliderHandler,a.pkp.classes.Handler);a.pkp.controllers.RangeSliderHandler.slider_=null;a.pkp.controllers.RangeSliderHandler.labelMin_=null;a.pkp.controllers.RangeSliderHandler.labelMax_=null;a.pkp.controllers.RangeSliderHandler.toggleCheckbox_=
-null;a.pkp.controllers.RangeSliderHandler.DEFAULT_PROPERTIES_={range:!0};a.pkp.controllers.RangeSliderHandler.prototype.sliderAdjusted=function(b,c,d){this.labelMin_.html(d.values[0]);this.labelMax_.html(d.values[1]);a(b).children(".pkp_controllers_rangeSlider_minInput").val(d.values[0]);a(b).children(".pkp_controllers_rangeSlider_maxInput").val(d.values[1])};a.pkp.controllers.RangeSliderHandler.prototype.toggleField=function(){this.getHtmlElement().toggleClass("is_enabled")}})(jQuery);(function(a){a.pkp.controllers.RevealMoreHandler=function(b,c){this.parent(b,c);b.outerHeight()>c.height&&(b.addClass("isHidden").css("max-height",c.height+"px"),a(".revealMoreButton",b).click(this.callbackWrapper(this.revealMore)))};a.pkp.classes.Helper.inherits(a.pkp.controllers.RevealMoreHandler,a.pkp.classes.Handler);a.pkp.controllers.RevealMoreHandler.prototype.revealMore=function(a,c){this.getHtmlElement().removeClass("isHidden").css("max-height","auto");c.preventDefault();c.stopPropagation()}})(jQuery);(function(a){a.pkp.controllers.NotificationHandler=function(a,c){this.parent(a,c);this.options_=c;this.bind("notifyUser",this.fetchNotificationHandler_);this.getHtmlElement().hide();this.getHtmlElement().triggerHandler("notifyUser");this.options_.refreshOn&&this.bindGlobal(this.options_.refreshOn,this.fetchNotificationHandler_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.NotificationHandler,a.pkp.classes.Handler);a.pkp.controllers.NotificationHandler.prototype.options_=null;a.pkp.controllers.NotificationHandler.prototype.trivialTimer_=
+function(a){this.sourceUrl_=a};a.pkp.controllers.AutocompleteHandler.prototype.textInputBlurHandler_=function(){""===this.hiddenInput_.val()&&this.textInput.val("")};a.pkp.controllers.AutocompleteHandler.prototype.synchronizeFields_=function(){this.hiddenInput_.val(String(this.textInput.val()))}})(jQuery);(function(a){a.pkp.controllers.RevealMoreHandler=function(b,c){this.parent(b,c);b.outerHeight()>c.height&&(b.addClass("isHidden").css("max-height",c.height+"px"),a(".revealMoreButton",b).click(this.callbackWrapper(this.revealMore)))};a.pkp.classes.Helper.inherits(a.pkp.controllers.RevealMoreHandler,a.pkp.classes.Handler);a.pkp.controllers.RevealMoreHandler.prototype.revealMore=function(a,c){this.getHtmlElement().removeClass("isHidden").removeAttr("style");c.preventDefault();c.stopPropagation()}})(jQuery);(function(a){a.pkp.controllers.NotificationHandler=function(a,c){this.parent(a,c);this.options_=c;this.bind("notifyUser",this.fetchNotificationHandler_);this.getHtmlElement().hide();this.getHtmlElement().triggerHandler("notifyUser");this.options_.refreshOn&&this.bindGlobal(this.options_.refreshOn,this.fetchNotificationHandler_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.NotificationHandler,a.pkp.classes.Handler);a.pkp.controllers.NotificationHandler.prototype.options_=null;a.pkp.controllers.NotificationHandler.prototype.trivialTimer_=
 null;a.pkp.controllers.NotificationHandler.prototype.fetchNotificationHandler_=function(){var b={};b.requestOptions=this.options_.requestOptions;a.ajax({type:"POST",url:this.options_.fetchNotificationUrl,data:b,success:this.callbackWrapper(this.showNotificationResponseHandler_),dataType:"json",async:!1})};a.pkp.controllers.NotificationHandler.prototype.showNotificationResponseHandler_=function(b,c){clearTimeout(this.trivialTimer_);var d=this.getHtmlElement(),e=this.handleJson(c),f,h,j;if(!1!==e)if(e.content.inPlace){f=
 this.concatenateNotifications_(e.content.inPlace);h=this.removeAlreadyShownNotifications_(e);this.unbindPartial(d);d.html(f);d.show();e=this.getTrivialNotifications_(e.content.inPlace);if(!this.visibleWithoutScrolling_()&&h)for(j in d.parent().trigger("notifyUser",[h]),e)d=e[j],d=a("#pkp_notification_"+d,this.getHtmlElement()),this.unbindPartial(d),d.remove();0===d.children().length?d.hide():this.addTimerToNotifications(e)}else this.unbindPartial(this.getHtmlElement()),this.getHtmlElement().empty(),
 this.getHtmlElement().hide()};a.pkp.controllers.NotificationHandler.prototype.visibleWithoutScrolling_=function(){var b=this.getHtmlElement(),c=b.offset().top+this.getHtmlElement().height()/2,d=a(window).scrollTop(),e=d+a(window).height(),f=b.parents(".ui-dialog-content");return 0<f.length&&(b=f.offset().top,f=b+f.height(),c<b||c>f)?!1:c<d||c>e?!1:!0};a.pkp.controllers.NotificationHandler.prototype.removeAlreadyShownNotifications_=function(b){var c=!0,d,e,f;for(d in b.content.inPlace)for(e in b.content.inPlace[d])f=
@@ -348,24 +346,21 @@ function(b,c){var d=a('<div id="wizardButtons" class="modal_buttons"></div>'),e,
 (e=a('<a id="cancelButton" class="cancel" href="#"></a>').text(c.cancelButtonText),d.append(e),e.bind("click",this.callbackWrapper(this.cancelRequest)));b.after(d)};a.pkp.controllers.wizard.WizardHandler.prototype.disableContinueButton=function(){this.getContinueButton().attr("disabled","disabled")};a.pkp.controllers.wizard.WizardHandler.prototype.enableContinueButton=function(){this.getContinueButton().removeAttr("disabled")}})(jQuery);(function(a){a.pkp.controllers.grid.queries=a.pkp.controllers.grid.queries||{};a.pkp.controllers.grid.queries.ReadQueryHandler=function(a,c){this.fetchNoteFormUrl_=c.fetchNoteFormUrl;this.fetchParticipantsListUrl_=c.fetchParticipantsListUrl;a.find(".openNoteForm a").click(this.callbackWrapper(this.showNoteFormHandler_));a.bind("dataChanged",this.callbackWrapper(this.reloadParticipantsList_));this.loadParticipantsList()};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.queries.ReadQueryHandler,
 a.pkp.classes.Handler);a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.fetchNoteFormUrl_=null;a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.fetchParticipantsListUrl_=null;a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.loadParticipantsList=function(){a.get(this.fetchParticipantsListUrl_,this.callbackWrapper(this.showFetchedParticipantsList_),"json")};a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.showNoteFormHandler_=function(b){a(b).parents(".openNoteForm").addClass("is_loading");
 a.get(this.fetchNoteFormUrl_,this.callbackWrapper(this.showFetchedNoteForm_),"json")};a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.showFetchedNoteForm_=function(b,c){var d=this.handleJson(c),e=a("#newNotePlaceholder",this.getHtmlElement()),f=a(".openNoteForm.is_loading",this.getHtmlElement());this.unbindPartial(f);f.remove();this.unbindPartial(e);e.html(d.content)};a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.showFetchedParticipantsList_=function(b,c){var d=this.handleJson(c),
-e=a("#participantsListPlaceholder",this.getHtmlElement());this.unbindPartial(e);e.children().remove();e.append(d.content)};a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.reloadParticipantsList_=function(){this.loadParticipantsList()}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload=a.pkp.controllers.wizard.fileUpload||{};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler=function(a,c){this.parent(a,c);this.deleteUrl_=c.deleteUrl;this.metadataUrl_=c.metadataUrl;this.finishUrl_=c.finishUrl;this.bind("fileUploaded",this.handleFileUploaded);this.bind("filesRemoved",this.handleRemovedFiles);this.disableContinueButton()};a.pkp.classes.Helper.inherits(a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler,a.pkp.controllers.wizard.WizardHandler);
-a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.deleteUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.metadataUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.finishUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.uploadedFile_=null;a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.tabsBeforeActivate=function(a,c,d){if(0<d.newTab.index()){if(!this.uploadedFile_)throw Error("Uploaded file missing!");
-this.getHtmlElement();var e="";switch(d.newTab.index()){case 1:e=this.metadataUrl_;break;case 2:e=this.finishUrl_;break;default:throw Error("Unsupported tab index.");}e=e+"&fileId="+this.uploadedFile_.fileId;d.newTab.find(".ui-tabs-anchor").attr("href",e)}return this.parent("tabsBeforeActivate",a,c,d)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardAdvance=function(){var a=this.getCurrentStep(),c=this.getNumberOfSteps()-1,d=a+1,e=this.getHtmlElement();if(d>c)throw Error("Trying to set an invalid wizard step!");
-e.tabs("enable",d);e.tabs("option","active",d);0===a&&e.tabs("disable",a);d===c&&(a=this.getContinueButton(),a.text(this.getFinishButtonText()),this.enableContinueButton())};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.tabsLoad=function(b,c,d){var e=this.getHtmlElement(),f=this.getProgressIndicator();2===d.tab.index()&&(e=a("#newFile",e),e.length&&e.bind("click",this.callbackWrapper(this.startWizard)));f.hide();return this.parent("tabsLoad",b,c,d)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.formValid=
-function(a,c){0===this.getCurrentStep()&&0===this.getHtmlElement().find("#uploadConfirmationForm").length&&!this.uploadedFile_||this.parent("formValid",a,c)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardCancelRequested=function(b,c){if(this.parent("wizardCancelRequested",b,c))if(this.uploadedFile_)a.post(this.deleteUrl_,this.uploadedFile_,a.pkp.classes.Helper.curry(this.wizardCancelSuccess,this,b,c),"json"),this.uploadedFile_=null,c.preventDefault();else return!0;return!1};
-a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardCancelSuccess=function(a,c,d){!1!==this.handleJson(d)&&this.trigger("wizardCancel")};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.handleFileUploaded=function(a,c,d){this.uploadedFile_=d};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.handleRemovedFiles=function(b,c,d,e){var f;if("undefined"!==typeof e&&e.length)for(f in e){if("undefined"===typeof e[f].storedData)break;a.post(this.deleteUrl_,
-e[f].storedData)}};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.startWizard=function(){this.uploadedFile_=null;this.parent("startWizard")}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload.form=a.pkp.controllers.wizard.fileUpload.form||{};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler=function(a,c){this.parent(a,c);this.hasFileSelector_=c.hasFileSelector;this.hasGenreSelector_=c.hasGenreSelector;c.presetRevisedFileId&&(this.presetRevisedFileId_=c.presetRevisedFileId);this.fileGenres_=c.fileGenres;this.$uploader_=c.$uploader;this.attachUploader_(this.$uploader_,c.uploaderOptions);this.uploaderSetup(c.$uploader);this.$revisedFileSelector_=
+e=a("#participantsListPlaceholder",this.getHtmlElement());this.unbindPartial(e);e.children().remove();e.append(d.content)};a.pkp.controllers.grid.queries.ReadQueryHandler.prototype.reloadParticipantsList_=function(){this.loadParticipantsList()}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload=a.pkp.controllers.wizard.fileUpload||{};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler=function(a,c){this.parent(a,c);this.csrfToken_=c.csrfToken;this.deleteUrl_=c.deleteUrl;this.metadataUrl_=c.metadataUrl;this.finishUrl_=c.finishUrl;this.bind("fileUploaded",this.handleFileUploaded);this.bind("filesRemoved",this.handleRemovedFiles);this.disableContinueButton()};a.pkp.classes.Helper.inherits(a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler,
+a.pkp.controllers.wizard.WizardHandler);a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.csrfToken_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.deleteUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.metadataUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.finishUrl_="";a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.uploadedFile_=null;a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.tabsBeforeActivate=
+function(a,c,d){if(0<d.newTab.index()){if(!this.uploadedFile_)throw Error("Uploaded file missing!");this.getHtmlElement();var e="";switch(d.newTab.index()){case 1:e=this.metadataUrl_;break;case 2:e=this.finishUrl_;break;default:throw Error("Unsupported tab index.");}e=e+"&fileId="+this.uploadedFile_.fileId;d.newTab.find(".ui-tabs-anchor").attr("href",e)}return this.parent("tabsBeforeActivate",a,c,d)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardAdvance=function(){var a=
+this.getCurrentStep(),c=this.getNumberOfSteps()-1,d=a+1,e=this.getHtmlElement();if(d>c)throw Error("Trying to set an invalid wizard step!");e.tabs("enable",d);e.tabs("option","active",d);0===a&&e.tabs("disable",a);d===c&&(a=this.getContinueButton(),a.text(this.getFinishButtonText()),this.enableContinueButton())};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.tabsLoad=function(b,c,d){var e=this.getHtmlElement(),f=this.getProgressIndicator();2===d.tab.index()&&(e=a("#newFile",
+e),e.length&&e.bind("click",this.callbackWrapper(this.startWizard)));f.hide();return this.parent("tabsLoad",b,c,d)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.formValid=function(a,c){0===this.getCurrentStep()&&0===this.getHtmlElement().find("#uploadConfirmationForm").length&&!this.uploadedFile_||this.parent("formValid",a,c)};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardCancelRequested=function(b,c){if(this.parent("wizardCancelRequested",b,
+c))if(this.uploadedFile_)this.uploadedFile_.csrfToken=this.csrfToken_,a.post(this.deleteUrl_,this.uploadedFile_,a.pkp.classes.Helper.curry(this.wizardCancelSuccess,this,b,c),"json"),this.uploadedFile_=null,c.preventDefault();else return!0;return!1};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.wizardCancelSuccess=function(a,c,d){!1!==this.handleJson(d)&&this.trigger("wizardCancel")};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.handleFileUploaded=function(a,
+c,d){this.uploadedFile_=d};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.handleRemovedFiles=function(b,c,d,e){var f;if("undefined"!==typeof e&&e.length)for(f in e){if("undefined"===typeof e[f].storedData)break;e[f].storedData.csrfToken=this.csrfToken_;a.post(this.deleteUrl_,e[f].storedData)}};a.pkp.controllers.wizard.fileUpload.FileUploadWizardHandler.prototype.startWizard=function(){this.uploadedFile_=null;this.parent("startWizard")}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload.form=a.pkp.controllers.wizard.fileUpload.form||{};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler=function(a,c){this.parent(a,c);this.hasFileSelector_=c.hasFileSelector;this.hasGenreSelector_=c.hasGenreSelector;c.presetRevisedFileId&&(this.presetRevisedFileId_=c.presetRevisedFileId);this.fileGenres_=c.fileGenres;this.$uploader_=c.$uploader;this.attachUploader_(this.$uploader_,c.uploaderOptions);this.uploaderSetup(c.$uploader);this.$revisedFileSelector_=
 a.find("#revisedFileId").change(this.callbackWrapper(this.revisedFileChange));this.hasGenreSelector_&&(this.$genreSelector=a.find("#genreId").change(this.callbackWrapper(this.genreChange)));this.setUploaderVisibility_()};a.pkp.classes.Helper.inherits(a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.hasFileSelector_=!1;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.$revisedFileSelector_=
 null;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.hasGenreSelector_=!1;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.$genreSelector_=null;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.presetRevisedFileId_=null;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.fileGenres_=null;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.$uploader_=null;a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.uploaderSetup=
-function(b){b=a.pkp.classes.Handler.getHandler(b);b.pluploader.bind("BeforeUpload",this.callbackWrapper(this.prepareFileUploadRequest));b.pluploader.bind("FileUploaded",this.callbackWrapper(this.handleUploadResponse));b.pluploader.bind("FilesRemoved",this.callbackWrapper(this.handleRemovedFiles))};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.prepareFileUploadRequest=function(a,c){var d={},e=this.getHtmlElement().find("#uploaderUserGroupId");e.attr("disabled","disabled");
-d.uploaderUserGroupId=e.val();this.hasFileSelector_?(this.$revisedFileSelector_.attr("disabled","disabled"),d.revisedFileId=this.$revisedFileSelector_.val()):d.revisedFileId=null!==this.presetRevisedFileId_?this.presetRevisedFileId_:0;this.hasGenreSelector_?(this.$genreSelector.attr("disabled","disabled"),d.genreId=this.$genreSelector.val()):d.genreId="";c.settings.multipart_params=d};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.handleUploadResponse=function(b,c,d,e){b=
-this.handleJson(a.parseJSON(e.response));this.getHtmlElement();!1!==b&&(this.trigger("fileUploaded",b.uploadedFile),""!==b.content&&this.replaceWith(b.content));this.getHtmlElement().valid()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.handleRemovedFiles=function(a,c,d){this.trigger("filesRemoved",[c,d])};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.submitForm=function(){this.trigger("formSubmitted")};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.revisedFileChange=
-function(){this.$revisedFileSelector_.val()?(this.$genreSelector.val(this.fileGenres_[this.$revisedFileSelector_.val()]),this.$genreSelector.attr("disabled","disabled")):this.$genreSelector.removeAttr("disabled");this.setUploaderVisibility_();return!1};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.genreChange=function(){this.setUploaderVisibility_()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.attachUploader_=function(a,c){a.pkpHandler("$.pkp.controllers.UploaderHandler",
-c)};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.setUploaderVisibility_=function(){this.hasGenreSelector_&&this.$genreSelector.val()||this.$revisedFileSelector_.val()?this.showUploader_():!this.hasGenreSelector_&&!this.hasFileSelector_?this.showUploader_():this.hideUploader_()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.hideUploader_=function(){this.$uploader_.addClass("pkp_screen_reader")};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.showUploader_=
-function(){this.$uploader_.removeClass("pkp_screen_reader");a.pkp.classes.Handler.getHandler(this.$uploader_).pluploader.refresh()}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler=function(a,c){this.parent(a,c);a.find("#possibleRevision").show("slide");this.trigger("unregisterChangedForm");this.bind("wizardAdvanceRequested",this.wizardAdvanceRequested);this.trackFormChanges=!1};a.pkp.classes.Helper.inherits(a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler.prototype.wizardAdvanceRequested=
-function(a,c){var d=this.getHtmlElement();0<parseInt(d.find("#revisedFileId").val(),10)&&(d.submit(),c.preventDefault())};a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler.prototype.handleResponse=function(a,c){!0===c.status&&this.trigger("fileUploaded",c.uploadedFile);return this.parent("handleResponse",a,c)}})(jQuery);(function(a){a.pkp.controllers.grid.filter=a.pkp.controllers.grid.filter||{form:{}};a.pkp.controllers.grid.filter.form.FilterFormHandler=function(b,c){this.parent(b,c);if(!0===c.noMoreTemplates||!0===c.filterTemplates)this.disableFormControls(),a(c.pulldownSelector).change(this.callbackWrapper(this.selectOptionHandler_)),c.filterTemplates&&this.bind("pkpRemoveHandler",this.removeHandler_);this.editFilterUrlTemplate_=c.editFilterUrlTemplate};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.filter.form.FilterFormHandler,
-a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.filter.form.FilterFormHandler.prototype.editFilterUrlTemplate_=null;a.pkp.controllers.grid.filter.form.FilterFormHandler.prototype.selectOptionHandler_=function(b){a(b).hide();a.get(this.editFilterUrlTemplate_.replace("DUMMY_FILTER_TEMPLATE_ID",a(b).val()),this.callbackWrapper(this.getFilterForm_),"json")};a.pkp.controllers.grid.filter.form.FilterFormHandler.prototype.removeHandler_=function(){this.unbind("pkpRemoveHandler",this.removeHandler_)};
-a.pkp.controllers.grid.filter.form.FilterFormHandler.prototype.getFilterForm_=function(a,c){var d=this.handleJson(c);this.remove();this.replaceWith(d.content)}})(jQuery);(function(a){a.pkp.controllers.grid.navigationMenus=a.pkp.controllers.grid.navigationMenus||{form:{}};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler=function(a,c){this.okButton_=c.okButton;this.warningModalTitle_=c.warningModalTitle;this.submenuWarning_=c.submenuWarning;this.itemTypeConditionalWarnings_=c.itemTypeConditionalWarnings;a.on("click",".btnConditionalDisplay",this.callbackWrapper(this.showConditionalDisplayWarning));a.on("click",".btnSubmenuWarning",this.callbackWrapper(this.showSubmenuWarning));
+function(b){b=a.pkp.classes.Handler.getHandler(b);b.pluploader.bind("BeforeUpload",this.callbackWrapper(this.prepareFileUploadRequest));b.pluploader.bind("FileUploaded",this.callbackWrapper(this.handleUploadResponse));b.pluploader.bind("FilesRemoved",this.callbackWrapper(this.handleRemovedFiles))};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.prepareFileUploadRequest=function(a,c){this.getHtmlElement();var d={};this.hasFileSelector_?(this.$revisedFileSelector_.attr("disabled",
+"disabled"),d.revisedFileId=this.$revisedFileSelector_.val()):d.revisedFileId=null!==this.presetRevisedFileId_?this.presetRevisedFileId_:0;this.hasGenreSelector_?(this.$genreSelector.attr("disabled","disabled"),d.genreId=this.$genreSelector.val()):d.genreId="";c.settings.multipart_params=d};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.handleUploadResponse=function(b,c,d,e){b=this.handleJson(a.parseJSON(e.response));this.getHtmlElement();!1!==b&&(this.trigger("fileUploaded",
+b.uploadedFile),""!==b.content&&this.replaceWith(b.content));this.getHtmlElement().valid()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.handleRemovedFiles=function(a,c,d){this.trigger("filesRemoved",[c,d])};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.submitForm=function(){this.trigger("formSubmitted")};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.revisedFileChange=function(){this.$revisedFileSelector_.val()?(this.$genreSelector.val(this.fileGenres_[this.$revisedFileSelector_.val()]),
+this.$genreSelector.attr("disabled","disabled")):this.$genreSelector.removeAttr("disabled");this.setUploaderVisibility_();return!1};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.genreChange=function(){this.setUploaderVisibility_()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.attachUploader_=function(a,c){a.pkpHandler("$.pkp.controllers.UploaderHandler",c)};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.setUploaderVisibility_=
+function(){this.hasGenreSelector_&&this.$genreSelector.val()||this.$revisedFileSelector_.val()?this.showUploader_():!this.hasGenreSelector_&&!this.hasFileSelector_?this.showUploader_():this.hideUploader_()};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.hideUploader_=function(){this.$uploader_.addClass("pkp_screen_reader")};a.pkp.controllers.wizard.fileUpload.form.FileUploadFormHandler.prototype.showUploader_=function(){this.$uploader_.removeClass("pkp_screen_reader");a.pkp.classes.Handler.getHandler(this.$uploader_).pluploader.refresh()}})(jQuery);(function(a){a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler=function(a,c){this.parent(a,c);a.find("#possibleRevision").show("slide");this.trigger("unregisterChangedForm");this.bind("wizardAdvanceRequested",this.wizardAdvanceRequested);this.trackFormChanges=!1};a.pkp.classes.Helper.inherits(a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler.prototype.wizardAdvanceRequested=
+function(a,c){var d=this.getHtmlElement();0<parseInt(d.find("#revisedFileId").val(),10)&&(d.submit(),c.preventDefault())};a.pkp.controllers.wizard.fileUpload.form.RevisionConfirmationHandler.prototype.handleResponse=function(a,c){!0===c.status&&this.trigger("fileUploaded",c.uploadedFile);return this.parent("handleResponse",a,c)}})(jQuery);(function(a){a.pkp.controllers.grid.navigationMenus=a.pkp.controllers.grid.navigationMenus||{form:{}};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler=function(a,c){this.okButton_=c.okButton;this.warningModalTitle_=c.warningModalTitle;this.submenuWarning_=c.submenuWarning;this.itemTypeConditionalWarnings_=c.itemTypeConditionalWarnings;a.on("click",".btnConditionalDisplay",this.callbackWrapper(this.showConditionalDisplayWarning));a.on("click",".btnSubmenuWarning",this.callbackWrapper(this.showSubmenuWarning));
 this.parent(a,c);this.initSorting()};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.okButton_=null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.warningModalTitle_=null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.submenuWarning_=void 0;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.itemTypeConditionalWarnings_=
 null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.initSorting=function(){var b=this;a(".btnSubmenuWarning",this.getHtmlElement()).remove();a("#pkpNavAssigned > li").each(function(){var c=a(this).children("ul"),d=c.children(),e=d.find("li");c.length?d.length?(e.length&&e.each(function(){a(this).appendTo(c)}),a(this).find("> .item > .item_buttons .btnSubmenuWarning").length||a(this).find("> .item > .item_buttons").prepend(a("<button></button>").addClass("btnSubmenuWarning").append(a("<span></span>").addClass("fa fa-exclamation-triangle")).append(a("<span></span>").addClass("-screenReader").text(b.submenuWarning_)))):
 c.replaceWith("<ul></ul>"):a(this).append("<ul></ul>")});a("#pkpNavUnassigned > li").each(function(){var b=a(this).children("ul");b.length&&b.find("li").each(function(){a(this).appendTo(a("#pkpNavUnassigned"))});b.remove()});a("#pkpNavManagement ul").sortable({placeholder:"pkp_nav_item_placeholder",delay:250,connectWith:"#pkpNavManagement ul",update:this.callbackWrapper(this.updateSorting),start:function(){a("#pkpNavAssigned").addClass("pkp_is_sorting")},stop:function(){a("#pkpNavAssigned").removeClass("pkp_is_sorting")}})};
@@ -386,7 +381,7 @@ b);a(this.getHtmlElement()).find(":checkbox").change()};a.pkp.controllers.grid.s
 e.prop("readonly",f.prop("checked")||b.prop("checked"));b.prop("checked")&&f.prop("checked",!0);f.prop("readonly",b.prop("checked"))});return!1}})(jQuery);(function(a){a.pkp.controllers.tab=a.pkp.controllers.tab||{settings:{form:{}}};a.pkp.controllers.tab.settings.form.FileViewFormHandler=function(a,c){this.parent(a,c);this.fetchFileUrl_=c.fetchFileUrl;this.bind("dataChanged",this.refreshForm_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.settings.form.FileViewFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.tab.settings.form.FileViewFormHandler.prototype.fetchFileUrl_=null;a.pkp.controllers.tab.settings.form.FileViewFormHandler.prototype.refreshForm_=
 function(b,c,d){a.get(this.fetchFileUrl_,{settingName:d},this.callbackWrapper(this.refreshResponseHandler_),"json")};a.pkp.controllers.tab.settings.form.FileViewFormHandler.prototype.refreshResponseHandler_=function(a,c){var d,e=this.handleJson(c);e.noData?(d=this.getFileHtmlElement_(e.noData),this.unbindPartial(d),d.empty()):(d=this.getFileHtmlElement_(e.elementId),this.unbindPartial(d),d.html(e.content))};a.pkp.controllers.tab.settings.form.FileViewFormHandler.prototype.getFileHtmlElement_=function(b){var c=
 this.getHtmlElement();return a("#"+b,c)}})(jQuery);(function(a){a.pkp.controllers.tab.settings.announcements=a.pkp.controllers.tab.settings.announcements||{form:{}};a.pkp.controllers.tab.settings.announcements.form.AnnouncementSettingsFormHandler=function(b,c){this.parent(b,c);a("#enableAnnouncementsHomepage",b).click(this.callbackWrapper(this.toggleEnableAnnouncementsHomepage))};a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.settings.announcements.form.AnnouncementSettingsFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.tab.settings.announcements.form.AnnouncementSettingsFormHandler.prototype.toggleEnableAnnouncementsHomepage=
-function(){var b=a("#numAnnouncementsHomepage",this.getHtmlElement());b.attr("disabled")?b.removeAttr("disabled"):b.attr("disabled","disabled")}})(jQuery);(function(a){a.pkp.controllers.tab.settings.permissions=a.pkp.controllers.tab.settings.permissions||{form:{}};a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler=function(b,c){this.parent(b,c);a("#licenseURLSelect",b).change(this.callbackWrapper(this.licenseURLSelectChange));a('input[id^="licenseURL-"]',b).keyup(this.callbackWrapper(this.licenseURLOtherChange));a('input[id^="copyrightHolderType-"]',b).change(this.callbackWrapper(this.copyrightHolderRadioSelect));a("#resetPermissionsButton",
+function(){var b=a("#numAnnouncementsHomepage",this.getHtmlElement());b.attr("disabled")?b.removeAttr("disabled"):b.attr("disabled","disabled")}})(jQuery);(function(a){a.pkp.controllers.tab.settings.archiving=a.pkp.controllers.tab.settings.archiving||{form:{}};a.pkp.controllers.tab.settings.archiving.form.ArchivingSettingsFormHandler=function(b,c){this.parent(b,c);a(".expand-others").click(function(){a("#otherLockss").slideToggle("fast")});"1"==a("#isPLNPluginInstalled").val()&&a("#otherLockss").hide()};a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.settings.archiving.form.ArchivingSettingsFormHandler,a.pkp.controllers.form.AjaxFormHandler)})(jQuery);(function(a){a.pkp.controllers.tab.settings.permissions=a.pkp.controllers.tab.settings.permissions||{form:{}};a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler=function(b,c){this.parent(b,c);a("#licenseURLSelect",b).change(this.callbackWrapper(this.licenseURLSelectChange));a('input[id^="licenseURL-"]',b).keyup(this.callbackWrapper(this.licenseURLOtherChange));a('input[id^="copyrightHolderType-"]',b).change(this.callbackWrapper(this.copyrightHolderRadioSelect));a("#resetPermissionsButton",
 b).button().click(this.callbackWrapper(this.resetPermissionsHandler));this.resetPermissionsUrl=c.resetPermissionsUrl;this.resetPermissionsConfirmText=c.resetPermissionsConfirmText};a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.resetPermissionsUrl=null;a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.resetPermissionsConfirmText=
 null;a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.licenseURLSelectChange=function(){var a=this.getHtmlElement(),c=a.find("#licenseURLSelect");a.find('input[id^="licenseURL-"]').val(c.val())};a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.licenseURLOtherChange=function(){this.getHtmlElement().find("#licenseURLSelect").val("")};a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.copyrightHolderRadioSelect=
 function(b){var c=this.getHtmlElement(),b=a(b),c=c.find('input[id^="copyrightHolderOther-"]');"other"===b.val()?c.removeAttr("disabled"):c.attr("disabled","disabled")};a.pkp.controllers.tab.settings.permissions.form.PermissionSettingsFormHandler.prototype.resetPermissionsHandler=function(){confirm(this.resetPermissionsConfirmText)&&a.post(this.resetPermissionsUrl,{},function(){a("body").trigger("notifyUser")})}})(jQuery);(function(a){a.pkp.controllers.tab.settings.paymentMethod=a.pkp.controllers.tab.settings.paymentMethod||{};a.pkp.controllers.tab.settings.paymentMethod.PaymentMethodHandler=function(a,c){this.parent(a,c);this.paymentMethodFormUrlTemplate_=c.paymentMethodFormUrlTemplate;this.bind("selectPaymentMethod",this.selectPaymentMethodHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.settings.paymentMethod.PaymentMethodHandler,a.pkp.classes.Handler);a.pkp.controllers.tab.settings.paymentMethod.PaymentMethodHandler.prototype.paymentMethodFormUrlTemplate_=
@@ -413,19 +408,20 @@ function(){this.dateRangeElementsWrapper_.hide();return!0};a.pkp.controllers.sta
 function(b){var c;c=a(this.columnsSelector_);b=a(b);c=c.find('option[value="'+b.attr("value")+'"]');b.is(":checked")?c.attr("selected","selected"):c.removeAttr("selected");return!1};a.pkp.controllers.statistics.ReportGeneratorFormHandler.prototype.addOptionalColumnsClass_=function(){var b,c,d,e;d=a(this.columnsSelector_);e=a(this.aggregationOptionsSelector_);c=a("#orderByFormArea select",this.getHtmlElement());d=d.add(c);c=this.optionalColumns_;for(b in c)d.find('option[value="'+b+'"]').addClass("optionalColumn"),
 e.filter('input[value="'+b+'"]').parent().addClass("optionalColumn")}})(jQuery);(function(a){a.pkp.controllers.dashboard=a.pkp.controllers.dashboard||{form:{}};a.pkp.controllers.dashboard.form.DashboardTaskFormHandler=function(b,c){this.parent(b,c);this.singleContextSubmissionUrl_=c.singleContextSubmissionUrl;a("#singleContext",b).click(this.callbackWrapper(this.startSingleContextSubmission_));a("#multipleContext",b).change(this.callbackWrapper(this.startMultipleContextSubmission_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.dashboard.form.DashboardTaskFormHandler,a.pkp.controllers.form.FormHandler);
 a.pkp.controllers.dashboard.form.DashboardTaskFormHandler.prototype.singleContextSubmissionUrl_=null;a.pkp.controllers.dashboard.form.DashboardTaskFormHandler.prototype.startSingleContextSubmission_=function(){window.location.href=this.singleContextSubmissionUrl_};a.pkp.controllers.dashboard.form.DashboardTaskFormHandler.prototype.startMultipleContextSubmission_=function(){var a=this.getHtmlElement().find("#multipleContext").val();0!=a&&(window.location.href=a)}})(jQuery);(function(a){a.pkp.pages=a.pkp.pages||{header:{}};a.pkp.pages.header.HeaderHandler=function(a,c){this.options_=c;this.parent(a,c)};a.pkp.classes.Helper.inherits(a.pkp.pages.header.HeaderHandler,a.pkp.classes.Handler);a.pkp.pages.header.HeaderHandler.prototype.options_=null})(jQuery);(function(a){a.pkp.pages.header.TasksHandler=function(b,c){this.options_=c;this.parent(b,c);a("#notificationsToggle").click(this.callbackWrapper(this.appendToggleIndicator_));this.bind("updateUnreadNotificationsCount",this.fetchUnreadNotificationsCountHandler_)};a.pkp.classes.Helper.inherits(a.pkp.pages.header.TasksHandler,a.pkp.classes.Handler);a.pkp.pages.header.TasksHandler.prototype.options_=null;a.pkp.pages.header.TasksHandler.prototype.appendToggleIndicator_=function(){var a=this.getHtmlElement(),
-c=a.find("#notificationsPopover"),d=a.find("li.notificationsLinkContainer"),a=a.find("#notificationsToggle");c.toggle();d.toggleClass("expandedIndicator");a.toggleClass("expandedIndicator");d.hasClass("expandedIndicator")&&this.trigger("callWhenClickOutside",[{container:c.add(d),callback:this.callbackWrapper(this.appendToggleIndicator_)}])};a.pkp.pages.header.TasksHandler.prototype.fetchUnreadNotificationsCountHandler_=function(){a.get(this.options_.fetchUnreadNotificationsCountUrl,this.callbackWrapper(this.updateUnreadNotificationsCountHandler_),
-"json")};a.pkp.pages.header.TasksHandler.prototype.updateUnreadNotificationsCountHandler_=function(a,c){var d=this.getHtmlElement().find("#unreadNotificationCount");d.html(c.content);"0"==c.content?d.removeClass("hasTasks"):d.addClass("hasTasks")}})(jQuery);(function(a){a.pkp.pages.admin=a.pkp.pages.admin||{};a.pkp.pages.admin.ContextsHandler=function(b,c){var d=a("#openWizard a");d&&d.attr("style","display:none");this.parent(b,c)};a.pkp.classes.Helper.inherits(a.pkp.pages.admin.ContextsHandler,a.pkp.classes.Handler)})(jQuery);(function(a){a.pkp.pages.submission=a.pkp.pages.submission||{};a.pkp.pages.submission.SubmissionTabHandler=function(a,c){this.parent(a,c);this.submissionProgress_=c.submissionProgress;this.cancelUrl_=c.cancelUrl;this.cancelConfirmText_=c.cancelConfirmText;this.bind("setStep",this.setStepHandler);this.bind("formCanceled",this.formCanceledHandler);this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(this.submissionProgress_))};a.pkp.classes.Helper.inherits(a.pkp.pages.submission.SubmissionTabHandler,
+c=a.find("#notificationsPopover"),d=a.find("#notificationsToggle");c.toggle();d.toggleClass("expandedIndicator");d.hasClass("expandedIndicator")?(this.trigger("callWhenClickOutside",[{container:a,callback:this.callbackWrapper(this.appendToggleIndicator_)}]),setTimeout(this.callbackWrapper(this.setPopoverSize_),500)):c.css("height","").css("overflow-y","")};a.pkp.pages.header.TasksHandler.prototype.setPopoverSize_=function(){var b=this.getHtmlElement().find("#notificationsPopover"),c=a(window).height()-
+60;c<b.height()&&b.height(c).css("overflow-y","scroll")};a.pkp.pages.header.TasksHandler.prototype.fetchUnreadNotificationsCountHandler_=function(){a.get(this.options_.fetchUnreadNotificationsCountUrl,this.callbackWrapper(this.updateUnreadNotificationsCountHandler_),"json")};a.pkp.pages.header.TasksHandler.prototype.updateUnreadNotificationsCountHandler_=function(a,c){var d=this.getHtmlElement().find("#unreadNotificationCount");d.html(c.content);"0"==c.content?d.removeClass("hasTasks"):d.addClass("hasTasks")}})(jQuery);(function(a){a.pkp.pages.admin=a.pkp.pages.admin||{};a.pkp.pages.admin.ContextsHandler=function(b,c){var d=a("#openWizard a");d&&d.attr("style","display:none");this.parent(b,c)};a.pkp.classes.Helper.inherits(a.pkp.pages.admin.ContextsHandler,a.pkp.classes.Handler)})(jQuery);(function(a){a.pkp.pages.submission=a.pkp.pages.submission||{};a.pkp.pages.submission.SubmissionTabHandler=function(a,c){this.parent(a,c);this.submissionProgress_=c.submissionProgress;this.cancelUrl_=c.cancelUrl;this.cancelConfirmText_=c.cancelConfirmText;this.bind("setStep",this.setStepHandler);this.bind("formCanceled",this.formCanceledHandler);this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(this.submissionProgress_))};a.pkp.classes.Helper.inherits(a.pkp.pages.submission.SubmissionTabHandler,
 a.pkp.controllers.TabHandler);a.pkp.pages.submission.SubmissionTabHandler.prototype.submissionProgress_=null;a.pkp.pages.submission.SubmissionTabHandler.prototype.cancelUrl_=null;a.pkp.pages.submission.SubmissionTabHandler.prototype.cancelConfirmText_=null;a.pkp.pages.submission.SubmissionTabHandler.prototype.setStepHandler=function(a,c,d){this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(d));this.getHtmlElement().tabs("option","active",d-1)};a.pkp.pages.submission.SubmissionTabHandler.prototype.formCanceledHandler=
 function(){confirm(this.cancelConfirmText_)&&(window.location=this.cancelUrl_)};a.pkp.pages.submission.SubmissionTabHandler.prototype.getDisabledSteps=function(a){switch(parseInt(a,10)){case 0:return[];case 1:return[1,2,3,4,5];case 2:return[2,3,4,5];case 3:return[3,4,5];case 4:return[4,5];case 5:return[]}throw Error("Illegal submission step number!");}})(jQuery);jQuery.pkp.pages.submission=jQuery.pkp.pages.submission||{};(function(a){a.pkp.pages.submission.SubmissionStep2FormHandler=function(a,c){this.parent(a,c);this.bind("urlInDivLoaded",this.showFileUploadWizard_)};a.pkp.classes.Helper.inherits(a.pkp.pages.submission.SubmissionStep2FormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.pages.submission.SubmissionStep2FormHandler.prototype.showFileUploadWizard_=function(b,c,d){"submissionFilesGridDiv"==d&&a("#"+d).find('[id*="-addFile-button-"]').click()}})(jQuery);jQuery.pkp.pages.submission=jQuery.pkp.pages.submission||{};
 (function(a){a.pkp.pages.submission.SubmissionStep3FormHandler=function(a,c){this.parent(a,c);this.bind("gridRefreshRequested",this.fetchChaptersGrid_);this.authorsGridContainer_=c.authorsGridContainer;this.chaptersGridContainer_=c.chaptersGridContainer};a.pkp.classes.Helper.inherits(a.pkp.pages.submission.SubmissionStep3FormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.pages.submission.SubmissionStep3FormHandler.prototype.chaptersGridContainer_="";a.pkp.pages.submission.SubmissionStep3FormHandler.prototype.fetchChaptersGrid_=
 function(b,c){c.target.id==this.authorsGridContainer_&&a("#"+this.chaptersGridContainer_).find(".pkp_controllers_grid").trigger("dataChanged")}})(jQuery);(function(a){a.pkp.pages.workflow=a.pkp.pages.workflow||{};a.pkp.pages.workflow.WorkflowHandler=function(a,c){this.parent(a,c);this.bind("stageParticipantsChanged",this.handleStageParticipantsChanged_);this.bind("dataChanged",this.dataChangedHandler_)};a.pkp.classes.Helper.inherits(a.pkp.pages.workflow.WorkflowHandler,a.pkp.classes.Handler);a.pkp.pages.workflow.WorkflowHandler.prototype.handleStageParticipantsChanged_=function(){var b,c,d,e,f=this.getHtmlElement().find(".editorDecisionActions"),h=
 this.getHtmlElement().find("#submissionProgressBarDiv");this.getHtmlElement().find("#stageTabs").find("li").each(function(){if(a(this).hasClass("ui-state-active")){c=a(this).find("a").attr("class");if(b=c.match(/stageId(\d)/)){d=b[1];var f=a.pkp.classes.Handler.getHandler(h);e=f.getSourceUrl();f.setSourceUrl(e.replace(/stageId=\d/,"stageId="+d))}return!1}});f.add(h).each(function(){a.pkp.classes.Handler.getHandler(a(this)).reload()})};a.pkp.pages.workflow.WorkflowHandler.prototype.dataChangedHandler_=
-function(b,c,d){b=a(c.target,this.getHtmlElement()).children("a");b.length&&b.attr("id").match(/submissionEntry/)&&(b=a('[id^="formatsGridContainer"]',this.getHtmlElement()).children("div"),b.trigger("dataChanged",[d]),b.trigger("notifyUser",[b]))}})(jQuery);(function(a){a.pkp.controllers.grid.users=a.pkp.controllers.grid.users||{};a.pkp.controllers.grid.users.UserGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("userMerged",function(){this.trigger("modalFinished");this.refreshGridHandler()})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.UserGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer=a.pkp.controllers.grid.users.reviewer||{};a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler=function(b,c){this.parent(b,c);b.find(".button").button();a("#selectReviewerButton").click(this.callbackWrapper(this.reviewerSelected));a("#regularReviewerForm").hide();this.bind("refreshForm",this.handleRefresh_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler,a.pkp.classes.Handler);a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.reviewerSelected=
-function(){var b=this.getHtmlElement().find("#reviewerSelectGridContainer").find("input:checked"),c=b.val();c&&(b=a.trim(b.parent().next().children("span").text()),a("#reviewerId").val(c),a('[id^="selectedReviewerName"]',this.getHtmlElement()).html(b),a("#searchGridAndButton").hide(),a("#regularReviewerForm").show())};a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.handleRefresh_=function(a,c,d){d&&this.replaceWith(d)}})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer.form=a.pkp.controllers.grid.users.reviewer.form||{};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler=function(a,c){this.parent(a,c);a.change(this.callbackWrapper(this.handleFormChange));this.bind("urlInDivLoaded",this.handleFileListLoad_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler,a.pkp.controllers.form.UserFormHandler);a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.handleFormChange=
+function(b,c,d){b=a(c.target,this.getHtmlElement()).children("a");b.length&&b.attr("id").match(/submissionEntry/)&&(b=a('[id^="formatsGridContainer"]',this.getHtmlElement()).children("div"),b.trigger("dataChanged",[d]),b.trigger("notifyUser",[b]))}})(jQuery);(function(a){a.pkp.controllers.grid.users=a.pkp.controllers.grid.users||{};a.pkp.controllers.grid.users.UserGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("userMerged",function(){this.trigger("modalFinished");this.refreshGridHandler()})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.UserGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer=a.pkp.controllers.grid.users.reviewer||{};a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler=function(b,c){this.parent(b,c);b.find(".button").button();a("#selectReviewerButton").click(this.callbackWrapper(this.selectReviewer));a("#regularReviewerForm").hide();this.bind("refreshForm",this.handleRefresh_);this.bindGlobal("reviewersSelected",this.updateReviewerSelection)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler,
+a.pkp.classes.Handler);a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.selectedReviewer=null;a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.updateReviewerSelection=function(b,c){var d="",e="";c.length?(this.selectedReviewer=c[0],d=this.selectedReviewer.id,e=this.selectedReviewer.fullName):(this.selectedReviewer=null,d=e="");a("#reviewerId",this.getHtmlElement()).val(d);a('[id^="selectedReviewerName"]',this.getHtmlElement()).html(e)};a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.selectReviewer=
+function(){this.selectedReviewer&&(a("#searchGridAndButton").hide(),a("#regularReviewerForm").show())};a.pkp.controllers.grid.users.reviewer.AdvancedReviewerSearchHandler.prototype.handleRefresh_=function(a,c,d){d&&this.replaceWith(d)}})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer.form=a.pkp.controllers.grid.users.reviewer.form||{};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler=function(a,c){this.parent(a,c);a.change(this.callbackWrapper(this.handleFormChange));this.bind("urlInDivLoaded",this.handleFileListLoad_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler,a.pkp.controllers.form.UserFormHandler);a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.handleFormChange=
 function(){this.getHtmlElement().find('input[name="selectedFiles[]"]:checked').length?this.hideWarning():this.showWarning()};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.hideWarning=function(){this.getHtmlElement().find("#noFilesWarning").hide(250)};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.showWarning=function(){this.getHtmlElement().find("#noFilesWarning").show(250)};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.handleFileListLoad_=
 function(){this.getHtmlElement().change()}})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler=function(a,c){this.parent(a,c);c.templateUrl&&(this.templateUrl_=c.templateUrl);a.find("#template").change(this.callbackWrapper(this.selectTemplateHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler,a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler);a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.templateUrl_=null;a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.showWarning=
-function(){this.parent("showWarning");this.getHtmlElement().find("#reviewerFormFooter").trigger("expandFileList")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.selectTemplateHandler_=function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c);
-!1!==e&&""!==e.content&&d.find('textarea[name="personalMessage"]').val(e.content);return e.status}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant=a.pkp.controllers.grid.users.stageParticipant||{};a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler=function(b,c){this.parent(b,c);this.bind("dataChanged",function(){this.refreshGridHandler();a("#submissionEditorDecisionsDiv,#copyeditingEditorDecisionsDiv,[id^=reviewDecisionsDiv").each(function(){a.pkp.classes.Handler.getHandler(a(this)).reload()})})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler,
+function(){this.parent("showWarning");this.getHtmlElement().find("#reviewerFormFooter").trigger("expandFileList")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.selectTemplateHandler_=function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c),
+d=d.find('textarea[name="personalMessage"]'),d=tinyMCE.EditorManager.get(d.attr("id"));!1!==e&&""!==e.content&&d.setContent(e.content);return e.status}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant=a.pkp.controllers.grid.users.stageParticipant||{};a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler=function(b,c){this.parent(b,c);this.bind("dataChanged",function(){this.refreshGridHandler();a("#submissionEditorDecisionsDiv,#copyeditingEditorDecisionsDiv,[id^=reviewDecisionsDiv").each(function(){a.pkp.classes.Handler.getHandler(a(this)).reload()})})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler,
 a.pkp.controllers.grid.CategoryGridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form=a.pkp.controllers.grid.users.stageParticipant.form||{};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler=function(b,c){this.parent(b,c);c.templateUrl&&(this.templateUrl_=c.templateUrl);c.possibleRecommendOnlyUserGroupIds&&(this.possibleRecommendOnlyUserGroupIds_=c.possibleRecommendOnlyUserGroupIds);c.recommendOnlyUserGroupIds&&(this.recommendOnlyUserGroupIds_=c.recommendOnlyUserGroupIds);a("input[name='userGroupId'], input[name='userIdSelected']",
 b).change(this.callbackWrapper(this.updateRecommendOnly));b.find("#template").change(this.callbackWrapper(this.selectTemplateHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.templateUrl_=null;a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.selectTemplateHandler_=
 function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c),f=c.content,d=d.find('textarea[name="message"]'),h=tinyMCE.EditorManager.get(d.attr("id"));d.attr("data-variables",JSON.stringify(f.variables));h.setContent(f.body);return e.status};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateRecommendOnly=

From 81c16610d30cede5da89e2ffd9b92bc746e057af Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Tue, 13 Mar 2018 11:56:11 -0700
Subject: [PATCH 022/100] Increment version number in descriptors for 3.1.1

---
 dbscripts/xml/install.xml | 2 +-
 dbscripts/xml/upgrade.xml | 2 +-
 dbscripts/xml/version.xml | 6 +++---
 docs/README               | 4 ++--
 docs/dev/ojs2.doxygen     | 2 +-
 package.json              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index e4820e3d196..e5c6f4a3e1e 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -10,7 +10,7 @@
   * Installation descriptor file.
   -->
 
-<install version="3.1.0.0">
+<install version="3.1.1.0">
 	<code function="checkPhpVersion" />
 
 	<code function="createDirectories"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index a0f7e48319d..ae76c17da10 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -11,7 +11,7 @@
   *
   -->
 
-<install version="3.1.0.0">
+<install version="3.1.1.0">
 	<code function="checkPhpVersion" />
 
 	<upgrade minversion="2.0.0.0" maxversion="2.3.9.9">
diff --git a/dbscripts/xml/version.xml b/dbscripts/xml/version.xml
index 07c587278fc..b4ab0296ba0 100644
--- a/dbscripts/xml/version.xml
+++ b/dbscripts/xml/version.xml
@@ -13,9 +13,9 @@
 <version>
 	<application>ojs2</application>
 	<type>core</type>
-	<release>3.1.0.0</release>
-	<tag>ojs-3_1_0-0</tag>
+	<release>3.1.1.0</release>
+	<tag>ojs-3_1_1-0</tag>
 	<date>2017-10-23</date>
 	<info>http://pkp.sfu.ca/ojs/</info>
-	<package>http://pkp.sfu.ca/ojs/download/ojs-3.1.0.tar.gz</package>
+	<package>http://pkp.sfu.ca/ojs/download/ojs-3.1.1.tar.gz</package>
 </version>
diff --git a/docs/README b/docs/README
index 347a5fbd8aa..6e41eb81a5f 100644
--- a/docs/README
+++ b/docs/README
@@ -1,8 +1,8 @@
 	===================================
 	=== Open Journal Systems
 	=== The Public Knowledge Project
-	=== Version: 3.1.0
-	=== GIT tag: ojs-3_1_0-0
+	=== Version: 3.1.1
+	=== GIT tag: ojs-3_1_1-0
 	=== Release date: October 23, 2017
 	===================================
 
diff --git a/docs/dev/ojs2.doxygen b/docs/dev/ojs2.doxygen
index 79b92bc106f..1ceaf4b8405 100644
--- a/docs/dev/ojs2.doxygen
+++ b/docs/dev/ojs2.doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Open Journal Systems"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.1.0
+PROJECT_NUMBER         = 3.1.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/package.json b/package.json
index 96c82fb2d57..8d222828966 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "OJS3",
   "description": "Open Journal Systems (OJS) is a journal management and publishing system that has been developed by the Public Knowledge Project through its federally funded efforts to expand and improve access to research.",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "author": "Public Knowledge Project",
   "private": true,
   "scripts": {

From 9157f80757f422573f55c0bfd552f367b4e37e52 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 15 Mar 2018 12:59:52 +0100
Subject: [PATCH 023/100] pkp/pkp-lib#3481 submodule update ##bozana/3481##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index c684829a6ce..9599d21f40c 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit c684829a6ceab9191d1f22c623dd8c05fccb655c
+Subproject commit 9599d21f40c5079218646a82b5a3d833818c49cb

From 380c89ded71512d024cbdabd5b56ad8d499d7c21 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Fri, 16 Mar 2018 09:36:40 -0700
Subject: [PATCH 024/100] pkp/pkp-lib#3485 Make block plugin move case
 insensitive

---
 dbscripts/xml/upgrade/3.1.0_update.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbscripts/xml/upgrade/3.1.0_update.xml b/dbscripts/xml/upgrade/3.1.0_update.xml
index 51c203c56b5..dde39f98a90 100644
--- a/dbscripts/xml/upgrade/3.1.0_update.xml
+++ b/dbscripts/xml/upgrade/3.1.0_update.xml
@@ -18,7 +18,7 @@
 		<query>UPDATE review_assignments SET date_response_due = date_due WHERE date_response_due IS NULL</query>
 	</sql>
 	<sql><!-- pkp/pkp-lib#2310: Move plugins to unified sidebar upon upgrade -->
-		<query>UPDATE plugin_settings SET setting_value=1 WHERE setting_name='context' AND plugin_name LIKE '%BlockPlugin'</query><!-- 1 is BLOCK_CONTEXT_SIDEBAR -->
+		<query>UPDATE plugin_settings SET setting_value=1 WHERE setting_name='context' AND LOWER(plugin_name) LIKE '%blockplugin'</query><!-- 1 is BLOCK_CONTEXT_SIDEBAR -->
 	</sql>
 	<sql><!-- pkp/pkp-lib#2151: set viewable = 1 for submission files (migrated from 2.4.x) -->
 		<query>UPDATE submission_files SET viewable = 1 WHERE file_stage = 2 AND viewable = 0</query><!-- 2 is SUBMISSION_FILE_SUBMISSION -->
@@ -101,4 +101,4 @@
 	<sql><!-- pkp/pkp-lib#2873 -->
 		<query>UPDATE filter_groups SET output_type = 'xml::schema(http://schema.datacite.org/meta/kernel-4/metadata.xsd)' WHERE output_type = 'xml::schema(http://schema.datacite.org/meta/kernel-3/metadata.xsd)'</query>
 	</sql>
-</data>
\ No newline at end of file
+</data>

From dcd14a9f4383f27d0bec18d6f823551d8259cf76 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Fri, 16 Mar 2018 15:42:20 +0100
Subject: [PATCH 025/100] pkp/pkp-lib#3302 clearCache needed after these
 changes

---
 dbscripts/xml/upgrade.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index ae76c17da10..48a0ac106eb 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -191,6 +191,7 @@
 		<data file="dbscripts/xml/upgrade/3.1.1_update.xml" />
 		<code function="installEmailTemplate" key="REVISED_VERSION_NOTIFY" locales="ar_IQ,da_DK,en_US,es_ES,fa_IR,fi_FI,fr_CA,fr_FR,id_ID,pt_PT,ru_RU,sv_SE" />
 		<code function="migrateSRLocale" />
+		<code function="clearDataCache" />
 	</upgrade>
 
 	<upgrade minversion="3.0.0.0" maxversion="3.1.0.9">

From d797219c6e09f83f00dcf2ffef661478f3f23368 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Sat, 17 Mar 2018 15:02:09 +0100
Subject: [PATCH 026/100] remove crearDataCache from Upgrade because it is in
 Installer

---
 classes/install/Upgrade.inc.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/classes/install/Upgrade.inc.php b/classes/install/Upgrade.inc.php
index dde7d2a49cd..fbf94a5fe7f 100644
--- a/classes/install/Upgrade.inc.php
+++ b/classes/install/Upgrade.inc.php
@@ -55,18 +55,6 @@ function rebuildSearchIndex() {
 		return true;
 	}
 
-	/**
-	 * Clear the data cache files (needed because of direct tinkering
-	 * with settings tables)
-	 * @return boolean
-	 */
-	function clearDataCache() {
-		$cacheManager = CacheManager::getManager();
-		$cacheManager->flush(null, CACHE_TYPE_FILE);
-		$cacheManager->flush(null, CACHE_TYPE_OBJECT);
-		return true;
-	}
-
 	/**
 	 * Clear the CSS cache files (needed when changing LESS files)
 	 * @return boolean

From 261dadecdb9cbfa7e5b71b7f7c6b6278d047aaa7 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Sat, 17 Mar 2018 15:02:58 +0100
Subject: [PATCH 027/100] pkp/pkp-lib#3302 submodule update ##bozana/3302##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 9599d21f40c..8d28ce821ca 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 9599d21f40c5079218646a82b5a3d833818c49cb
+Subproject commit 8d28ce821ca42aeae0c60b986782f145fdee8baa

From 59384ec6480981d33510188ae6cf1d48c7ef1b75 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Sat, 17 Mar 2018 16:52:36 +0100
Subject: [PATCH 028/100] pkp/pkp-lib#3237 only one PDF galley or all for
 as-crawled URLs, plus its metadata update/removal

---
 .../filter/ArticleCrossrefXmlFilter.inc.php   | 65 +++++++++++++++----
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php b/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
index 3bbb9d10b81..541b890ced4 100644
--- a/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
+++ b/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
@@ -171,12 +171,12 @@ function createJournalArticleNode($doc, $submission) {
 		// DOI data
 		$doiDataNode = $this->createDOIDataNode($doc, $submission->getStoredPubId('doi'), $request->url($context->getPath(), 'article', 'view', $submission->getBestArticleId(), null, null, true));
 		// append galleys files and collection nodes to the DOI data node
-		// galley can contain several files
 		$articleGalleyDao = DAORegistry::getDAO('ArticleGalleyDAO');
 		$galleys = $articleGalleyDao->getBySubmissionId($submission->getId());
-		import('lib.pkp.classes.submission.SubmissionFile'); // SUBMISSION_FILE_... constants
-		$submissionFileDao = DAORegistry::getDAO('SubmissionFileDAO'); /* @var $submissionFileDao SubmissionFileDAO */
-		$submissionGalleys = array();
+		// All full-texts, PDF full-texts and remote galleys for text-mining and as-crawled URL
+		$submissionGalleys = $pdfGalleys = $remoteGalleys = array();
+		// prefered PDF full-text for the as-crawled URL
+		$pdfGalleyInArticleLocale = null;
 		// get immediatelly also supplementary files for component list
 		$componentGalleys = array();
 		$genreDao = DAORegistry::getDAO('GenreDAO');
@@ -192,15 +192,31 @@ function createJournalArticleNode($doc, $submission) {
 					}
 				} else {
 					$submissionGalleys[] = $galley;
+					if ($galley->isPdfGalley()) {
+						$pdfGalleys[] = $galley;
+						if (!$pdfGalleyInArticleLocale && $galley->getLocale() == $submission->getLocale()) {
+							$pdfGalleyInArticleLocale = $galley;
+						}
+					}
 				}
 			} else {
-				$submissionGalleys[] = $galley;
+				$remoteGalleys[] = $galley;
 			}
 		}
-		// submission galley files - collection nodes
-		if (!empty($submissionGalleys)) {
-			$this->appendCollectionNodes($doc, $doiDataNode, $submission, $submissionGalleys);
+		// as-crawled URLs
+		$asCrawledGalleys = array();
+		if ($pdfGalleyInArticleLocale) {
+			$asCrawledGalleys = array($pdfGalleyInArticleLocale);
+		} elseif (!empty($pdfGalleys)) {
+			$asCrawledGalleys = array($pdfGalleys[0]);
+		} else {
+			$asCrawledGalleys = $submissionGalleys;
 		}
+		// as-crawled URL - collection nodes
+		$this->appendAsCrawledCollectionNodes($doc, $doiDataNode, $submission, $asCrawledGalleys);
+		// text-mining - collection nodes
+		$submissionGalleys = array_merge($submissionGalleys, $remoteGalleys);
+		$this->appendTextMiningCollectionNodes($doc, $doiDataNode, $submission, $submissionGalleys);
 		$journalArticleNode->appendChild($doiDataNode);
 
 		// component list (supplementary files)
@@ -212,20 +228,22 @@ function createJournalArticleNode($doc, $submission) {
 	}
 
 	/**
-	 * Append all collection nodes 'collection' to the doi data node.
+	 * Append the collection node 'collection property="crawler-based"' to the doi data node.
 	 * @param $doc DOMDocument
 	 * @param $doiDataNode DOMElement
 	 * @param $submission PublishedArticle
 	 * @param $galleys array of galleys
 	 */
-	function appendCollectionNodes($doc, $doiDataNode, $submission, $galleys) {
+	function appendAsCrawledCollectionNodes($doc, $doiDataNode, $submission, $galleys) {
 		$deployment = $this->getDeployment();
 		$context = $deployment->getContext();
 		$request = Application::getRequest();
 
-		// start of the text-mining collection element
-		$textMiningCollectionNode = $doc->createElementNS($deployment->getNamespace(), 'collection');
-		$textMiningCollectionNode->setAttribute('property', 'text-mining');
+		if (empty($galleys)) {
+			$crawlerBasedCollectionNode = $doc->createElementNS($deployment->getNamespace(), 'collection');
+			$crawlerBasedCollectionNode->setAttribute('property', 'crawler-based');
+			$doiDataNode->appendChild($crawlerBasedCollectionNode);
+		}
 		foreach ($galleys as $galley) {
 			$resourceURL = $request->url($context->getPath(), 'article', 'download', array($submission->getBestArticleId(), $galley->getBestGalleyId()), null, null, true);
 			// iParadigms crawler based collection element
@@ -236,7 +254,26 @@ function appendCollectionNodes($doc, $doiDataNode, $submission, $galleys) {
 			$iParadigmsItemNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'resource', $resourceURL));
 			$crawlerBasedCollectionNode->appendChild($iParadigmsItemNode);
 			$doiDataNode->appendChild($crawlerBasedCollectionNode);
-			// end iParadigms
+		}
+	}
+
+	/**
+	 * Append the collection node 'collection property="text-mining"' to the doi data node.
+	 * @param $doc DOMDocument
+	 * @param $doiDataNode DOMElement
+	 * @param $submission PublishedArticle
+	 * @param $galleys array of galleys
+	 */
+	function appendTextMiningCollectionNodes($doc, $doiDataNode, $submission, $galleys) {
+		$deployment = $this->getDeployment();
+		$context = $deployment->getContext();
+		$request = Application::getRequest();
+
+		// start of the text-mining collection element
+		$textMiningCollectionNode = $doc->createElementNS($deployment->getNamespace(), 'collection');
+		$textMiningCollectionNode->setAttribute('property', 'text-mining');
+		foreach ($galleys as $galley) {
+			$resourceURL = $request->url($context->getPath(), 'article', 'download', array($submission->getBestArticleId(), $galley->getBestGalleyId()), null, null, true);
 			// text-mining collection item
 			$textMiningItemNode = $doc->createElementNS($deployment->getNamespace(), 'item');
 			$resourceNode = $doc->createElementNS($deployment->getNamespace(), 'resource', $resourceURL);

From b52176fe1cb19877488d1cd11e931123c7c579f6 Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Mon, 19 Mar 2018 17:07:14 +0200
Subject: [PATCH 029/100] Move self archiving settings under
 distribution->permissions

---
 .../form/OJSPermissionSettingsForm.inc.php    | 22 +++++++++++++++++++
 .../form/permissionSettingsForm.tpl           |  8 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/controllers/tab/settings/permissions/form/OJSPermissionSettingsForm.inc.php b/controllers/tab/settings/permissions/form/OJSPermissionSettingsForm.inc.php
index 28a9a8cfdf4..c8f077d6637 100644
--- a/controllers/tab/settings/permissions/form/OJSPermissionSettingsForm.inc.php
+++ b/controllers/tab/settings/permissions/form/OJSPermissionSettingsForm.inc.php
@@ -23,11 +23,33 @@ class OJSPermissionSettingsForm extends PermissionSettingsForm {
 	function __construct($wizardMode = false) {
 		parent::__construct(
 			array(
+				'enableAuthorSelfArchive' => 'bool',
+				'authorSelfArchivePolicy' => 'string',				
 				'copyrightYearBasis' => 'string',
 			),
 			$wizardMode
 		);
 	}
+
+	//
+	// Implement template methods from Form.
+	//
+	/**
+	 * @copydoc Form::getLocaleFieldNames
+	 */
+	function getLocaleFieldNames() {
+		return array_merge(parent::getLocaleFieldNames(), array('authorSelfArchivePolicy'));
+	}
+
+	/**
+	 * @copydoc ContextSettingsForm::fetch
+	 */
+	function fetch($request, $params = null) {
+		$templateMgr = TemplateManager::getManager($request);
+		$templateMgr->assign('scheduledTasksEnabled', (boolean) Config::getVar('general', 'scheduled_tasks'));
+		return parent::fetch($request, $params);
+	}
+
 }
 
 ?>
diff --git a/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl b/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
index d02c97e3d14..c4724c717c8 100644
--- a/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
+++ b/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
@@ -9,9 +9,15 @@
  *
  *}
 {capture assign="additionalFormContent"}
+
+	{fbvFormSection label="manager.subscriptionPolicies.authorSelfArchiveDescription" list=true}
+		{fbvElement type="checkbox" id="enableAuthorSelfArchive" name="enableAuthorSelfArchive" value=1 checked=$enableAuthorSelfArchive label="manager.subscriptionPolicies.authorSelfArchive" disabled=$scheduledTasksEnabled|compare:0}
+		{fbvElement type="textarea" id="authorSelfArchivePolicy" value=$authorSelfArchivePolicy rich=true multilingual=true}
+	{/fbvFormSection}
+
 	{fbvFormSection list=true title="manager.setup.copyrightYearBasis"}
 		{fbvElement type="radio" id="copyrightYearBasis-issue" name="copyrightYearBasis" value="issue" checked=$copyrightYearBasis|compare:"issue" label="manager.setup.copyrightYearBasis.issue"}
 		{fbvElement type="radio" id="copyrightYearBasis-submission" name="copyrightYearBasis" value="submission" checked=$copyrightYearBasis|compare:"submission" label="manager.setup.copyrightYearBasis.article"}
-	{/fbvFormSection}
+	{/fbvFormSection}	
 {/capture}
 {include file="core:controllers/tab/settings/permissions/form/permissionSettingsForm.tpl additionalFormContent=$additionalFormContent}

From 29daaa2eb553060d65f08dc3cfdf40d51ed04bc9 Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Mon, 19 Mar 2018 17:10:32 +0200
Subject: [PATCH 030/100] move the damn tab

---
 .../tab/settings/permissions/form/permissionSettingsForm.tpl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl b/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
index c4724c717c8..65e6c872c36 100644
--- a/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
+++ b/templates/controllers/tab/settings/permissions/form/permissionSettingsForm.tpl
@@ -18,6 +18,6 @@
 	{fbvFormSection list=true title="manager.setup.copyrightYearBasis"}
 		{fbvElement type="radio" id="copyrightYearBasis-issue" name="copyrightYearBasis" value="issue" checked=$copyrightYearBasis|compare:"issue" label="manager.setup.copyrightYearBasis.issue"}
 		{fbvElement type="radio" id="copyrightYearBasis-submission" name="copyrightYearBasis" value="submission" checked=$copyrightYearBasis|compare:"submission" label="manager.setup.copyrightYearBasis.article"}
-	{/fbvFormSection}	
+	{/fbvFormSection}
 {/capture}
 {include file="core:controllers/tab/settings/permissions/form/permissionSettingsForm.tpl additionalFormContent=$additionalFormContent}

From b457bc9a1243dc875baeef558f6203e3f06f4161 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 20 Mar 2018 18:54:45 +0100
Subject: [PATCH 031/100] Adding sv_SE translation of API.

---
 locale/sv_SE/api.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 locale/sv_SE/api.xml

diff --git a/locale/sv_SE/api.xml b/locale/sv_SE/api.xml
new file mode 100644
index 00000000000..6b9c16f2f14
--- /dev/null
+++ b/locale/sv_SE/api.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/sv_SE/api.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2000-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Swedish_(sv_SE)
+  * Localization strings for the REST API.
+  -->
+
+<locale name="sv_SE" full_name="Svenska">
+	<message key="api.submissions.403.unpublishedIssues">Du har inte behörighet att se opublicerade nummer.</message>
+</locale>

From 985f49446cac3b31ba905eb5d412c11518a923b4 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 20 Mar 2018 19:30:19 +0100
Subject: [PATCH 032/100] Minor corrections in sv_SE locale.xml.

---
 locale/sv_SE/locale.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/locale/sv_SE/locale.xml b/locale/sv_SE/locale.xml
index fddfb2fa854..2d6e87ce3a0 100644
--- a/locale/sv_SE/locale.xml
+++ b/locale/sv_SE/locale.xml
@@ -257,6 +257,7 @@
 	<message key="subscriptions.status.needsApproval">Behöver godkännas</message>
 	<message key="subscriptions.status.awaitingManualPayment">Väntar på manuell betalning</message>
 	<message key="subscriptions.status.awaitingOnlinePayment">Väntar på online-betalning</message>
+	<message key="subscriptions.status.noSubscription">Du har inte någon aktiv prenumeration.</message>
 	<message key="subscriptions.status.other">Annat, se anteckningar</message>
 	<message key="subscriptions.individualDescription">Enskilda prenumerationer kräver inloggning för att få tillgång till prenumerationsmaterial.</message>
 	<message key="subscriptions.institutionalDescription">Institutionsprenumerationer kräver inte inloggning. Användarens domän och/eller IP-adress används för att ge tillgång till prenumerationsmaterial.</message>
@@ -317,6 +318,7 @@
 	<message key="reader.openAccess">Open access</message>
 	<message key="reader.subscriptionAccess">Kräver prenumeration</message>
 	<message key="reader.subscriptionOrFeeAccess">Kräver prenumeration eller betalning</message>
+	<message key="reader.purchasePrice">({$currency} {$price})</message>
 
 	<!-- Reader Comments -->
 	<message key="comments.commentsOnArticle">Kommentarer till artikeln</message>
@@ -477,8 +479,7 @@ Du kan välja att ge användaren en förklaring till varför kontot har spärrat
 
 	<!-- Navigation sidebar menu -->
 
-	<!-- Used by editor in submission review / editing -->
-	
+
 
 
 
@@ -833,14 +834,17 @@ Du kan välja att ge användaren en förklaring till varför kontot har spärrat
 	<message key="payment.paymentReceived">Betalning mottagen</message>
 	<message key="payment.paymentSent">Betalning har redan skickats</message>
 	<message key="payment.authorFees">Författaravgifter</message>
-	<message key="payment.type.submission">Prenumerationsavgift</message>
+	<message key="payment.type.submission">Manusavgift</message>
 	<message key="payment.type.publication">Publiceringsavgift</message>
+	<message key="payment.type.publication.required">Publiceringsavgiften ska betalas.</message>
 	<message key="payment.type.fastTrack">Avgift för snabbspår till granskning</message>
 	<message key="payment.type.membership">Avgift för individuellt medlemskap</message>
 	<message key="payment.type.purchaseArticle">Avgift för köp av enstaka artikel</message>
 	<message key="payment.type.purchaseIssue">Avgift för köp av enstaka nummer</message>
 	<message key="payment.type.subscription">Prenumerationsavgift</message>
 	<message key="payment.type.donation">Donationer</message>
+	<message key="payment.requestPublicationFee">Begär publiceringsavgift ({$feeAmount})</message>
+	<message key="payment.notFound">Betalning har begärts men begäran har förfallit. Kontakta tidskriftsansvarig för mer information.</message>
 
 	<message key="payment.donation.makeDonation">Donera</message>
 
@@ -1076,7 +1080,7 @@ Sök-URL:er som kräver inskickade formulärdata kan komma att visas som ogiltig
 	<!-- Included here because it may be used in the navigation bar -->
 	<message key="editor.navigation.issues">Nummer</message>
 
-	<message key="notification.type.approveSubmission">Det här bidraget väntar för närvarande på godkännande innan det blir synligt i numret.</message>
+	<message key="notification.type.approveSubmission">Det här bidraget väntar för närvarande på godkännande innan det kommer att synas i numret.</message>
 	<message key="notification.type.approveSubmissionTitle">Väntar på godkännande.</message>
 
 	<message key="user.profile.form.showOtherContexts">Registrera dig hos andra tidskrifter</message>
@@ -1088,11 +1092,14 @@ Sök-URL:er som kräver inskickade formulärdata kan komma att visas som ogiltig
 	<message key="grid.catalogEntry.approvedRepresentation.title">Godkännande av publiceringsversion</message>
 	<message key="grid.catalogEntry.approvedRepresentation.message"><![CDATA[<p>Godkänn den här publiceringsversionen för publicering.</p>]]></message>
 	<message key="grid.catalogEntry.approvedRepresentation.removeMessage"><![CDATA[<p>Ta tillbaka godkännande för den här publiceringsversionen.</p>]]></message>
-	<message key="search.cli.rebuildIndex.indexing">Indexering "{$journalName}"</message>
+	<message key="search.cli.rebuildIndex.indexing">Indexerar "{$journalName}"</message>
 	<message key="search.cli.rebuildIndex.indexingByJournalNotSupported">Den här sökfunktionaliteten tillåter inte omindexering per tidskrift.</message>
 	<message key="search.cli.rebuildIndex.unknownJournal">Angiven sökväg för tidskrift, "{$journalPath}", kunde inte knytas till någon tidskrift.</message>
 
 	<message key="editor.issues.backIssues">Publicerade nummer</message>
 	<message key="editor.issues.futureIssues">Kommande nummer</message>
 	<message key="navigation.subscriptions">Prenumerationer</message>
+
+	<!-- legacy strings from OJS 2, for upgraded installations from OJS 2 -->
+	<message key="log.editor.submissionExpedited">{$editorName} har tagit hand om redigeringsprocessen för artikeln {$submissionId}.</message>
 </locale>

From a4b73e33fbf64f385982f44b3bdc09b6f690c22a Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 20 Mar 2018 21:24:01 +0100
Subject: [PATCH 033/100] Updating sv_SE translation of manager.xml.

---
 locale/sv_SE/manager.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 7bd2701c319..591be66a6c8 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -232,8 +232,14 @@
 	<message key="manager.setup.lists">Listor</message>
 	<message key="manager.setup.listsDescription">Ange antal träffar som visas på på varje sida (t.ex. bidrag, användare eller redaktörsuppdrag). Ange också hur många länkar som ska visas på varje sida.</message>
 	<message key="manager.setup.enableArchive">Aktivera arkiv</message>
+	<message key="manager.setup.plnPluginEnable">PKP PN-pluginet aktiverat</message>
+	<message key="manager.setup.plnDescription">PKP Preservation Network (PN) tillhandahåller kostnadsfria tjänster för arkivering och bevarande för alla OJS-tidskrifter som uppfyller några grundläggande krav.</message>
+	<message key="manager.setup.plnSettingsDescription">Klicka på Settings-länken för att acceptera villkoren för att ansluta sig till PKP PN.</message>
+	<message key="manager.setup.plnPluginArchiving">PKP Preservation Network (PN)</message>
+	<message key="manager.setup.plnPluginNotInstalled">PKP Preservation Network (PN) tillhandahåller kostnadsfria tjänster för arkivering och bevarande för alla OJS-tidskrifter som uppfyller några grundläggande krav. PKP PN-pluginet i OJS 3 är för närvarande under utveckling och kommer vara tillgängligt i plugin-galleriet inom kort.</message>
+	<message key="manager.setup.otherLockss">Andra alternativ för arkivering</message>
 	<message key="manager.setup.lockssEnable"><![CDATA[Aktivera LOCKSS för att arkivera och distribuera tidskriftens innehåll till deltagande bibliotek via LOCKSS <a href="{$lockssUrl}" target="_blank">Utgivarmanifest</a> sida.]]></message>
-	<message key="manager.setup.lockssLicenseDescription"><![CDATA[En LOCKSS-licens kommer då att visas i ”Om tidskriften” under ”Arkivering”: <a href="http://www.lockss.org/community/publishers-titles-gln/"target="_blank">LOCKSS Licens</a>]]></message>
+	<message key="manager.setup.lockssLicenseDescription"><![CDATA[En LOCKSS-licens kommer då att visas i ”Om tidskriften” under ”Arkivering”: <a href="http://www.lockss.org/community/publishers-titles-gln/"target="_blank">LOCKSS License</a>]]></message>
 	<message key="manager.setup.lockssLicenseLabel">Beskrivning av LOCKSS-licensen</message>
 	<message key="manager.setup.lockssRegister"><![CDATA[Sök fram 6-10 bibliotek som kan registrera och cacha tidskriften. Vänd dig exempelvis till institutioner där redaktörer eller redaktionsmedlemmar arbetar, eller till organisationer som redan deltar i LOCKSS. Se <a href="http://www.lockss.org/community/" target="_blank">LOCKSS community</a>.]]></message>
 	<message key="manager.setup.lockssTitle">LOCKSS</message>
@@ -242,6 +248,8 @@
 	<message key="manager.setup.clockssLicenseLabel">Beskrivning av CLOCKSS-licensen</message>
 	<message key="manager.setup.clockssRegister"><![CDATA[Anmälan till CLOCKSS tjänster görs på <a href="http://clockss.org/" target="_blank">CLOCKSS webbplats</a>.]]></message>
 	<message key="manager.setup.clockssTitle">CLOCKSS</message>
+	<message key="manager.setup.porticoEnable"><![CDATA[Aktivera möjligheten för Portico att lagra och distribuera tidskriftsmaterial till bibliotek som deltar i Portico.]]></message>
+	<message key="manager.setup.porticoTitle">Portico</message>
 	<message key="manager.setup.Issn">ISSN</message>
 	<message key="manager.setup.look">Utseende</message>
 	<message key="manager.setup.look.description">Webbplatsens sidhuvud, innehåll, tidskriftens sidhuvud, sidfot, navigeringsfält, style sheet.</message>
@@ -534,6 +542,12 @@
 	<message key="manager.subscriptionTypes.subscriptionTypeCreatedSuccessfully">En prenumerationsform har skapats.</message>
 	<message key="manager.distribution.access">Tillgång</message>
 
+	<!-- Navigation Menu Items -->
+	<message key="manager.navigationMenus.subscriptions.description">Länka till en sida som beskriver era prenumerationsalternativ.</message>
+	<message key="manager.navigationMenus.mySubscriptions.description">Länka till en sida som beskriver besökarens aktuella och tidigare prenumerationer.</message>
+	<message key="manager.navigationMenus.mySubscriptions.conditionalWarning">Den här länken kommer bara att visas om besökaren är inloggad.</message>
+
+
 	<!-- Categories -->
 	<message key="manager.setup.categories">Kategorier</message>
 	<message key="manager.setup.categories.description">Välj en lämplig kategori från listan nedan. Läsare kommer att kunna bläddra i tidskriftslistan via kategori.</message>

From c26cc524239619343d84b0fabfa345ddf3f06a83 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 20 Mar 2018 21:29:37 +0100
Subject: [PATCH 034/100] Updating submission.xml for the sv_SE locale.

---
 locale/sv_SE/submission.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locale/sv_SE/submission.xml b/locale/sv_SE/submission.xml
index 04385b1a3fb..0bab57f4457 100644
--- a/locale/sv_SE/submission.xml
+++ b/locale/sv_SE/submission.xml
@@ -22,6 +22,7 @@
 	<message key="submission.submit.newSubmissionMultiple">Skicka in ett nytt bidrag i</message>
 	<message key="submission.submit.newSubmissionSingle">Nytt bidrag</message>
 	<message key="grid.action.workflow">Arbetsflöde för bidrag</message>
+	<message key="submission.abstract.wordCount.description">Abstractet får inte vara längre än {$wordCount} ord.</message>
 
 	<message key="submission.issueEntry">Metadata</message>
 	<message key="submission.submit.whatNext.description">Tidskriften har blivit meddelad om ditt insända bidrag, och du har fått en bekräftelse skickad till dig per e-post. När redaktören har läst ditt bidrag kommer hen att kontakta dig.</message>
@@ -70,6 +71,7 @@
 	<message key="submission.submit.form.authorRequiredFields">Förnamn, efternamn och e-postadress för varje författare krävs.</message>
 	<message key="submission.submit.form.titleRequired">Vänligen mata in titeln på din artikel.</message>
 	<message key="submission.submit.form.abstractRequired">Vänligen mata in abstract för din artikel.</message>
+	<message key="submission.submit.form.wordCountAlert">Ditt abstract är för långt. Korta det så att det ryms inom begränsningen i antal ord som gäller för den här sektionen.</message>
 	<message key="submission.submit.form.contributorRoleRequired">Vänligen välj medarbetarens roll.</message>
 
 	<message key="submission.citationFormat.notFound">Referensformatet som efterfrågades kunde inte hämtas.</message>

From 635f56563b690ccef256cbd85f3e6824e12bc7ef Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 21 Mar 2018 08:40:40 -0700
Subject: [PATCH 035/100] Make SQL more generic

---
 dbscripts/xml/upgrade/3.1.1_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbscripts/xml/upgrade/3.1.1_update.xml b/dbscripts/xml/upgrade/3.1.1_update.xml
index 18e1604ddeb..208978dfc23 100644
--- a/dbscripts/xml/upgrade/3.1.1_update.xml
+++ b/dbscripts/xml/upgrade/3.1.1_update.xml
@@ -40,7 +40,7 @@
 	</sql>
 	<!-- pkp/pkp-lib#2894 Set 0 review ratings to NULL -->
 	<sql>
-		<query>UPDATE review_assignments ra SET ra.quality = NULL WHERE ra.quality = 0</query>
+		<query>UPDATE review_assignments SET quality = NULL WHERE quality = 0</query>
 	</sql>
 	<!-- pkp/pkp-lib#2894 Update old localised user gossip entries -->
 	<sql>

From ef9bd5b886e9fa6280153fe48bbf50b8a94b4ed0 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 21 Mar 2018 19:14:52 +0100
Subject: [PATCH 036/100] pkp/pkp-lib#3510 submodule update ##bozana/3510##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 8d28ce821ca..dedb24e8587 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 8d28ce821ca42aeae0c60b986782f145fdee8baa
+Subproject commit dedb24e8587198374bdc82d8c98b77b90caa5a71

From 7fc1029416a079fce4bf6cc82261386156cec364 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 21 Mar 2018 21:02:21 +0100
Subject: [PATCH 037/100] pkp/pkp-lib#3509 fix article accepted date in
 DataCite export

---
 .../datacite/filter/DataciteXmlFilter.inc.php          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/importexport/datacite/filter/DataciteXmlFilter.inc.php b/plugins/importexport/datacite/filter/DataciteXmlFilter.inc.php
index ccbd0372342..85ffe6cb4ae 100644
--- a/plugins/importexport/datacite/filter/DataciteXmlFilter.inc.php
+++ b/plugins/importexport/datacite/filter/DataciteXmlFilter.inc.php
@@ -349,8 +349,14 @@ function createDatesNode($doc, $issue, $article, $galley, $galleyFile, $publicat
 				$submittedDate = $article->getDateSubmitted();
 				if (!empty($submittedDate)) {
 					$dates[DATACITE_DATE_SUBMITTED] = $submittedDate;
-					// Default accepted date: submitted date.
-					$dates[DATACITE_DATE_ACCEPTED] = $submittedDate;
+				}
+				// Accepted date: the last editor accept decision date
+				$editDecisionDao = DAORegistry::getDAO('EditDecisionDAO');
+				$editDecisions = $editDecisionDao->getEditorDecisions($article->getId());
+				foreach (array_reverse($editDecisions) as $editDecision) {
+					if ($editDecision['decision'] == SUBMISSION_EDITOR_DECISION_ACCEPT) {
+						$dates[DATACITE_DATE_ACCEPTED] = $editDecision['dateDecided'];
+					}
 				}
 				// Last modified date (for articles): last$lastModifiede.
 				$lastModified = $article->getLastModified();

From 3571cce7e5249e5f1be4349906eab06de2799c64 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 22 Mar 2018 09:56:43 +0100
Subject: [PATCH 038/100] pkp/pkp-lib#3228 submodule update ##bozana/3228##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index dedb24e8587..5288d423790 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit dedb24e8587198374bdc82d8c98b77b90caa5a71
+Subproject commit 5288d4237901f144396210709c4b6c87dbc74a91

From 88ca9f44b081774e28af5f5cc86ca3f690fb7906 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 22 Mar 2018 13:06:16 +0100
Subject: [PATCH 039/100] pkp/pkp-lib#3436 change array_merge into + to keep
 the keys

---
 classes/workflow/EditorDecisionActionsManager.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/workflow/EditorDecisionActionsManager.inc.php b/classes/workflow/EditorDecisionActionsManager.inc.php
index 72803428074..e8be3b0f3d6 100644
--- a/classes/workflow/EditorDecisionActionsManager.inc.php
+++ b/classes/workflow/EditorDecisionActionsManager.inc.php
@@ -141,7 +141,7 @@ static function _submissionStageDecisions($makeDecision = true) {
 			)
 		);
 		if ($makeDecision) {
-			$decisions = array_merge($decisions, array(
+			$decisions = $decisions + array(
 				SUBMISSION_EDITOR_DECISION_ACCEPT => array(
 					'name' => 'accept',
 					'operation' => 'promote',
@@ -153,7 +153,7 @@ static function _submissionStageDecisions($makeDecision = true) {
 					'operation' => 'sendReviews',
 					'title' => 'editor.submission.decision.decline',
 				),
-			));
+			);
 		}
 		return $decisions;
 	}

From e16137d91ae8dd4c7237da248938d80cd38b4f41 Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Fri, 23 Mar 2018 20:56:11 +0200
Subject: [PATCH 040/100] Fi locale for 3.1.1

---
 locale/fi_FI/api.xml                          | 16 +++++++++++
 locale/fi_FI/locale.xml                       |  6 +++++
 locale/fi_FI/manager.xml                      |  8 ++++++
 locale/fi_FI/submission.xml                   |  2 ++
 .../announcementFeed/locale/fi_FI/locale.xml  | 27 +++++++++++++++++++
 .../generic/driver/locale/fi_FI/locale.xml    | 17 ++++++++++++
 .../usageStats/locale/fi_FI/locale.xml        | 14 ++++++++++
 7 files changed, 90 insertions(+)
 create mode 100644 locale/fi_FI/api.xml
 create mode 100644 plugins/generic/announcementFeed/locale/fi_FI/locale.xml
 create mode 100644 plugins/generic/driver/locale/fi_FI/locale.xml

diff --git a/locale/fi_FI/api.xml b/locale/fi_FI/api.xml
new file mode 100644
index 00000000000..4a56331f13d
--- /dev/null
+++ b/locale/fi_FI/api.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/fi_FI/locale.xml
+  *
+  * Copyright (c) 2014-2017 Simon Fraser University
+  * Copyright (c) 2003-2017 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="fi_FI" full_name="Suomi">
+	<message key="api.submissions.403.unpublishedIssues">Sinulla ei ole lupaa katsoa julkaisemattomia numeroita.</message>
+</locale>
diff --git a/locale/fi_FI/locale.xml b/locale/fi_FI/locale.xml
index 99af1d4f4a5..173863f6334 100644
--- a/locale/fi_FI/locale.xml
+++ b/locale/fi_FI/locale.xml
@@ -1092,4 +1092,10 @@ Vahvistaminen saattaa epäonnistua sellaisten haun URL-osoitteiden kohdalla, jot
 	<message key="notification.type.publicationScheduled">Tämä käsikirjoitus on ajoitettu julkaistavaksi.</message>
 	<message key="log.editor.recommendation">{$editorName} tallensi päätöksen ({$decision}) käsikirjoitukselle {$submissionId}.</message>
 	<message key="subscriptions.status.noSubscription">Sinulla ei ole aktiivista tilausta.</message>
+	<message key="reader.purchasePrice">({$currency} {$price})</message>
+	<message key="manager.setup.porticoDescription">Portico on voittoa tavoittelematon palvelu, joka tarjoaa digitaalisten julkaisujen pitkäaikaissäilytystä. Jos julkaisusi on solminut sopimuksen Porticon kanssa, ota se käyttöön täältä:</message>
+	<message key="payment.type.publication.required">Julkaisumaksu tulee maksettavaksi.</message>
+	<message key="payment.requestPublicationFee">Pyydä julkaisumaksua ({$feeAmount})</message>
+	<message key="payment.notFound">Maksua on pyydetty, mutta pyyntö on vanhentunut. Ota yhteyttä julkaisuun.</message>
+	<message key="log.editor.submissionExpedited">{$editorName} on nopeuttanut käsikirjoituksen {$submissionId} käsittelyä.</message>
 </locale>
diff --git a/locale/fi_FI/manager.xml b/locale/fi_FI/manager.xml
index 129b53f1c15..281759cbff5 100644
--- a/locale/fi_FI/manager.xml
+++ b/locale/fi_FI/manager.xml
@@ -596,4 +596,12 @@ Julkaisusi on määritetty tallentamaan useita käytön mittareita. Käyttötila
 	<message key="manager.navigationMenus.subscriptions.description">Linkki lehden tilausvaihtoehtoja koskevalle sivulle.</message>
 	<message key="manager.navigationMenus.mySubscriptions.description">Linkki käyttäjän tilaushistoriaa koskevalle sivulle.</message>
 	<message key="manager.navigationMenus.mySubscriptions.conditionalWarning">Tämä linkki näytetään vain käyttäjän ollessa kirjautuneena sisään.</message>
+	<message key="manager.setup.plnPluginEnable">PKP PN -lisäosa otettu käyttöön</message>
+	<message key="manager.setup.plnDescription">PKP Preservation Network (PN) tarjoaa ilmaisen pitkäaikaissäilytyspalvelun mille tahansa kriteerit täyttävälle OJS-lehdelle.</message>
+	<message key="manager.setup.plnSettingsDescription">Hyväksy PKP PN -palvelun ehdot painamalla asetukset-linkkiä.</message>
+	<message key="manager.setup.plnPluginArchiving">PKP Preservation Network (PN)</message>
+	<message key="manager.setup.plnPluginNotInstalled">PKP Preservation Network (PN) tarjoaa ilmaisen pitkäaikaissäilytyspalvelun mille tahansa kriteerit täyttävälle OJS-lehdelle. OJS3-yhteensopiva lisäosa on parhaillaan kehitettävä ja se on pian saatavissa lisäosagallerian kautta.</message>
+	<message key="manager.setup.otherLockss">Muut arkistointivalinnat</message>
+	<message key="manager.setup.porticoEnable">Ota Portico käyttöön ja jaa lehden sisällöt Porticon verkostoon osallistuville kirjastoille.</message>
+	<message key="manager.setup.porticoTitle">Portico</message>
 </locale>
diff --git a/locale/fi_FI/submission.xml b/locale/fi_FI/submission.xml
index d4d3962e0b8..c7488857db4 100644
--- a/locale/fi_FI/submission.xml
+++ b/locale/fi_FI/submission.xml
@@ -76,4 +76,6 @@
 
 	<message key="submission.metadataDescription">Nämä määritykset perustuvat Dublin Core -metatietosanastostandardiin. Se on kansainvälinen standardi, jolla kuvataan julkaisun sisältöä.</message>
 	<message key="section.any">Kaikki osastot</message>
+	<message key="submission.abstract.wordCount.description">Abstraktin tulee olla korkeintaan {$wordCount} sanaa.</message>
+	<message key="submission.submit.form.wordCountAlert">Abstrakti on liian pitkä. Tarkista pituus ja yritä uudelleen.</message>
 </locale>
diff --git a/plugins/generic/announcementFeed/locale/fi_FI/locale.xml b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
new file mode 100644
index 00000000000..2ebfce7378e
--- /dev/null
+++ b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/fi_FI/locale.xml
+  *
+  * Copyright (c) 2014-2017 Simon Fraser University
+  * Copyright (c) 2003-2017 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="fi_FI" full_name="Suomi">
+	<message key="plugins.generic.announcementfeed.displayName">Ilmoitusten syöte -lisäosa</message>
+	<message key="plugins.generic.announcementfeed.description">Tämä lisäosa tuottaa RSS/ATOM syötteen julkaisun ilmoituksista.</message>
+	<message key="plugins.generic.announcementfeed.settings">Asetukset</message>
+	<message key="plugins.generic.announcementfeed.settings.all">Näytä syötteen linkki kaikilla lehden sivuilla.</message>
+	<message key="plugins.generic.announcementfeed.settings.homepage">Näytä syötteen linkki vain kotisivulla ja ilmoitusten sivuilla.</message>
+	<message key="plugins.generic.announcementfeed.settings.announcement">Näytä syötteen linkki vain ilmoitusten sivuilla.</message>
+	<message key="plugins.generic.announcementfeed.settings.recentAnnouncements1">Rajoita syötteen kokoa</message>
+	<message key="plugins.generic.announcementfeed.settings.recentAnnouncements2">uusimpaan ilmoitukseen.</message>
+	<message key="plugins.generic.announcementfeed.settings.recentItemsRequired">Anna positiivinen luku.</message>
+	<message key="plugins.generic.announcementfeed.atom.altText">Atom logo</message>
+	<message key="plugins.generic.announcementfeed.rss1.altText">RSS1 logo</message>
+	<message key="plugins.generic.announcementfeed.rss2.altText">RSS2 logo</message>
+</locale>
diff --git a/plugins/generic/driver/locale/fi_FI/locale.xml b/plugins/generic/driver/locale/fi_FI/locale.xml
new file mode 100644
index 00000000000..1f585e7f542
--- /dev/null
+++ b/plugins/generic/driver/locale/fi_FI/locale.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/fi_FI/locale.xml
+  *
+  * Copyright (c) 2014-2017 Simon Fraser University
+  * Copyright (c) 2003-2017 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="fi_FI" full_name="Suomi">
+	<message key="plugins.generic.driver.displayName">DRIVER</message>
+	<message key="plugins.generic.driver.description">DRIVER-lisäosa laajentaa OAI-PMH-rajapintaa DRIVER Guidelines 2.0 mukaisesti.</message>
+</locale>
diff --git a/plugins/generic/usageStats/locale/fi_FI/locale.xml b/plugins/generic/usageStats/locale/fi_FI/locale.xml
index 4d03de75ad4..83642e39701 100644
--- a/plugins/generic/usageStats/locale/fi_FI/locale.xml
+++ b/plugins/generic/usageStats/locale/fi_FI/locale.xml
@@ -29,4 +29,18 @@
 	
 	<message key="plugins.reports.usageStats.metricType">OJS/COUNTER</message>
 	<message key="plugins.reports.usageStats.metricType.full">Open Journal Systems -tilastot (COUNTER yhteensopiva)</message>
+	<message key="plugins.generic.usageStats.settings.statsDisplayOptions.siteWide">Julkaisut voivat ohittaa nämä asetukset muokkaamalla julkaisukohtaisia asetuksia.</message>
+	<message key="plugins.generic.usageStats.optout.description"><![CDATA[<h3>Yksityisyyden suoja</h3>
+<p>Tutustu julkaisun <a href="{$privacyStatementUrl}">tietosuojalausekkeeseen</a>.</p>
+<h3>Kävijätilastot</h3>
+<p>Jotta voimme analysoida julkaisun käyttöä ja vaikutusta, keräämme kävijätilastoja julkaisun etusivuun, numeroihin, artikkeleihin sekä julkaistuihin tiedostoihin liittyen. Kaikki data anonymisoidaan. Henkilötietoja ei tallenneta. IP-osoitteet anonymisoidaan ja salataan (<em>SHA 256</em>) yhdessä 64 merkkisen <em>suolan</em> kanssa, joka luodaan automaattisesti uudelleen päivittäin. IP-osoitteita ei voi siis jälkikäteen selvittää.</p>
+<p>Seuraavat tiedot kerätään yhdessä anonymisoidun IP-osoitteen kanssa:</p>
+<ul>
+<li>Käynnin tyyppi</li>
+<li>Aika</li>
+<li>Pyydetty URL</li>
+<li>HTTP-statuskoodi</li>
+<li>Selain</li>
+</ul>
+<p>Kerättyjä tietoja käytetään ainoastaan arviointitarkoituksiin. IP-osoitteita ei liitetä käyttäjätileihin.</p>]]></message>
 </locale>

From ace6686e1f2a3d63fb0cc69367d3d3aa098e904d Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Fri, 23 Mar 2018 12:19:53 -0700
Subject: [PATCH 041/100] Copyright date updates

---
 locale/fi_FI/api.xml                                     | 4 ++--
 plugins/generic/announcementFeed/locale/fi_FI/locale.xml | 4 ++--
 plugins/generic/driver/locale/fi_FI/locale.xml           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/locale/fi_FI/api.xml b/locale/fi_FI/api.xml
index 4a56331f13d..41f95800dab 100644
--- a/locale/fi_FI/api.xml
+++ b/locale/fi_FI/api.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/fi_FI/locale.xml
   *
-  * Copyright (c) 2014-2017 Simon Fraser University
-  * Copyright (c) 2003-2017 John Willinsky
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings.
diff --git a/plugins/generic/announcementFeed/locale/fi_FI/locale.xml b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
index 2ebfce7378e..525990232d9 100644
--- a/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
+++ b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/fi_FI/locale.xml
   *
-  * Copyright (c) 2014-2017 Simon Fraser University
-  * Copyright (c) 2003-2017 John Willinsky
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings.
diff --git a/plugins/generic/driver/locale/fi_FI/locale.xml b/plugins/generic/driver/locale/fi_FI/locale.xml
index 1f585e7f542..c61397fd473 100644
--- a/plugins/generic/driver/locale/fi_FI/locale.xml
+++ b/plugins/generic/driver/locale/fi_FI/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/fi_FI/locale.xml
   *
-  * Copyright (c) 2014-2017 Simon Fraser University
-  * Copyright (c) 2003-2017 John Willinsky
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings.

From a8da071b7d9899da2ab3a7125cdcb4546cd6d56c Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Fri, 23 Mar 2018 13:40:22 -0700
Subject: [PATCH 042/100] XML validation fixes

---
 locale/fi_FI/api.xml                                     | 2 +-
 plugins/generic/announcementFeed/locale/fi_FI/locale.xml | 2 +-
 plugins/generic/driver/locale/fi_FI/locale.xml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/fi_FI/api.xml b/locale/fi_FI/api.xml
index 41f95800dab..e86a9ef5171 100644
--- a/locale/fi_FI/api.xml
+++ b/locale/fi_FI/api.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/fi_FI/locale.xml
diff --git a/plugins/generic/announcementFeed/locale/fi_FI/locale.xml b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
index 525990232d9..fc21a112988 100644
--- a/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
+++ b/plugins/generic/announcementFeed/locale/fi_FI/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/fi_FI/locale.xml
diff --git a/plugins/generic/driver/locale/fi_FI/locale.xml b/plugins/generic/driver/locale/fi_FI/locale.xml
index c61397fd473..712b44b19bc 100644
--- a/plugins/generic/driver/locale/fi_FI/locale.xml
+++ b/plugins/generic/driver/locale/fi_FI/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/fi_FI/locale.xml

From 0f92f3396c816258e07aa7b7beface9f1a74d27d Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 26 Mar 2018 14:24:23 +0200
Subject: [PATCH 043/100] pkp/pkp-lib#3517 require locale component for
 identifier tab and add a hook

---
 templates/controllers/tab/pubIds/form/publicIdentifiersForm.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/controllers/tab/pubIds/form/publicIdentifiersForm.tpl b/templates/controllers/tab/pubIds/form/publicIdentifiersForm.tpl
index e508d7148cf..b78a863c2f1 100644
--- a/templates/controllers/tab/pubIds/form/publicIdentifiersForm.tpl
+++ b/templates/controllers/tab/pubIds/form/publicIdentifiersForm.tpl
@@ -48,7 +48,7 @@
 	{assign var=canBeAssigned value=$pubIdPlugin->canBeAssigned($pubObject)}
 	{include file="$pubIdMetadataFile" pubObject=$pubObject canBeAssigned=$canBeAssigned}
 {/foreach}
-
+{call_hook name="Templates::Controllers::Tab::PubIds::Form::PublicIdentifiersForm"}
 {fbvFormButtons id="publicIdentifiersFormSubmit" submitText="common.save"}
 
 </form>

From fe311bc6045c0cce29fa708f993a98d46f470164 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 26 Mar 2018 14:37:09 +0200
Subject: [PATCH 044/100] pkp/pkp-lib#3517 submodule update ##bozana/3517##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 5288d423790..e910eaa2a32 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 5288d4237901f144396210709c4b6c87dbc74a91
+Subproject commit e910eaa2a328da48428fd4df45f6d9fb977d4cc7

From 14edec3d049de35c03f2f066aa9d9896b5e5e50b Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Thu, 8 Mar 2018 18:19:50 +0000
Subject: [PATCH 045/100] pkp/pkp-lib#3130 Update with new authorized workflow
 stage format

---
 controllers/modals/editorDecision/EditorDecisionHandler.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/modals/editorDecision/EditorDecisionHandler.inc.php b/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
index d4af41ce8c2..f4c247cee96 100644
--- a/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
+++ b/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
@@ -95,7 +95,7 @@ protected function _saveGeneralPromote($args, $request) {
 		import('lib.pkp.classes.workflow.WorkflowStageDAO');
 		$redirectWorkflowStage = WorkflowStageDAO::getIdFromPath($redirectOp);
 		$userAccessibleWorkflowStages = $this->getAuthorizedContextObject(ASSOC_TYPE_ACCESSIBLE_WORKFLOW_STAGES);
-		if (!array_key_exists($redirectWorkflowStage, $userAccessibleWorkflowStages)) {
+		if (!in_array($redirectWorkflowStage, $userAccessibleWorkflowStages)) {
 			$redirectOp = null;
 		}
 

From bd97d7dd96035f9eb4616054065b362e11596ef9 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Thu, 15 Mar 2018 15:28:29 +0000
Subject: [PATCH 046/100] pkp/pkp-lib#3130 Make reviewer grid only accessible
 from editorial workflow

---
 .../grid/users/reviewer/ReviewerGridHandler.inc.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php b/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
index a255d8d768f..d793951ed49 100644
--- a/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
+++ b/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
@@ -57,16 +57,16 @@ function authorize($request, &$args, $roleAssignments) {
 
 		// Get the stage access policy
 		import('lib.pkp.classes.security.authorization.WorkflowStageAccessPolicy');
-		$ompWorkflowStageAccessPolicy = new WorkflowStageAccessPolicy($request, $args, $roleAssignments, 'submissionId', $stageId);
+		$workflowStageAccessPolicy = new WorkflowStageAccessPolicy($request, $args, $roleAssignments, 'submissionId', $stageId, WORKFLOW_TYPE_EDITORIAL);
 
 		// Add policy to ensure there is a review round id.
 		import('lib.pkp.classes.security.authorization.internal.ReviewRoundRequiredPolicy');
-		$ompWorkflowStageAccessPolicy->addPolicy(new ReviewRoundRequiredPolicy($request, $args, 'reviewRoundId', $this->_getReviewRoundOps()));
+		$workflowStageAccessPolicy->addPolicy(new ReviewRoundRequiredPolicy($request, $args, 'reviewRoundId', $this->_getReviewRoundOps()));
 
 		// Add policy to ensure there is a review assignment for certain operations.
 		import('lib.pkp.classes.security.authorization.internal.ReviewAssignmentRequiredPolicy');
-		$ompWorkflowStageAccessPolicy->addPolicy(new ReviewAssignmentRequiredPolicy($request, $args, 'reviewAssignmentId', $this->_getReviewAssignmentOps()));
-		$this->addPolicy($ompWorkflowStageAccessPolicy);
+		$workflowStageAccessPolicy->addPolicy(new ReviewAssignmentRequiredPolicy($request, $args, 'reviewAssignmentId', $this->_getReviewAssignmentOps()));
+		$this->addPolicy($workflowStageAccessPolicy);
 
 		return parent::authorize($request, $args, $roleAssignments);
 	}

From 020257782e5fe4c99a8199253114a41dae5d84b5 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Tue, 20 Mar 2018 09:16:02 +0000
Subject: [PATCH 047/100] pkp/pkp-lib#3130 Document new
 currentUserAssignedRoles prop in submission API

---
 docs/dev/swagger.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/dev/swagger.yaml b/docs/dev/swagger.yaml
index e90fec093c0..ea76a6b9a58 100644
--- a/docs/dev/swagger.yaml
+++ b/docs/dev/swagger.yaml
@@ -110,6 +110,10 @@ definitions:
               type: string
             isActiveStage:
               type: boolean
+            currentUserAssignedRoles:
+              type: array
+              items:
+                type: integer
             # @TODO Consider queries/files information to return
             # queries:
             #   type: array

From b263f6fd53bb74a2530d8dd93d33ec23ebb6481e Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Thu, 22 Mar 2018 10:03:43 +0000
Subject: [PATCH 048/100] pkp/pkp-lib#3130 Consolidate shared authorize method
 in pkp-lib

---
 .../reviewer/ReviewerGridHandler.inc.php      | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php b/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
index d793951ed49..e04aca31e8f 100644
--- a/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
+++ b/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
@@ -42,35 +42,6 @@ function reviewRead($args, $request) {
 		}
 		return parent::reviewRead($args, $request);
 	}
-
-	//
-	// Overridden methods from PKPHandler
-	//
-	/**
-	 * @copydoc PKPHandler::authorize()
-	 */
-	function authorize($request, &$args, $roleAssignments) {
-		$stageId = $request->getUserVar('stageId'); // This is being validated in WorkflowStageAccessPolicy
-
-		// Not all actions need a stageId. Some work off the reviewAssignment which has the type and round.
-		$this->_stageId = (int)$stageId;
-
-		// Get the stage access policy
-		import('lib.pkp.classes.security.authorization.WorkflowStageAccessPolicy');
-		$workflowStageAccessPolicy = new WorkflowStageAccessPolicy($request, $args, $roleAssignments, 'submissionId', $stageId, WORKFLOW_TYPE_EDITORIAL);
-
-		// Add policy to ensure there is a review round id.
-		import('lib.pkp.classes.security.authorization.internal.ReviewRoundRequiredPolicy');
-		$workflowStageAccessPolicy->addPolicy(new ReviewRoundRequiredPolicy($request, $args, 'reviewRoundId', $this->_getReviewRoundOps()));
-
-		// Add policy to ensure there is a review assignment for certain operations.
-		import('lib.pkp.classes.security.authorization.internal.ReviewAssignmentRequiredPolicy');
-		$workflowStageAccessPolicy->addPolicy(new ReviewAssignmentRequiredPolicy($request, $args, 'reviewAssignmentId', $this->_getReviewAssignmentOps()));
-		$this->addPolicy($workflowStageAccessPolicy);
-
-		return parent::authorize($request, $args, $roleAssignments);
-	}
-
 }
 
 ?>

From 66bebad7b0bb55798b9e182c4bd2f5fa69329ea7 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Thu, 22 Mar 2018 15:46:05 +0000
Subject: [PATCH 049/100] Revert "pkp/pkp-lib#3130 Update with new authorized
 workflow stage format"

This reverts commit c6dcb7e6ea1eb179485b83a253a3f65fd2c42d9f.
---
 controllers/modals/editorDecision/EditorDecisionHandler.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/modals/editorDecision/EditorDecisionHandler.inc.php b/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
index f4c247cee96..d4af41ce8c2 100644
--- a/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
+++ b/controllers/modals/editorDecision/EditorDecisionHandler.inc.php
@@ -95,7 +95,7 @@ protected function _saveGeneralPromote($args, $request) {
 		import('lib.pkp.classes.workflow.WorkflowStageDAO');
 		$redirectWorkflowStage = WorkflowStageDAO::getIdFromPath($redirectOp);
 		$userAccessibleWorkflowStages = $this->getAuthorizedContextObject(ASSOC_TYPE_ACCESSIBLE_WORKFLOW_STAGES);
-		if (!in_array($redirectWorkflowStage, $userAccessibleWorkflowStages)) {
+		if (!array_key_exists($redirectWorkflowStage, $userAccessibleWorkflowStages)) {
 			$redirectOp = null;
 		}
 

From 5ecbb0bef6832a6d02a47369e78978093694092e Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Tue, 27 Mar 2018 13:44:53 +0100
Subject: [PATCH 050/100] Submodule update ##NateWr/i3130_access_2##

---
 lib/pkp        | 2 +-
 lib/ui-library | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index e910eaa2a32..d57203f9218 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit e910eaa2a328da48428fd4df45f6d9fb977d4cc7
+Subproject commit d57203f9218d117b138e3481c4904388fe04b990
diff --git a/lib/ui-library b/lib/ui-library
index a11262e2ce9..c0aed504472 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit a11262e2ce904da3636d18f153fa903d9566a7af
+Subproject commit c0aed50447201bcde61dbb91dd7f39d4e206ce17

From 43df3cc99b52781e71f4284c7a7ca907893f35dd Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 27 Mar 2018 15:33:15 +0200
Subject: [PATCH 051/100] Adding sv_SE locale files for counter report plugin

---
 plugins/reports/counter/locale/sv_SE/ar1.xml | 16 ++++++++++++++++
 plugins/reports/counter/locale/sv_SE/jr1.xml | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 plugins/reports/counter/locale/sv_SE/ar1.xml
 create mode 100644 plugins/reports/counter/locale/sv_SE/jr1.xml

diff --git a/plugins/reports/counter/locale/sv_SE/ar1.xml b/plugins/reports/counter/locale/sv_SE/ar1.xml
new file mode 100644
index 00000000000..0d6c8a622bd
--- /dev/null
+++ b/plugins/reports/counter/locale/sv_SE/ar1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * plugins/reports/counter/locale/sv_SE/ar1.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Swedish_(sv_SE)
+  * Localization strings.
+  -->
+ 
+<locale name="sv_SE" full_name="Svenska">
+	<message key="plugins.reports.counter.ar1.title">Artikelrapport 1</message>
+</locale>
diff --git a/plugins/reports/counter/locale/sv_SE/jr1.xml b/plugins/reports/counter/locale/sv_SE/jr1.xml
new file mode 100644
index 00000000000..316b83f7779
--- /dev/null
+++ b/plugins/reports/counter/locale/sv_SE/jr1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * plugins/reports/counter/locale/sv_SE/jr1.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  * Localization information: https://pkp.sfu.ca/wiki/index.php?title=OJS:_Swedish_(sv_SE)
+  * Localization strings.
+  -->
+ 
+<locale name="sv_SE" full_name="Svenska">
+	<message key="plugins.reports.counter.jr1.title">Tidskriftsrapport 1</message>
+</locale>

From 8a57605ae179b87104df9798583c99a72230c6bb Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 27 Mar 2018 15:43:28 +0200
Subject: [PATCH 052/100] Fixing erratic plural in sv_SE locale.

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 591be66a6c8..9284e17ca79 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -99,7 +99,7 @@
 	<message key="manager.sections.indexed">Indexerad</message>
 	<message key="manager.sections.noneCreated">Inga sektioner har skapats.</message>
 	<message key="manager.sections.open">Bidrag mottas</message>
-	<message key="manager.sections.policy">Sektionspolicyer</message>
+	<message key="manager.sections.policy">Sektionspolicy</message>
 	<message key="manager.sections.readingTools">Läsverktyg</message>
 	<message key="manager.sections.reviewed">Sakkunniggranskad</message>
 	<message key="manager.sections.submissionIndexing">Kommer inte omfattas av tidskriftens indexering</message>

From b98ddf52d5a3348fa784d8cb3130133aa79348f4 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 27 Mar 2018 15:55:47 +0200
Subject: [PATCH 053/100] Fixing sv_SE locale formulation about disabling user
 registration.

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 9284e17ca79..ade8537fc58 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -148,7 +148,7 @@
 	<message key="manager.setup.customTagsDescription">Anpassade HTML-taggar som kan läggas in på varje sidas huvud (t.ex META-taggar).</message>
 	<message key="manager.setup.details">Detaljer</message>
 	<message key="manager.setup.details.description">Namn på tidskriften, ISSN, kontaktuppgifter, sponsorer, sökmotorer.</message>
-	<message key="manager.setup.disableUserRegistration">Tidskriftsansvariga kan registrera alla användarkonton. Redaktörer och sektionsredaktörer kan endast registrera konton för granskare.</message>
+	<message key="manager.setup.disableUserRegistration">Tidskriftsanvsarig registrerar alla användarkonton. Redaktörer och sektionsredaktörer kan endast registrera konton för granskare.</message>
 	<message key="manager.setup.discipline">Akademisk disciplin och underdiscipliner.</message>
 	<message key="manager.setup.disciplineDescription">Användbar för att bekriva en tvärvetenskaplig tidskrift och/eller om författare kan skicka in artiklar inom tvärvetenskapliga ämnen.</message>
 	<message key="manager.setup.disciplineExamples">(t.ex., Historia; Pedagogik; Sociologi; Psykologi; Kulturstudier; Juridik)</message>

From b4544ba2da3c8fc7704deb3bd63a9dc00eba6f97 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 27 Mar 2018 15:58:14 +0200
Subject: [PATCH 054/100] Fixing typo in sv_SE locale

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index ade8537fc58..331b5c3d320 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -148,7 +148,7 @@
 	<message key="manager.setup.customTagsDescription">Anpassade HTML-taggar som kan läggas in på varje sidas huvud (t.ex META-taggar).</message>
 	<message key="manager.setup.details">Detaljer</message>
 	<message key="manager.setup.details.description">Namn på tidskriften, ISSN, kontaktuppgifter, sponsorer, sökmotorer.</message>
-	<message key="manager.setup.disableUserRegistration">Tidskriftsanvsarig registrerar alla användarkonton. Redaktörer och sektionsredaktörer kan endast registrera konton för granskare.</message>
+	<message key="manager.setup.disableUserRegistration">Tidskriftsansvarig registrerar alla användarkonton. Redaktörer och sektionsredaktörer kan endast registrera konton för granskare.</message>
 	<message key="manager.setup.discipline">Akademisk disciplin och underdiscipliner.</message>
 	<message key="manager.setup.disciplineDescription">Användbar för att bekriva en tvärvetenskaplig tidskrift och/eller om författare kan skicka in artiklar inom tvärvetenskapliga ämnen.</message>
 	<message key="manager.setup.disciplineExamples">(t.ex., Historia; Pedagogik; Sociologi; Psykologi; Kulturstudier; Juridik)</message>

From 9d84fb6e2ef96b54a5efa4c00c9cb9f62991a067 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Tue, 27 Mar 2018 15:59:20 +0200
Subject: [PATCH 055/100] Typo in sv_SE locale.

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 331b5c3d320..34f3559ec25 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -164,7 +164,7 @@
 	<message key="manager.setup.enableAnnouncements">Möjliggör för tidskriftsansvariga att lägga till meddelanden.</message>
 	<message key="manager.setup.enableAnnouncementsHomepage1">Visning</message>
 	<message key="manager.setup.enableAnnouncementsHomepage2">av tidskriftens senaste meddelanden.</message>
-	<message key="manager.setup.enableUserRegistration">Besökare kan skapa ett användarkonto för tidskriften</message>
+	<message key="manager.setup.enableUserRegistration">Besökare kan skapa ett användarkonto för tidskriften.</message>
 	<message key="manager.setup.focusAndScope">Ämne och fokus</message>
 	<message key="manager.setup.focusAndScope.description">Beskriv för författare, läsare och bibliotekarier vilken typ av artiklar som tidskriften publicerar.</message>
 	<message key="manager.setup.forAuthorsToIndexTheirWork">Författarens indexering av det egna arbetet</message>

From b088ccfd7b795fb90cdd99725708ae4a8dc6c11f Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Tue, 27 Mar 2018 09:49:00 -0700
Subject: [PATCH 056/100] Compiled Javascript

---
 js/pkp.min.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/js/pkp.min.js b/js/pkp.min.js
index f01563297ec..5e98ecee497 100644
--- a/js/pkp.min.js
+++ b/js/pkp.min.js
@@ -326,10 +326,10 @@ a.pkp.controllers.modal.AjaxModalHandler.prototype.mergeOptions=function(a){retu
 d.isDefaultPrevented()||this.parent("modalClose",b,c));return!1};a.pkp.controllers.modal.WizardModalHandler.prototype.wizardClose=function(a,c){this.modalClose(a,c,!0)}})(jQuery);(function(a){a.pkp.controllers.modals=a.pkp.controllers.modals||{editorDecision:{form:{}}};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler=function(b,c){this.parent(b,c);null!==c.peerReviewUrl&&(this.peerReviewUrl_=c.peerReviewUrl,a("#importPeerReviews",b).click(this.callbackWrapper(this.importPeerReviews)));null!==c.revisionsEmail&&(this.revisionsEmail_=c.revisionsEmail);null!==c.resubmitEmail&&(this.resubmitEmail_=c.resubmitEmail);a("#skipEmail-send, #skipEmail-skip, #skipDiscussion-send, #skipDiscussion-skip",
 b).change(this.callbackWrapper(this.toggleEmailDisplay));a('input[name="decision"]',b).change(this.callbackWrapper(this.toggleDecisionEmail));this.setStep("email");var d=this;a(".promoteForm-step-btn",b).click(function(b){b.preventDefault();b.stopPropagation();b=a(b.target).data("step");d.setStep(b)})};a.pkp.classes.Helper.inherits(a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.peerReviewUrl_=
 null;a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.revisionsEmail_=null;a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.resubmitEmail_=null;a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.importPeerReviews=function(){a.getJSON(this.peerReviewUrl_,this.callbackWrapper(this.insertPeerReviews));return!1};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.insertPeerReviews=function(b,c){var d=
-this.handleJson(c),e=this.getHtmlElement(),e=a('textarea[id^="personalMessage"]',e),f=tinyMCE.get(e.attr("id")),h=f.getContent();!1!==d&&(h=e.val(),f.setContent(h+d.content+"<br>"));this.trigger("notifyUser",[this.getHtmlElement()])};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.toggleEmailDisplay=function(){var b=a("#sendReviews-emailContent"),c=this.getHtmlElement(),d=!1,e=!1;a("#skipEmail-send, #skipEmail-skip",c).each(function(){"skipEmail-send"===a(this).attr("id")&&
-a(this).prop("checked")?d=!0:"skipEmail-skip"===a(this).attr("id")&&a(this).prop("checked")&&(d=!1)});c=a("#skipDiscussion-send, #skipDiscussion-skip",c);c.length&&c.each(function(){"skipDiscussion-send"===a(this).attr("id")&&a(this).prop("checked")?e=!0:"skipDiscussion-skip"===a(this).attr("id")&&a(this).prop("checked")&&(e=!1)});!d&&!e?b.fadeOut():b.fadeIn()};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.toggleDecisionEmail=function(){var b="",c=a("#skipEmail-send").prop("checked"),
-d=a("#sendReviews-emailContent"),e=a('textarea[id^="personalMessage"]').attr("id"),f=this;a('input[name="decision"]').each(function(){"decisionRevisions"===a(this).attr("id")&&a(this).prop("checked")?b=f.revisionsEmail_:"decisionResubmit"===a(this).attr("id")&&a(this).prop("checked")&&(b=f.resubmitEmail_)});tinyMCE.get(e).setContent(b);c&&d.hide().fadeIn()};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.setStep=function(b){var c=a('#promoteForm-step1, .promoteForm-step-btn[data-step="files"]'),
-d=a('#promoteForm-step2, #promoteForm-complete-btn, .promoteForm-step-btn[data-step="email"]');"files"===b?(d.show(),c.hide()):(c.show(),d.hide())}})(jQuery);(function(a){jQuery.pkp.controllers.linkAction=jQuery.pkp.controllers.linkAction||{};a.pkp.controllers.linkAction.LinkActionHandler=function(b,c){this.parent(b,c);this.staticId_=c.staticId?c.staticId:b.attr("id");if(!c.actionRequest||!c.actionRequestOptions)throw Error('The "actionRequest" and "actionRequestOptions"settings are required in a LinkActionHandler');c.actionRequestOptions.finishCallback=this.callbackWrapper(this.enableLink);this.linkActionRequest_=a.pkp.classes.Helper.objectFactory(c.actionRequest,
+this.handleJson(c),e=this.getHtmlElement(),e=a('textarea[id^="personalMessage"]',e),e=tinyMCE.get(e.attr("id")),f=e.getContent();!1!==d&&e.setContent(f+d.content+"<br>");this.trigger("notifyUser",[this.getHtmlElement()])};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.toggleEmailDisplay=function(){var b=a("#sendReviews-emailContent"),c=this.getHtmlElement(),d=!1,e=!1,f=a("#libraryFileAttachments");a("#skipEmail-send, #skipEmail-skip",c).each(function(){"skipEmail-send"===
+a(this).attr("id")&&a(this).prop("checked")?d=!0:"skipEmail-skip"===a(this).attr("id")&&a(this).prop("checked")&&(d=!1)});c=a("#skipDiscussion-send, #skipDiscussion-skip",c);c.length&&c.each(function(){"skipDiscussion-send"===a(this).attr("id")&&a(this).prop("checked")?e=!0:"skipDiscussion-skip"===a(this).attr("id")&&a(this).prop("checked")&&(e=!1)});!d&&!e?(b.fadeOut(),f.fadeOut()):(b.fadeIn(),f.fadeIn())};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.toggleDecisionEmail=
+function(){var b="",c=a("#skipEmail-send").prop("checked"),d=a("#sendReviews-emailContent"),e=a('textarea[id^="personalMessage"]').attr("id"),f=this;a('input[name="decision"]').each(function(){"decisionRevisions"===a(this).attr("id")&&a(this).prop("checked")?b=f.revisionsEmail_:"decisionResubmit"===a(this).attr("id")&&a(this).prop("checked")&&(b=f.resubmitEmail_)});tinyMCE.get(e).setContent(b);c&&d.hide().fadeIn()};a.pkp.controllers.modals.editorDecision.form.EditorDecisionFormHandler.prototype.setStep=
+function(b){var c=a('#promoteForm-step1, .promoteForm-step-btn[data-step="files"]'),d=a('#promoteForm-step2, #promoteForm-complete-btn, .promoteForm-step-btn[data-step="email"]');"files"===b?(d.show(),c.hide()):(c.show(),d.hide())}})(jQuery);(function(a){jQuery.pkp.controllers.linkAction=jQuery.pkp.controllers.linkAction||{};a.pkp.controllers.linkAction.LinkActionHandler=function(b,c){this.parent(b,c);this.staticId_=c.staticId?c.staticId:b.attr("id");if(!c.actionRequest||!c.actionRequestOptions)throw Error('The "actionRequest" and "actionRequestOptions"settings are required in a LinkActionHandler');c.actionRequestOptions.finishCallback=this.callbackWrapper(this.enableLink);this.linkActionRequest_=a.pkp.classes.Helper.objectFactory(c.actionRequest,
 [b,c.actionRequestOptions]);this.bindActionRequest();this.publishEvent("dataChanged");this.bind("dataChanged",this.dataChangedHandler_);this.bind("pkpModalClose",this.removeDisabledAttribute_);c.selfActivate&&this.trigger("click")};a.pkp.classes.Helper.inherits(a.pkp.controllers.linkAction.LinkActionHandler,a.pkp.classes.Handler);a.pkp.controllers.linkAction.LinkActionHandler.prototype.linkActionRequest_=null;a.pkp.controllers.linkAction.LinkActionHandler.prototype.staticId_=null;a.pkp.controllers.linkAction.LinkActionHandler.prototype.getStaticId=
 function(){return this.staticId_};a.pkp.controllers.linkAction.LinkActionHandler.prototype.getUrl=function(){return this.linkActionRequest_.getUrl()};a.pkp.controllers.linkAction.LinkActionHandler.prototype.activateAction=function(a,c){this.linkActionRequest_.shouldDebounce()&&this.disableLink();return this.linkActionRequest_.activate.call(this.linkActionRequest_,a,c)};a.pkp.controllers.linkAction.LinkActionHandler.prototype.bindActionRequest=function(){this.bind("click",this.activateAction)};a.pkp.controllers.linkAction.LinkActionHandler.prototype.enableLink=
 function(){var b,c;b=a(this.getHtmlElement());this.getHtmlElement().is(":submit")||this.removeDisabledAttribute_();c=this.getUrl();this.getHtmlElement().is("a")&&c&&b.attr("href",c);this.unbind("click",this.noAction_);this.bindActionRequest()};a.pkp.controllers.linkAction.LinkActionHandler.prototype.disableLink=function(){var b=a(this.getHtmlElement());b.attr("disabled","disabled");this.getHtmlElement().is("a")&&b.attr("href","#");this.unbind("click",this.activateAction);this.bind("click",this.noAction_)};
@@ -421,12 +421,15 @@ function(){this.selectedReviewer&&(a("#searchGridAndButton").hide(),a("#regularR
 function(){this.getHtmlElement().find('input[name="selectedFiles[]"]:checked').length?this.hideWarning():this.showWarning()};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.hideWarning=function(){this.getHtmlElement().find("#noFilesWarning").hide(250)};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.showWarning=function(){this.getHtmlElement().find("#noFilesWarning").show(250)};a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler.prototype.handleFileListLoad_=
 function(){this.getHtmlElement().change()}})(jQuery);(function(a){a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler=function(a,c){this.parent(a,c);c.templateUrl&&(this.templateUrl_=c.templateUrl);a.find("#template").change(this.callbackWrapper(this.selectTemplateHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler,a.pkp.controllers.grid.users.reviewer.form.EditReviewFormHandler);a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.templateUrl_=null;a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.showWarning=
 function(){this.parent("showWarning");this.getHtmlElement().find("#reviewerFormFooter").trigger("expandFileList")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.selectTemplateHandler_=function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.reviewer.form.AddReviewerFormHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c),
-d=d.find('textarea[name="personalMessage"]'),d=tinyMCE.EditorManager.get(d.attr("id"));!1!==e&&""!==e.content&&d.setContent(e.content);return e.status}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant=a.pkp.controllers.grid.users.stageParticipant||{};a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler=function(b,c){this.parent(b,c);this.bind("dataChanged",function(){this.refreshGridHandler();a("#submissionEditorDecisionsDiv,#copyeditingEditorDecisionsDiv,[id^=reviewDecisionsDiv").each(function(){a.pkp.classes.Handler.getHandler(a(this)).reload()})})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler,
-a.pkp.controllers.grid.CategoryGridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form=a.pkp.controllers.grid.users.stageParticipant.form||{};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler=function(b,c){this.parent(b,c);c.templateUrl&&(this.templateUrl_=c.templateUrl);c.possibleRecommendOnlyUserGroupIds&&(this.possibleRecommendOnlyUserGroupIds_=c.possibleRecommendOnlyUserGroupIds);c.recommendOnlyUserGroupIds&&(this.recommendOnlyUserGroupIds_=c.recommendOnlyUserGroupIds);a("input[name='userGroupId'], input[name='userIdSelected']",
-b).change(this.callbackWrapper(this.updateRecommendOnly));b.find("#template").change(this.callbackWrapper(this.selectTemplateHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.templateUrl_=null;a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.selectTemplateHandler_=
-function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c),f=c.content,d=d.find('textarea[name="message"]'),h=tinyMCE.EditorManager.get(d.attr("id"));d.attr("data-variables",JSON.stringify(f.variables));h.setContent(f.body);return e.status};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateRecommendOnly=
-function(b){var c=this.getHtmlElement(),d=c.find("input[name='userGroupId']"),e=c.find("input[id^='recommendOnly']"),c=c.find(".recommendOnlyWrapper"),d=d.val();if("userGroupId"==a(b).prop("name"))e.attr("disabled","disabled"),e.removeAttr("checked"),c.hide();else if("userIdSelected"==a(b).prop("name")&&!c.is(":visible"))for(b=0;b<this.possibleRecommendOnlyUserGroupIds_.length;b++)if(this.possibleRecommendOnlyUserGroupIds_[b]==d){e.removeAttr("disabled");c.show();for(b=0;b<this.recommendOnlyUserGroupIds_.length;b++)if(this.recommendOnlyUserGroupIds_[b]==
-d){e.prop("checked",!0);break}break}};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.handleResponse=function(b,c){a.pkp.classes.Handler.getHandler(a("#queriesGrid .pkp_controllers_grid")).trigger("dataChanged");return this.parent("handleResponse",b,c)}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler=function(b,c){this.parent(b,c);a("select[name^='filterUserGroupId']",b).change(this.callbackWrapper(this.addUserGroupId));a("input[name='userId']").click(function(){var b=a("input[name='userId']:checked").val();a("input[name='userIdSelected']").val(b).trigger("change")});this.addUserGroupId()};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler,a.pkp.controllers.form.ClientFormHandler);
+d=d.find('textarea[name="personalMessage"]'),d=tinyMCE.EditorManager.get(d.attr("id"));!1!==e&&""!==e.content&&d.setContent(e.content);return e.status}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant=a.pkp.controllers.grid.users.stageParticipant||{};a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler=function(b,c){this.parent(b,c);this.bind("dataChanged",function(){this.refreshGridHandler();a("#submissionEditorDecisionsDiv,#copyeditingEditorDecisionsDiv,[id^=reviewDecisionsDiv]").each(function(){a.pkp.classes.Handler.getHandler(a(this)).reload()})})};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.StageParticipantGridHandler,
+a.pkp.controllers.grid.CategoryGridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form=a.pkp.controllers.grid.users.stageParticipant.form||{};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler=function(b,c){this.parent(b,c);c.templateUrl&&(this.templateUrl_=c.templateUrl);c.possibleRecommendOnlyUserGroupIds&&(this.possibleRecommendOnlyUserGroupIds_=c.possibleRecommendOnlyUserGroupIds);c.recommendOnlyUserGroupIds&&(this.recommendOnlyUserGroupIds_=c.recommendOnlyUserGroupIds);c.blindReviewerIds&&
+(this.blindReviewerIds_=c.blindReviewerIds);c.blindReviewerWarning&&(this.blindReviewerWarning_=c.blindReviewerWarning);c.blindReviewerWarningOk&&(this.blindReviewerWarningOk_=c.blindReviewerWarningOk);a("input[name='userGroupId'], input[name='userIdSelected']",b).change(this.callbackWrapper(this.updateRecommendOnly));a("input[name='userIdSelected']",b).change(this.callbackWrapper(this.maybeTriggerReviewerWarning));b.find("#template").change(this.callbackWrapper(this.selectTemplateHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler,
+a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.templateUrl_=null;a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.blindReviewerIds_=null;a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.blindReviewerWarning_=null;a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.blindReviewerWarningOk_=null;
+a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.selectTemplateHandler_=function(){var b=this.getHtmlElement();a.post(this.templateUrl_,b.find("#template").serialize(),this.callbackWrapper(this.updateTemplate),"json")};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateTemplate=function(a,c){var d=this.getHtmlElement(),e=this.handleJson(c),f=c.content,d=d.find('textarea[name="message"]'),h=tinyMCE.EditorManager.get(d.attr("id"));
+f.variables&&d.attr("data-variables",JSON.stringify(f.variables));h.setContent(f.body);return e.status};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.updateRecommendOnly=function(b){var c=this.getHtmlElement(),d=c.find("input[name='userGroupId']"),e=c.find("input[id^='recommendOnly']"),c=c.find(".recommendOnlyWrapper"),d=d.val();if("userGroupId"==a(b).prop("name"))e.attr("disabled","disabled"),e.removeAttr("checked"),c.hide();else if("userIdSelected"==
+a(b).prop("name")&&!c.is(":visible"))for(b=0;b<this.possibleRecommendOnlyUserGroupIds_.length;b++)if(this.possibleRecommendOnlyUserGroupIds_[b]==d){e.removeAttr("disabled");c.show();for(b=0;b<this.recommendOnlyUserGroupIds_.length;b++)if(this.recommendOnlyUserGroupIds_[b]==d){e.prop("checked",!0);break}break}};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.maybeTriggerReviewerWarning=function(b){if((b=a(b).val())&&!(0>this.blindReviewerIds_.indexOf(b)))b=
+{title:"",okButton:this.blindReviewerWarningOk_,cancelButton:!1,dialogText:this.blindReviewerWarning_},a('<div id="'+a.pkp.classes.Helper.uuid()+'" class="pkp_modal pkpModalWrapper" tabindex="-1"></div>').pkpHandler("$.pkp.controllers.modal.ConfirmationModalHandler",b)};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.handleResponse=function(b,c){a.pkp.classes.Handler.getHandler(a("#queriesGrid .pkp_controllers_grid")).trigger("dataChanged");return this.parent("handleResponse",
+b,c)}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler=function(b,c){this.parent(b,c);a("select[name^='filterUserGroupId']",b).change(this.callbackWrapper(this.addUserGroupId));a("input[name='userId']").click(function(){var b=a("input[name='userId']:checked").val();a("input[name='userIdSelected']").val(b).trigger("change")});this.addUserGroupId()};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler,a.pkp.controllers.form.ClientFormHandler);
 a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler.prototype.addUserGroupId=function(){var b=this.getHtmlElement().find("select[name^='filterUserGroupId']").val();a("input[name='userGroupId']").val(b).trigger("change")}})(jQuery);(function(a){a.pkp.pages.reviewer=a.pkp.pages.reviewer||{};a.pkp.pages.reviewer.ReviewerTabHandler=function(a,c){this.parent(a,c);this.reviewStep_=c.reviewStep;this.bind("setStep",this.setStepHandler);this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(this.reviewStep_))};a.pkp.classes.Helper.inherits(a.pkp.pages.reviewer.ReviewerTabHandler,a.pkp.controllers.TabHandler);a.pkp.pages.reviewer.ReviewerTabHandler.prototype.reviewStep_=null;a.pkp.pages.reviewer.ReviewerTabHandler.prototype.setStepHandler=
 function(a,c,d){this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(d));this.getHtmlElement().tabs("option","active",d-1)};a.pkp.pages.reviewer.ReviewerTabHandler.prototype.getDisabledSteps=function(a){switch(a){case 1:return[1,2,3];case 2:return[2,3];case 3:return[3];case 4:return[]}throw Error("Illegal review step number.");}})(jQuery);(function(a){a.pkp.pages.authorDashboard=a.pkp.pages.authorDashboard||{};a.pkp.pages.authorDashboard.SubmissionEmailHandler=function(a,c){this.parent(a,c);a.find('a[id^="submissionEmail"]').click(this.callbackWrapper(this.activateAction))};a.pkp.classes.Helper.inherits(a.pkp.pages.authorDashboard.SubmissionEmailHandler,a.pkp.controllers.linkAction.LinkActionHandler)})(jQuery);(function(a){a.pkp.controllers.grid.articleGalleys=a.pkp.controllers.grid.articleGalleys||{};a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler=function(a,c){this.parent(a,c);a.bind("uploadFile",this.callbackWrapper(this.uploadFileHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler,a.pkp.controllers.grid.GridHandler);a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler.prototype.uploadFileHandler_=function(b,c,d){setTimeout(function(){a('a[id^="component-grid-articlegalleys-articlegalleygrid-row-'+
 d+'-addFile-button-"]').click()},0)}})(jQuery);(function(a){a.pkp.controllers.grid.issues=a.pkp.controllers.grid.issues||{};a.pkp.controllers.grid.issues.BackIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issuePublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.BackIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.issues.FutureIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issueUnpublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.FutureIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.tab.issueEntry=a.pkp.controllers.tab.issueEntry||{};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler=function(a,c){c.selectedGalleyId&&(c.selected=this.getTabPositionByGalleyId_(c.selectedGalleyId,a));this.parent(a,c);this.bind("gridRefreshRequested",this.gridRefreshRequested);c.tabsUrl&&(this.tabsUrl_=c.tabsUrl);c.tabContentUrl&&(this.tabContentUrl_=c.tabContentUrl);this.bind("gridInitialized",this.addGalleysGridRowActionHandlers_);this.publishEvent("gridInitialized")};

From bbf25cfa349ad8dec16bfd0da504bb2fb67e10da Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Tue, 27 Mar 2018 11:06:52 -0700
Subject: [PATCH 057/100] Submodule updates

---
 lib/pkp        | 2 +-
 lib/ui-library | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index d57203f9218..c3f24e502fb 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit d57203f9218d117b138e3481c4904388fe04b990
+Subproject commit c3f24e502fbe3e33028dd61350726b64e096d6a2
diff --git a/lib/ui-library b/lib/ui-library
index c0aed504472..67c5742b618 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit c0aed50447201bcde61dbb91dd7f39d4e206ce17
+Subproject commit 67c5742b6188fb99a228b5e165f53cf3bf2c6753

From 948219159336fecff718e259587a2622a3a1c377 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Tue, 27 Mar 2018 11:08:01 -0700
Subject: [PATCH 058/100] Submodule update

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index c3f24e502fb..40c32d63feb 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit c3f24e502fbe3e33028dd61350726b64e096d6a2
+Subproject commit 40c32d63febc05d9bf9441ad957d3e6787ae9959

From 30d7410ee5f7c371cd9dc74a3cd1b7f0aa354802 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 28 Mar 2018 08:59:01 -0700
Subject: [PATCH 059/100] Submodule updates

---
 lib/pkp                               | 2 +-
 plugins/generic/citationStyleLanguage | 2 +-
 plugins/generic/tinymce               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index 40c32d63feb..727f4b09062 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 40c32d63febc05d9bf9441ad957d3e6787ae9959
+Subproject commit 727f4b090628e7c94b1b087845a54fa6816fa293
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
index 836fac8d768..42f64d28428 160000
--- a/plugins/generic/citationStyleLanguage
+++ b/plugins/generic/citationStyleLanguage
@@ -1 +1 @@
-Subproject commit 836fac8d7687b4a87a4c05c0d383d16379b743b4
+Subproject commit 42f64d284280941e8c50283aa6094e8fd0bb9f58
diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce
index 12cf970aeda..b82cb733b5d 160000
--- a/plugins/generic/tinymce
+++ b/plugins/generic/tinymce
@@ -1 +1 @@
-Subproject commit 12cf970aeda8272cc0830cc5a737ed267f41b4db
+Subproject commit b82cb733b5da414158601720281450ef6a5e6309

From 0d71f00ab0d7da93758069bd1b157d69d6536fc4 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Thu, 29 Mar 2018 09:14:51 +0200
Subject: [PATCH 060/100] Fixing locale string in sv_SE locale

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 34f3559ec25..2115a693cc5 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -19,7 +19,7 @@
 	<message key="manager.language.ui">Användargränssnitt</message>
 	<message key="manager.language.submissions">Bidrag</message>
 	<message key="manager.language.forms">Formulär</message>
-	<message key="manager.language.confirmDefaultSettingsOverwrite">Byter ut alla språk/region-inställningar som finns för den tidskriften</message>
+	<message key="manager.language.confirmDefaultSettingsOverwrite">Det här kommer att ersätta alla inställningar som finns för det här språket/regionen.</message>
 	<message key="manager.languages.languageInstructions"><![CDATA[OJS kan översättas till flera olika språk och fungerar dessutom som ett flerspråkigt system där användaren kan växla mellan språk på de olika sidorna.<br /><br /> Om ett språk som stöds av OJS inte finns listad nedan, be huvudadministratören att installera språket. För instruktioner om hur ytterligare språk läggs till, se OJS-dokumentationen.]]></message>
 	<message key="manager.languages.noneAvailable">Tyvärr, det finns inga ytterligare språk tillgängliga. Kontakta huvudadministratören om du vill lägga till språk i den här tidskriften.</message>
 	<message key="manager.languages.primaryLocaleInstructions">Detta blir defaultspråk för tidskriftens webbplats.</message>

From e0b099f76d070d8abb6dad7df6bdfc48f3e2c9d1 Mon Sep 17 00:00:00 2001
From: Martin Persson <martin.persson@ub.lu.se>
Date: Thu, 29 Mar 2018 09:18:03 +0200
Subject: [PATCH 061/100] Correcting fix in sv_SE locale

---
 locale/sv_SE/manager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/manager.xml b/locale/sv_SE/manager.xml
index 2115a693cc5..d73b6f28174 100644
--- a/locale/sv_SE/manager.xml
+++ b/locale/sv_SE/manager.xml
@@ -19,7 +19,7 @@
 	<message key="manager.language.ui">Användargränssnitt</message>
 	<message key="manager.language.submissions">Bidrag</message>
 	<message key="manager.language.forms">Formulär</message>
-	<message key="manager.language.confirmDefaultSettingsOverwrite">Det här kommer att ersätta alla inställningar som finns för det här språket/regionen.</message>
+	<message key="manager.language.confirmDefaultSettingsOverwrite">Det här kommer att ersätta alla språkspecifika tidskriftsinställningar som finns för det här språket/regionen.</message>
 	<message key="manager.languages.languageInstructions"><![CDATA[OJS kan översättas till flera olika språk och fungerar dessutom som ett flerspråkigt system där användaren kan växla mellan språk på de olika sidorna.<br /><br /> Om ett språk som stöds av OJS inte finns listad nedan, be huvudadministratören att installera språket. För instruktioner om hur ytterligare språk läggs till, se OJS-dokumentationen.]]></message>
 	<message key="manager.languages.noneAvailable">Tyvärr, det finns inga ytterligare språk tillgängliga. Kontakta huvudadministratören om du vill lägga till språk i den här tidskriften.</message>
 	<message key="manager.languages.primaryLocaleInstructions">Detta blir defaultspråk för tidskriftens webbplats.</message>

From 9bdc7f6751c1362150d415708fd02bdc676dd7b4 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 29 Mar 2018 13:02:44 +0200
Subject: [PATCH 062/100] use constant instead of number

---
 plugins/generic/usageStats/UsageStatsLoader.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/usageStats/UsageStatsLoader.inc.php b/plugins/generic/usageStats/UsageStatsLoader.inc.php
index 777a9a3e6cf..be273e91d15 100644
--- a/plugins/generic/usageStats/UsageStatsLoader.inc.php
+++ b/plugins/generic/usageStats/UsageStatsLoader.inc.php
@@ -76,7 +76,7 @@ protected function getAssoc($assocType, $contextPaths, $page, $op, $args) {
 					// is the file article full text
 					$genreDao = DAORegistry::getDAO('GenreDAO');
 					$genre = $genreDao->getById($articleFile->getGenreId());
-					if ($genre->getCategory() != 1 || $genre->getSupplementary() || $genre->getDependent()) {
+					if ($genre->getCategory() != GENRE_CATEGORY_DOCUMENT || $genre->getSupplementary() || $genre->getDependent()) {
 						$assocTypeToReturn = ASSOC_TYPE_SUBMISSION_FILE_COUNTER_OTHER;
 					} else {
 						$assocTypeToReturn = $assocType;

From 7d6d5ec9fc50f191e450655bb8db5ca9b7255001 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 11:53:50 -0700
Subject: [PATCH 063/100] Submodule updates

---
 lib/pkp        | 2 +-
 lib/ui-library | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index 727f4b09062..5db2a679a9b 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 727f4b090628e7c94b1b087845a54fa6816fa293
+Subproject commit 5db2a679a9b159c24eb7901645f2fdc527aff2e9
diff --git a/lib/ui-library b/lib/ui-library
index 67c5742b618..fbf01046682 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 67c5742b6188fb99a228b5e165f53cf3bf2c6753
+Subproject commit fbf0104668200b0e7047170987a8bf480214a9e3

From 38d53dbe037c168648b89442e778515b2f89a874 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 11:58:50 -0700
Subject: [PATCH 064/100] OJS 3.1.1 release details

---
 dbscripts/xml/install.xml | 2 +-
 dbscripts/xml/upgrade.xml | 3 ++-
 dbscripts/xml/version.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index e5c6f4a3e1e..e6b98b27151 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE install SYSTEM "../../lib/pkp/dtd/install.dtd">
 <!--
-  * install.xml
+  * dbscripts/xml/install.xml
   *
   * Copyright (c) 2014-2018 Simon Fraser University
   * Copyright (c) 2003-2018 John Willinsky
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 48a0ac106eb..f84125fd842 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE install SYSTEM "../../lib/pkp/dtd/install.dtd">
 <!--
-  * upgrade.xml
+  * dbscripts/xml/upgrade.xml
   *
   * Copyright (c) 2014-2018 Simon Fraser University
   * Copyright (c) 2003-2018 John Willinsky
@@ -197,6 +197,7 @@
 	<upgrade minversion="3.0.0.0" maxversion="3.1.0.9">
 		<code function="repairSuppFilesFilestage" />
 		<code function="fixAuthorGroup" /><!-- Run again after previous invalid fix (#3289) -->
+		<note file="docs/release-notes/README-3.1.1" />
 	</upgrade>
 
 	<!-- update plugin configuration - should be done as the final upgrade task -->
diff --git a/dbscripts/xml/version.xml b/dbscripts/xml/version.xml
index b4ab0296ba0..9d0b07d8512 100644
--- a/dbscripts/xml/version.xml
+++ b/dbscripts/xml/version.xml
@@ -15,7 +15,7 @@
 	<type>core</type>
 	<release>3.1.1.0</release>
 	<tag>ojs-3_1_1-0</tag>
-	<date>2017-10-23</date>
+	<date>2018-04-04</date>
 	<info>http://pkp.sfu.ca/ojs/</info>
 	<package>http://pkp.sfu.ca/ojs/download/ojs-3.1.1.tar.gz</package>
 </version>

From b2bce88f82696b821d924b7d0028b4db87ad90f2 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 12:24:45 -0700
Subject: [PATCH 065/100] Add release notes for 3.1.1

---
 docs/RELEASE                    | 378 ++++++++++++++------------------
 docs/release-notes/README-3.1.1 | 169 ++++++++++++++
 2 files changed, 328 insertions(+), 219 deletions(-)
 create mode 100644 docs/release-notes/README-3.1.1

diff --git a/docs/RELEASE b/docs/RELEASE
index 594a46d540a..a1117efdf13 100644
--- a/docs/RELEASE
+++ b/docs/RELEASE
@@ -1,229 +1,169 @@
-OJS 3.1.0 Release Notes
-CVS tag: ojs-3_1_0-0
+OJS 3.1.1 Release Notes
+CVS tag: ojs-3_1_1-0
 
-Release date: October 23, 2017
+Release date: April 4, 2018
 ==============================
 
-OJS 3.1 contains new translations into Finnish and Swedish. It also sees the
-re-introduction of a fr_FR translation for France, based on the French
-Canadian translation.
-
 New Features
 ------------
-	#390: Remove artbitrary UI field length limitations
-	#440: Grant implicit Manager access to Adminstrators
-	#469: Move pnotify to composer dependency
-	#723: Strip out citation plugins and replace with CSL
-	#1503: Introduce REST API
+	#520: Improve Submission Library utility
+	#1692: Public identifiers for chapters
 	#1816: Implement subscription support
-	#1911: Enable longer locale names
-	#1963: Port implicit authentication to master
-	#2101: Update PubMed plugin for OJS 3.x
-	#2163: Routing events between handlers in the JS framework
-	#2178: Add nav menu management and static pages features
-	#2306: Permit searching by submission ID
-	#2337 #2435 #2585 #2602 #2603 #2604 #2605 #2606 #2670 #2715 #2725 #2861 #2864: Locale updates
-	#2342: Add "Assign DOIs to all journal articles" button in the DOI plugin settings
-	#2358: Rewrite OAI NLM plugin for OJS 3.x
-	#2433: Provide option to restrict low-level editors to "recommend" only, not make decisions
-	#2465: Give the author access to the copyedited and galley files grids
-	#2503: Add plugin version installation tool
-	#2577: Display supplementary files in block, rather with galley files
-	#2587: Tell admin which journal they are about to remove
-	#2599: Data privacy option in usage stats plugin
-	#2686: add initial JWT support to API
-	#2705: New default footer images
+	#1922: Add support for catalog paging
+	#2714: Support browsing by section, subject and keyword
+	#2872: Allow themes to override templates in plugins
+	#3130: Improve blinding for role sharing between editor/author/reviewer
 
 Bug Fixes
 ---------
-	#772: Respond to nonexistent monographs with a 404
-	#1070: Improve confirmation notices when skipping the email is an option
-	#1144: Review file selection is unclear
-	#1258: "Resubmit for Review" button is unclear
-	#1265: Broken reports pages
-	#1270: Empty editor decisions list for copywriter
-	#1329: Prevent stub queries from being seen by others before completion
-	#1389: Smarty variable not rendered in registration form template
-	#1447: Improve recipient selection process for new discussions
-	#1502: article report considers only UI and primary locale
-	#1528: Improve submission process
-	#1595: Remove app/journal-specific language in pkp-lib
-	#1640: Can't add discussion with no stage participants
-	#1709: Native Import Issues for OJS and OMP
-	#1757: [OJS] duplicate keys in usageStats plugin (also: duplicate plugin)
-	#1784: Unify near-duplicate template templates/management/settings/access.tpl
-	#1786: Ensure ReCaptcha language is correct
-	#1791: Fix COUNTER plugin template references (and test plugin)
-	#1807: Multilingualism
-	#1815: Move metadata (DC/GS) meta tags into HTML head
-	#1828: Issues with input and display of keywords
-	#1853: Reload issues
-	#1859: Add Sidebar Management to site settings for multi-journal installs
-	#1866: Banner notification after scheduling
-	#1896: ORCID support in native XML import/export format for issues
-	#1907: Show volume info only when checkbox selected
-	#1930: Include article prefix on article details page
-	#1932: Investigate upgrade of submission note files
-	#1955: schemaValidate, proxy settings and allow_url_fopen
-	#2003: Filename problems
-	#2023: Remove "designation" from components
-	#2064: Standardize emailed URL handling
-	#2078: Fix scroll-jumping in HTML article galley views
-	#2082: Task notification for section editor after being assigned to a submission
-	#2085: Improve touch controls of frontend about nav dropdown
-	#2108: Tinymce error (downloadable font: OS/2: bad linegap: -32 ) with Firefox
-	#2114: Localised filenames complicate uploading submission files in multilingual journals
-	#2136: Empty sidebar breaks javascript in front end
-	#2142: Suggestions for Native XML Import
-	#2151: Viewable migration
-	#2159: Upgrading to OJS3: Revisions and Reviewer's Attachments panels not visible in Review tab for authors
-	#2160: Variable names visible in Editorial history
-	#2173: Upgrading to OJS3: multiple issues with ongoing reviews
-	#2189: Tinymce in full screen mode problematic in multilingual journals
-	#2192: Consider and migrate remote supp files as remote galley files
-	#2203: Notifications list in front end layout requires back-end JS tools
-	#2235: File revision names
-	#2247: Migrated submissions have a review round even when the submission is in stage 1
-	#2257: Correct UTF=8 typo in CrossRef issue export
-	#2258: Crossref 4.3.6 schema URL changed
-	#2260: DOAJ XML export: position multilingual elements with article locale on the first place
-	#2261: Style the new plugin gallery
-	#2265: Review master branch for dead/crufty code
-	#2266: Custom uploaded CSS files get loaded too early
-	#2267: No current issue when current issue is unpublished
-	#2269: Can't search all categories in plugin gallery
-	#2270: Sort submission lists by ID
-	#2287: Change Password page missing visual padding
-	#2295: Statistics upgrade from 2.4.0, 2.4.1 and 2.4.2 to 3.x
-	#2296: DevelopedByBlockPlugin error in a clean OJS 3.0.2 installation.
-	#2305: Fix required attribute in login form
-	#2309: Autocomplete for reviewer interests is case sensitive
-	#2310: Move block plugins to unified sidebar upon upgrade
-	#2312: Review/fix edit links
-	#2313: Prevent section editor auto-assignments outside section assignments
-	#2315: Current issue redirect should use best ID
-	#2319: PHP catchable error on issue import (OJS 3)
-	#2320: Remove or restore ROLE_ID_SUBSCRIPTION_MANAGER
-	#2321: Fix submission language export
-	#2328: Missing review round ID during file revision
-	#2331: OJS3.0.2. empty submission checklist results to PHP warnings
-	#2336: Clean up TemplateManager::display / TemplateManager::fetch
-	#2338: OJS3 Usage Statistics plugin displayStatistics setting not context specific
-	#2340: Fix readonly flag of alt tag in article cover upload
-	#2343: issue ordering
-	#2364: Drop file check on minification use
-	#2365: Native XML Plugin lacks paging in Export issues listing
-	#2367: Recaptcha verification does not honor proxy settings
-	#2371: Parse errors on grids for systeminfo
-	#2372: Incorrect return link in HTML Galley view
-	#2375: Respect context disableUserReg setting
-	#2389: add announcements introduction
-	#2391: File detection in temporary files does not adjust for common problems
-	#2392: Concatenate "about" content during OJS2 to OJS3 migration
-	#2393: [OJS] Editorial decisions buttons should be disabled on stages that are already finished
-	#2401: Correct outdated translations using `{$submissionEditingUrl}` in email templates
-	#2407: Remove mutex use
-	#2413: Add reviewId to oneclick link in automatic review reminders
-	#2417: Review form breaks for users that are visiting OJS for the first time
-	#2420: No check on PHPMailer::send() status
-	#2423: Add notification upon "Add Reviews to Email" click
-	#2428: CSRF token validity time (one hour) breaks the review form
-	#2434: Add preliminary/summary "Decline" email template
-	#2437: Add reviews to email button selects the wrong option for radio buttons in some cases
-	#2440: consider views column for old default usage statistics migration
-	#2443: Refactor AuthPlugin
-	#2446: Reviewer affiliation info is not recorded when creating reviewers
-	#2449: PHP code documentation cleanup
-	#2453: Adjust wording of Send to Copyediting button on review stage
-	#2460: Discussion item will be created even if canceled
-	#2461: Native Import can't clean up after failure for article section
-	#2462: Native import export creates duplicate issues
-	#2467: Some upgrade queries are improperly scoped
-	#2470: Migrate all section editors in OJS 2.x to 3.x upgrade
-	#2473: Tap controls don't work for dropdown menus in the backend
-	#2476: Author guidelines anchor missing
-	#2481: Reviewer has access to manuscript after declining review request
-	#2483: Default email signature is wrapped in nested anchor tags
-	#2492: registrationComplete page allows for UX issues
-	#2495: Speed up test suite
-	#2497: OJS 3.x TinyMCE not activated show error
-	#2500: Native import mismanages file operations
-	#2501: subject and subjectClass migration
+	#1793: Test/fix PostgreSQL upgrades
+	#1865: Adding review comments wipes out email changes
+	#2102: Consider "Select All" feature for export tools
+	#2195: Reviewers can sometimes see the names of the authors
+	#2291: Missing site title
+	#2441: Make wording of editorial team consistent in backend and frontend
 	#2506: Fix genre assignment for upgrades
-	#2509: Use supported submission locales for galley language
-	#2513: Allow SVG in image uploads
-	#2515: When section titles are long they cover article titles in issue table of contents
-	#2516: Native Import: optional submission dates per schema, but functionally required
-	#2518: SUBMISSION_ACK email includes author signature
-	#2519: do not update copyedit and production notifications in a pre-review discussion
-	#2525: Bug in issueArchive.tpl
-	#2526: Native Import should discriminate between errors and warnings
-	#2534: Use SVG format of ORCID icon
-	#2537: OJS3 upgrade article_galley_settings not migrated to submission_galley_settings
-	#2542: update Password Reset default e-mail template
-	#2543: reload scheduled tasks function for the acron plugin
-	#2552: fix warning in RecommendByAuthorPlugin
-	#2559: Consider introducing autoload behavior
-	#2562: [OJS] Settings wizard refers to Plugins tab that's unavailable
-	#2569: Deleted OAI records not displayed
-	#2572: Additional hooks
-	#2576: Color of tasks panel is confusing
-	#2580: Correct outdated reference to geo IP tool path
-	#2582: Fix HTML galley image migration in OJS2 to OJS3
-	#2592: Clearing template cache should clear .css files too
-	#2611: Prevent COinS plugin from confusing search results
-	#2612: Add filtering options to new submissions list
-	#2613: Add contextual information to icons in new submission list
-	#2616: Change "Add" to "Assign" in participants grid
-	#2621: Editor cannot rename files in review files grid
-	#2631: "Download all files" checks for tar availability, but uses zip compression
-	#2637: Replace low res icon in webfeed for high res screens
-	#2640: Update copyright holder and year
-	#2641: Remove the automatically added line breaks in article abstracts
-	#2642: Placeholder discussions not removed when new discussion creation is cancelled
-	#2646: Journals without available sections for submission should present "not accepting" message
-	#2648: the revision node grouping for supplementary files in native export
-	#2650: Native import dies if presented with a duplicate submission file revision
-	#2655: Alternate mail template for subsequent review request not selected
-	#2658: Filter hook
-	#2660: Permit HTTPS support in ORCIDs
-	#2663: Deleting an issue where no custom issue ordering exists creates a random custom issue ordering
-	#2671: Migrate crossref deposit status setting name
-	#2673: {$reviewerName} variable not replaced
-	#2675: Several minor adjustments to submission lists
-	#2678: Fix (probably) wrong wording in new API locale keys
-	#2682: User registration at the site level when email validation is enabled fails.
-	#2684: Add support for declaring metadata fields required
-	#2691: Report Generator links on the plugins listing page do not work
-	#2699: LazyLoadPlugin get/setEnabled do not consider site plugins
-	#2703: New review round modal re-opens automatically when closed in IE11
-	#2708: Implement approach for delivering constants to the new frontend components
-	#2729: Test environment set up won't work as stated in README
-	#2739: Change precedence of Google Scholar date options
-	#2744: Search bar in ListPanel has wrong styling in iOS
-	#2746: Submission list filtering doesn't work in iOS
-	#2751: Fix grid refreshing
-	#2753: DOAJ export is exporting declined articles
-	#2758: HTML galley CSS file migration
-	#2760: Add new template hooks for plugin settings pages
-	#2761: Generator meta tag untranslated
-	#2770: Preview shows DOIs even when they are not assigned
-	#2771: Integrate UI component library into OJS/OMP
-	#2778: Changing journal visibility setting will restore the default language settings
-	#2782: Fix OAI: kludgey use of `$this`; broken OAI format plugins
-	#2783: Add JATS content to OAI interface (when available)
-	#2789: Possible unnecessary variable read in the first submission form
-	#2790: Articles remain in published state after issue is unpublished
-	#2791: Fix formatting of reviewer comments when imported from review form textbox into author email
-	#2792: Review reminders need From address set
-	#2799: [OJS] Possible unnecessary template
-	#2814: Correct review form error handling bounce issues
-	#2821: Copyeditors do not have access to editorial history
-	#2830: Fix CSRF hard expiry
-	#2838: Can't add note on submission
-	#2849: Current Roles listing and user rights are not transparent
-	#2859: Remove citationOutput plugins
-	#2896: references from the submission settings should be called citations
-	#2907: Check/correct date formatting for Latest column in reviewer assignment
-	#2924: Updates to installation screen
-	#2930: access denied on the announcements setting page
+	#2564: Inconsistent HTML display in article titles
+	#2571: Section word count field is inoperative
+	#2759: Galleys displayed as Array
+	#2794: Upload Revision canceled but still in revision list
+	#2874: Remove citationLookup, citationParser and nlm30 metadata plugin
+	#2894: Improve the reviewer selection list
+	#2899: Error generating the path of Custom Page in Navigation Menu
+	#2910: Non-administrators can see the Administration link on the front-end toolbar
+	#2922: Uploading a new Galley file and selecting "Change file" corrupts the uploaded file
+	#2933: Introduce menu caching
+	#2942: Infinite loop in upgrade from 2.4.8.2 to 3.1, failing to skip missing files
+	#2944: NavigationMenus - NMI_TYPE_CONTACT not returned by getMenuItemTypes
+	#2945: restore defaults genres/components
+	#2947: NavigationMenus - Issue with NMI with no displayable children
+	#2952: NavigationMenus - NavigationMenu edit - unbind NavigationMenu from area
+	#2955: Reference to chapters when editing component in OJS 3.1
+	#2956: Plugins already installed in database but not filesystem cannot be re-installed
+	#2960: Problems with Add Item action in Sidebar control
+	#2962: Fix membership options
+	#2964: APC usability issues
+	#2965: Adding section editors to a section and returning to add more editors later breaks the section form
+	#2967: Missing link from Site Administration to Journal Administration
+	#2972: Untranslated locale keys in Roles select menu
+	#2980: order by user_group_id in UserGroupDAO::getByRoleId
+	#2987: Navigation Menus - not all default NMIs get translated upon install/upgrade
+	#2988: Installation page depends on navigation menu tables, which may not exist
+	#2989: Correct missing table alias for PostgreSQL upgrade
+	#2994: Reveal more handler can fail to reveal more
+	#2996: Paypal plugin has undeclared dependency
+	#2998: Archiving page changes
+	#3002: Enabled plugins disabled after upgrade
+	#3003: Not possible delete Keywords in second language with X
+	#3004: force_login_ssl should force register too
+	#3007: remote galley and supp files are not displayed on the article page
+	#3009: always provide multipleContexts variable
+	#3011: Pass FormValidatorURL error message to js url validation
+	#3015: New article components have NULL entry_key
+	#3016: supplementary files migration
+	#3028: citations parsing by line
+	#3039: editor actions for all managers and sub-editors
+	#3046: getCustomTemplateKeys parameters
+	#3051: OAI record datestamp
+	#3052: consider URL encoding for oai identifiers
+	#3056: Navigation Config vs Static Pages
+	#3062: wrong element attributes in oai_marc
+	#3066: viewPlugin in the plugin gallery for journal managers
+	#3070: Author names can be exposed to some reviewers
+	#3071: Forms counter doesn't change
+	#3072: Prevent range requests
+	#3080: NavigationMenus - Custom Page Error on Site level
+	#3084: Verify incomplete submissions behavior
+	#3087: fix metrics assoc_type for supp files
+	#3097: Sidebar blocks missing from search results
+	#3101: Clean up locale settings upon language deletion
+	#3106: choose e-mail template when selecting a reviewer
+	#3108: Duplicated literal
+	#3114: Select precedent reviewer for a new round failed
+	#3122: Add copyFile method to SubmissionFileManager
+	#3124: Enable OpenAIRE field for QuickSubmitForm
+	#3125: Author name in export plugins
+	#3127: Assistants not allowed to download galley files
+	#3141: a string was missed in locale.xml
+	#3144: NavigationMenus - Warnings removed for custom menuItems
+	#3154: Error checking email format in profile page
+	#3156: Submission Requirements translation are not available
+	#3157: required tagit metadata fields not validated
+	#3161: nl2br causes extra line breaks in copyright notice
+	#3167: New discussion canceled but still in discussion list
+	#3172: enable_beacon and other little things
+	#3177: Replace calls to deprecated "create_function"
+	#3178: Link on context logo/title in frontend incorrect
+	#3184: Subscription type currency resets upon editing
+	#3185: Correct PHP7.2 incompatibilities
+	#3188: DECLINE decision sends unexpected "Unsuitable" in subject
+	#3195: Fire form execute hooks in reviewer steps
+	#3200: PostgreSQL type error in OAI interface
+	#3204: COUNTER bot list is outdated
+	#3206: Subscriptions page should not be accessible if payments are not enabled
+	#3212: CSL styles should receive DOI without URL
+	#3218: Upgrade failed: DB: Can't DROP 'user_group_id'; check that column/key exists
+	#3219: Upgrade gets stuck due to lack of MoveNext() in repairSuppFilesFilestage
+	#3220: fix migrateTimedViewsUsageStatistics
+	#3228: Non-anonymized reviewer files not able to be deleted
+	#3232: Manual payment plugin throws PHP Warning:  Missing argument 2 for Form::setData()
+	#3237: Crossref as-crawled URLs should only include PDF galley URLs (if multiple formats are published)
+	#3246: Update copyrights for 2018
+	#3247: UI: reviewer page submission details - unnecessary information
+	#3252: Getting section editors results in db error
+	#3255: Ensure that upgraded reviews from OJS2 are double-blind
+	#3267: NavigationMenus Site-wide unable to drop NMIs into empty NM edit areas.
+	#3269: CSL Plugin doesn't display abbreviated journal title for AMA style
+	#3273: When logged in, edit link on the announcement page is not working properly
+	#3274: Redirect URI from Login as
+	#3276: Native XML import fails on batch insert
+	#3282: Missing navigation menu item for the search page
+	#3283: Display usage statistics for last 12 months instead of for current year
+	#3287: "User" and "Primary" (navigation menus management tools) are confusing
+	#3288: "Custom Page" should not be default when adding a new navigation menu item
+	#3289: Author `user_group_id` upgrade `UPDATE` is broken
+	#3302: File upload gets stuck with certain language selections in multilingual journals
+	#3311: "Subject" / "subjects" field "required" flag not behaving as expected
+	#3318: Check minimum requirements before allowing to upgrade
+	#3323: fix detachment of dependent entities at file revision upload confirmation
+	#3329: Copyright Info with CC License Badge
+	#3332: consider missing submission file in usage stats loader
+	#3334: fix listing of successfully imported submissions
+	#3336: External feed plugin obliterates custom blocks when enabled
+	#3338: If html part of mail too long, new line with exclamation mark is inserted
+	#3348: article DOI in native import
+	#3357: Disciplin element should be discipline
+	#3359: recommendOnly editor and section editor
+	#3374: Dropdown nav menus in default theme don't work for rtl languages
+	#3379: Article subtitles should appear in the issue TOC
+	#3383: no context in LazyLoadPlugin get/setEnabled when using CLI
+	#3385: Desisting from adding a new discussion leaves behind an empty discussion
+	#3387: Remove gender fields
+	#3390: upgrade email templates
+	#3392: current release contains potentially dangerous old version of PHPMailer
+	#3398: Section Editor assignment creates duplicate Pre-Review Discussion entries
+	#3407: doubt about a translation
+	#3412: RSS buttons left-over from OJS 2.x
+	#3415: getTemplateResourceName for plugins in pkp-lib
+	#3416: sr_SR migration to either sr_RS@latin or sr_RS@cyrillic
+	#3420: Date issues for non-default date_format_short in reviewDueDate and responseDueDate
+	#3421: Editing roles for a user in one journal destroys roles in others
+	#3422: OJS 3.1.0.1 adding a participant with Safari does not close the modal window
+	#3436: "Send to Review" and "Send to Production" for reccomendOnly users
+	#3440: Even if you check "Do not send email" for notification, you receive email.
+	#3443: Duplicate translation keys in en_US
+	#3444: Multilingual custom email template does not apply to email body
+	#3447: Task list shows too long
+	#3448: Submission listings only show title for selected locale
+	#3459: sitemap fix
+	#3474: Restrict SubmissionFileRequestedRevisionRequiredPolicy to revision files only
+	#3481: submission URL in recommendation form emails
+	#3485: Missing sidebar items after upgrade from OJS 2.4.x with PostgreSQL
+	#3488: Improve error presentation in file upload wizard
+	#3491: Use mbstring-capable regexp functions in searching
+	#3495: Modify API URLs in ui-library when restful_urls enabled
+	#3506: Untranslated locale key for scheduledTaskLogs log file
+	#3509: DataCite export plugin sets accepted date = submitted date instead of actual accepted date
+	#3510: display last revisions of reviewer files
+	#3517: require locale component for identifier tab, add a hook
+
diff --git a/docs/release-notes/README-3.1.1 b/docs/release-notes/README-3.1.1
new file mode 100644
index 00000000000..a1117efdf13
--- /dev/null
+++ b/docs/release-notes/README-3.1.1
@@ -0,0 +1,169 @@
+OJS 3.1.1 Release Notes
+CVS tag: ojs-3_1_1-0
+
+Release date: April 4, 2018
+==============================
+
+New Features
+------------
+	#520: Improve Submission Library utility
+	#1692: Public identifiers for chapters
+	#1816: Implement subscription support
+	#1922: Add support for catalog paging
+	#2714: Support browsing by section, subject and keyword
+	#2872: Allow themes to override templates in plugins
+	#3130: Improve blinding for role sharing between editor/author/reviewer
+
+Bug Fixes
+---------
+	#1793: Test/fix PostgreSQL upgrades
+	#1865: Adding review comments wipes out email changes
+	#2102: Consider "Select All" feature for export tools
+	#2195: Reviewers can sometimes see the names of the authors
+	#2291: Missing site title
+	#2441: Make wording of editorial team consistent in backend and frontend
+	#2506: Fix genre assignment for upgrades
+	#2564: Inconsistent HTML display in article titles
+	#2571: Section word count field is inoperative
+	#2759: Galleys displayed as Array
+	#2794: Upload Revision canceled but still in revision list
+	#2874: Remove citationLookup, citationParser and nlm30 metadata plugin
+	#2894: Improve the reviewer selection list
+	#2899: Error generating the path of Custom Page in Navigation Menu
+	#2910: Non-administrators can see the Administration link on the front-end toolbar
+	#2922: Uploading a new Galley file and selecting "Change file" corrupts the uploaded file
+	#2933: Introduce menu caching
+	#2942: Infinite loop in upgrade from 2.4.8.2 to 3.1, failing to skip missing files
+	#2944: NavigationMenus - NMI_TYPE_CONTACT not returned by getMenuItemTypes
+	#2945: restore defaults genres/components
+	#2947: NavigationMenus - Issue with NMI with no displayable children
+	#2952: NavigationMenus - NavigationMenu edit - unbind NavigationMenu from area
+	#2955: Reference to chapters when editing component in OJS 3.1
+	#2956: Plugins already installed in database but not filesystem cannot be re-installed
+	#2960: Problems with Add Item action in Sidebar control
+	#2962: Fix membership options
+	#2964: APC usability issues
+	#2965: Adding section editors to a section and returning to add more editors later breaks the section form
+	#2967: Missing link from Site Administration to Journal Administration
+	#2972: Untranslated locale keys in Roles select menu
+	#2980: order by user_group_id in UserGroupDAO::getByRoleId
+	#2987: Navigation Menus - not all default NMIs get translated upon install/upgrade
+	#2988: Installation page depends on navigation menu tables, which may not exist
+	#2989: Correct missing table alias for PostgreSQL upgrade
+	#2994: Reveal more handler can fail to reveal more
+	#2996: Paypal plugin has undeclared dependency
+	#2998: Archiving page changes
+	#3002: Enabled plugins disabled after upgrade
+	#3003: Not possible delete Keywords in second language with X
+	#3004: force_login_ssl should force register too
+	#3007: remote galley and supp files are not displayed on the article page
+	#3009: always provide multipleContexts variable
+	#3011: Pass FormValidatorURL error message to js url validation
+	#3015: New article components have NULL entry_key
+	#3016: supplementary files migration
+	#3028: citations parsing by line
+	#3039: editor actions for all managers and sub-editors
+	#3046: getCustomTemplateKeys parameters
+	#3051: OAI record datestamp
+	#3052: consider URL encoding for oai identifiers
+	#3056: Navigation Config vs Static Pages
+	#3062: wrong element attributes in oai_marc
+	#3066: viewPlugin in the plugin gallery for journal managers
+	#3070: Author names can be exposed to some reviewers
+	#3071: Forms counter doesn't change
+	#3072: Prevent range requests
+	#3080: NavigationMenus - Custom Page Error on Site level
+	#3084: Verify incomplete submissions behavior
+	#3087: fix metrics assoc_type for supp files
+	#3097: Sidebar blocks missing from search results
+	#3101: Clean up locale settings upon language deletion
+	#3106: choose e-mail template when selecting a reviewer
+	#3108: Duplicated literal
+	#3114: Select precedent reviewer for a new round failed
+	#3122: Add copyFile method to SubmissionFileManager
+	#3124: Enable OpenAIRE field for QuickSubmitForm
+	#3125: Author name in export plugins
+	#3127: Assistants not allowed to download galley files
+	#3141: a string was missed in locale.xml
+	#3144: NavigationMenus - Warnings removed for custom menuItems
+	#3154: Error checking email format in profile page
+	#3156: Submission Requirements translation are not available
+	#3157: required tagit metadata fields not validated
+	#3161: nl2br causes extra line breaks in copyright notice
+	#3167: New discussion canceled but still in discussion list
+	#3172: enable_beacon and other little things
+	#3177: Replace calls to deprecated "create_function"
+	#3178: Link on context logo/title in frontend incorrect
+	#3184: Subscription type currency resets upon editing
+	#3185: Correct PHP7.2 incompatibilities
+	#3188: DECLINE decision sends unexpected "Unsuitable" in subject
+	#3195: Fire form execute hooks in reviewer steps
+	#3200: PostgreSQL type error in OAI interface
+	#3204: COUNTER bot list is outdated
+	#3206: Subscriptions page should not be accessible if payments are not enabled
+	#3212: CSL styles should receive DOI without URL
+	#3218: Upgrade failed: DB: Can't DROP 'user_group_id'; check that column/key exists
+	#3219: Upgrade gets stuck due to lack of MoveNext() in repairSuppFilesFilestage
+	#3220: fix migrateTimedViewsUsageStatistics
+	#3228: Non-anonymized reviewer files not able to be deleted
+	#3232: Manual payment plugin throws PHP Warning:  Missing argument 2 for Form::setData()
+	#3237: Crossref as-crawled URLs should only include PDF galley URLs (if multiple formats are published)
+	#3246: Update copyrights for 2018
+	#3247: UI: reviewer page submission details - unnecessary information
+	#3252: Getting section editors results in db error
+	#3255: Ensure that upgraded reviews from OJS2 are double-blind
+	#3267: NavigationMenus Site-wide unable to drop NMIs into empty NM edit areas.
+	#3269: CSL Plugin doesn't display abbreviated journal title for AMA style
+	#3273: When logged in, edit link on the announcement page is not working properly
+	#3274: Redirect URI from Login as
+	#3276: Native XML import fails on batch insert
+	#3282: Missing navigation menu item for the search page
+	#3283: Display usage statistics for last 12 months instead of for current year
+	#3287: "User" and "Primary" (navigation menus management tools) are confusing
+	#3288: "Custom Page" should not be default when adding a new navigation menu item
+	#3289: Author `user_group_id` upgrade `UPDATE` is broken
+	#3302: File upload gets stuck with certain language selections in multilingual journals
+	#3311: "Subject" / "subjects" field "required" flag not behaving as expected
+	#3318: Check minimum requirements before allowing to upgrade
+	#3323: fix detachment of dependent entities at file revision upload confirmation
+	#3329: Copyright Info with CC License Badge
+	#3332: consider missing submission file in usage stats loader
+	#3334: fix listing of successfully imported submissions
+	#3336: External feed plugin obliterates custom blocks when enabled
+	#3338: If html part of mail too long, new line with exclamation mark is inserted
+	#3348: article DOI in native import
+	#3357: Disciplin element should be discipline
+	#3359: recommendOnly editor and section editor
+	#3374: Dropdown nav menus in default theme don't work for rtl languages
+	#3379: Article subtitles should appear in the issue TOC
+	#3383: no context in LazyLoadPlugin get/setEnabled when using CLI
+	#3385: Desisting from adding a new discussion leaves behind an empty discussion
+	#3387: Remove gender fields
+	#3390: upgrade email templates
+	#3392: current release contains potentially dangerous old version of PHPMailer
+	#3398: Section Editor assignment creates duplicate Pre-Review Discussion entries
+	#3407: doubt about a translation
+	#3412: RSS buttons left-over from OJS 2.x
+	#3415: getTemplateResourceName for plugins in pkp-lib
+	#3416: sr_SR migration to either sr_RS@latin or sr_RS@cyrillic
+	#3420: Date issues for non-default date_format_short in reviewDueDate and responseDueDate
+	#3421: Editing roles for a user in one journal destroys roles in others
+	#3422: OJS 3.1.0.1 adding a participant with Safari does not close the modal window
+	#3436: "Send to Review" and "Send to Production" for reccomendOnly users
+	#3440: Even if you check "Do not send email" for notification, you receive email.
+	#3443: Duplicate translation keys in en_US
+	#3444: Multilingual custom email template does not apply to email body
+	#3447: Task list shows too long
+	#3448: Submission listings only show title for selected locale
+	#3459: sitemap fix
+	#3474: Restrict SubmissionFileRequestedRevisionRequiredPolicy to revision files only
+	#3481: submission URL in recommendation form emails
+	#3485: Missing sidebar items after upgrade from OJS 2.4.x with PostgreSQL
+	#3488: Improve error presentation in file upload wizard
+	#3491: Use mbstring-capable regexp functions in searching
+	#3495: Modify API URLs in ui-library when restful_urls enabled
+	#3506: Untranslated locale key for scheduledTaskLogs log file
+	#3509: DataCite export plugin sets accepted date = submitted date instead of actual accepted date
+	#3510: display last revisions of reviewer files
+	#3517: require locale component for identifier tab, add a hook
+

From 912b8a493da82313734bfab622d9866711a5d9c3 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 12:25:10 -0700
Subject: [PATCH 066/100] Update release date

---
 docs/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README b/docs/README
index 6e41eb81a5f..64349f84427 100644
--- a/docs/README
+++ b/docs/README
@@ -3,7 +3,7 @@
 	=== The Public Knowledge Project
 	=== Version: 3.1.1
 	=== GIT tag: ojs-3_1_1-0
-	=== Release date: October 23, 2017
+	=== Release date: April 4, 2018
 	===================================
 
 

From 9f98995e3f617b3278cef243278643f06c0a99ec Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 15:48:24 -0700
Subject: [PATCH 067/100] Fix query typos

---
 dbscripts/xml/upgrade/3.1.1_update.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbscripts/xml/upgrade/3.1.1_update.xml b/dbscripts/xml/upgrade/3.1.1_update.xml
index 208978dfc23..d41ac35635e 100644
--- a/dbscripts/xml/upgrade/3.1.1_update.xml
+++ b/dbscripts/xml/upgrade/3.1.1_update.xml
@@ -46,8 +46,8 @@
 	<sql>
 		<query driver="mysql">UPDATE users u, (SELECT user_id, GROUP_CONCAT(DISTINCT setting_value SEPARATOR ' ') AS groupedGossips FROM user_settings WHERE setting_name = 'gossip' AND setting_value &lt;&gt; '' GROUP BY user_id) us SET u.gossip = us.groupedGossips WHERE us.user_id = u.user_id</query>
 		<query driver="mysqli">UPDATE users u, (SELECT user_id, GROUP_CONCAT(DISTINCT setting_value SEPARATOR ' ') AS groupedGossips FROM user_settings WHERE setting_name = 'gossip' AND setting_value &lt;&gt; '' GROUP BY user_id) us SET u.gossip = us.groupedGossips WHERE us.user_id = u.user_id</query>
-		<query driver="postgres7">UPDATE users SET citations = us. groupedGossips FROM (SELECT user_id, string_agg(DISTINCT setting_value, ' ') AS groupedGossips FROM user_settings WHERE setting_name = 'gossip' AND setting_value &lt;&gt; '' GROUP BY user_id) AS us WHERE us.user_id = users.user_id</query>
-		<query>DELETE FROM user_settings WHERE setting_name="gossip"</query>
+		<query driver="postgres7">UPDATE users SET gossip = us.groupedGossips FROM (SELECT user_id, string_agg(DISTINCT setting_value, ' ') AS groupedGossips FROM user_settings WHERE setting_name = 'gossip' AND setting_value &lt;&gt; '' GROUP BY user_id) AS us WHERE us.user_id = users.user_id</query>
+		<query>DELETE FROM user_settings WHERE setting_name='gossip'</query>
 	</sql>
 	<sql><!-- pkp/pkp-lib#3412 Clean up notifications left over from deleted announcements -->
 		<query driver="mysql">DELETE n FROM notifications n LEFT JOIN announcements a ON (n.assoc_id = a.announcement_id) WHERE a.announcement_id IS NULL AND n.assoc_type = 522</query><!-- ASSOC_TYPE_ANNOUNCEMENT -->

From feb35aab8fba24d741f3a1ac5de69a2c498a0191 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 4 Apr 2018 17:41:44 -0700
Subject: [PATCH 068/100] Submodule update

---
 plugins/generic/translator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/translator b/plugins/generic/translator
index 532128f7b2f..7d4a7055968 160000
--- a/plugins/generic/translator
+++ b/plugins/generic/translator
@@ -1 +1 @@
-Subproject commit 532128f7b2fdac20daa355b9eabf5ab287c1b7b4
+Subproject commit 7d4a7055968d61f1741f2f0ac5c80c23c2b2dccf

From 44f317e665c9fa618c99d3259e4f3a342759e754 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 5 Apr 2018 13:44:22 -0700
Subject: [PATCH 069/100] Remove dead code

---
 templates/images/help.gif                   | Bin 632 -> 0 bytes
 templates/images/icons/comment.gif          | Bin 873 -> 0 bytes
 templates/images/icons/comment_disabled.gif | Bin 89 -> 0 bytes
 templates/images/icons/delete.gif           | Bin 88 -> 0 bytes
 templates/images/icons/delete_disabled.gif  | Bin 117 -> 0 bytes
 templates/images/icons/edit.gif             | Bin 147 -> 0 bytes
 templates/images/icons/edit_disabled.gif    | Bin 203 -> 0 bytes
 templates/images/icons/folder.gif           | Bin 87 -> 0 bytes
 templates/images/icons/letter.gif           | Bin 873 -> 0 bytes
 templates/images/icons/mail.gif             | Bin 872 -> 0 bytes
 templates/images/icons/mail_disabled.gif    | Bin 88 -> 0 bytes
 templates/images/icons/view.gif             | Bin 109 -> 0 bytes
 templates/images/info.gif                   | Bin 695 -> 0 bytes
 templates/images/letter.gif                 | Bin 90 -> 0 bytes
 templates/images/mail.gif                   | Bin 94 -> 0 bytes
 templates/images/menulist.gif               | Bin 50 -> 0 bytes
 templates/images/progbar.gif                | Bin 71 -> 0 bytes
 templates/images/progbg.gif                 | Bin 292 -> 0 bytes
 18 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 templates/images/help.gif
 delete mode 100644 templates/images/icons/comment.gif
 delete mode 100644 templates/images/icons/comment_disabled.gif
 delete mode 100644 templates/images/icons/delete.gif
 delete mode 100644 templates/images/icons/delete_disabled.gif
 delete mode 100644 templates/images/icons/edit.gif
 delete mode 100644 templates/images/icons/edit_disabled.gif
 delete mode 100644 templates/images/icons/folder.gif
 delete mode 100644 templates/images/icons/letter.gif
 delete mode 100644 templates/images/icons/mail.gif
 delete mode 100644 templates/images/icons/mail_disabled.gif
 delete mode 100644 templates/images/icons/view.gif
 delete mode 100644 templates/images/info.gif
 delete mode 100644 templates/images/letter.gif
 delete mode 100644 templates/images/mail.gif
 delete mode 100644 templates/images/menulist.gif
 delete mode 100644 templates/images/progbar.gif
 delete mode 100644 templates/images/progbg.gif

diff --git a/templates/images/help.gif b/templates/images/help.gif
deleted file mode 100644
index 398cbecd204c81bb797dff5440a93fed6e524024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmZ?wbhEHbRANwKxT?i)=Ej+Qr}rH>eWYu4SNH7h-A8sGyL@c=vgt?999_F(?Sl0S
zwjJ4a;Ov3r+m<iey6n#VJF`~JTEBPwg0&0IUOs#B+R4d_CU4xmam%4CQ<qI$w{zY0
zBisAu_g}qvb^7w@$FCe;x@GCxw{Lsr^<KDhVbY>WvscePbpFt)ovU^p+u1R*<Ko?m
z@87>?pbRMfWMO1r&|=U583XbY1KWRxsRbS(wgO_Ftqv<ZbUNG%y+r+lq^FdfzN?~k
zRZIP_?(9HGzZn`91%`dx%}$9iG7|3`H?WDaMRQ3pXtuVsGDvYnGqWm$vPKJVw@;nQ
zEfCEb!qlL_%QkIM8yjyFbB&8k-h8FSjDj0m+Le}RuxB}^Xb3Evrm7sHs6Lf#W`?tH
z^pr(%Q7W=giqp8G6SO#^xE8kxZkCT?oYt+u=@zLWb!V#D!)a1c((X|bn_p`(9Mt&M
z#!#u@vBhFXI)_Xb|6-X8&qYs}4vMf@f3Plb>=x4H;c%N%(a|_fHA>@7_X5{PR$Ngt
zT4LB2s2umw2sAmkL$5)MpT%}j!KH$^##4p(wHH+=eTZui;ul@i;PgIKG2+p?pO=ML
z=UN4t-Cf(<?j&cHyVxVEv!H*DrRb?G2CJVavUCYp><qnJ<a=~o+#&{+f~XTSrtz$b
zFfI5xVVZ7?t5qgr=#KTeAt6ecGeaaMFVm{CSt#(tM9@;CSFSblv)Z{iR^|UPZ*ERI
gF~fMn#V1*FdA#4Oi_ZwRoRs1@Sv@d{osq#B0Of)9Y5)KL

diff --git a/templates/images/icons/comment.gif b/templates/images/icons/comment.gif
deleted file mode 100644
index 7952265333f075597cdf789b508ca0eab41f92c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 873
zcmZ?wbhEHb6ky<E_|C-e|NnpE@=%6RFd70QG6WQVvM@3*Ffr(Wd=JVK3><C@tQ;~P
z8x|aFW@pxjkziQZz`&ry)NsS#p-Y#bw%C#rg$o@!gq*WvZWKN|(y!>cC}qWmC&#7;
WxpV2<40`4~L(+aziiLp!gEau!J|lYo

diff --git a/templates/images/icons/comment_disabled.gif b/templates/images/icons/comment_disabled.gif
deleted file mode 100644
index b0e1af6c54bc661ada55a466091b06df6d8ca2bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89
zcmZ?wbhEHb6ky<En8?KN?%lhYGiSbk|DJ(?LGdRGBLf2ygAS0*0Fq~5(wfr0a`!{|
s85|3kq;4NIRp+teN}YO7(C&J~ES)E7;<M+vN!=E{+iOsw!N6b*0PGGOSO5S3

diff --git a/templates/images/icons/delete.gif b/templates/images/icons/delete.gif
deleted file mode 100644
index 6a41da0c9da4f625da17952682d7f01733142add..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88
zcmZ?wbhEHb6krfwn8?g<(8J@yiWT<-1>e7aulSRNk%57kL5BedK=KSsnsfSBo?ffu
q#AR@>BEwax+%i^vF{6M7lh&>&>Y81rER;4~jFi}Jxi6l9!5RRLksBKT

diff --git a/templates/images/icons/delete_disabled.gif b/templates/images/icons/delete_disabled.gif
deleted file mode 100644
index ce3fe5a6788b0c0c3262e697ca77e1e4fde1bf44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmZ?wbhEHb6krfwSj57xbLY-oyLJ^878Vs1y?_6n0R|L*vM@3*urTO=1VCyTn5{f^
z-T7x=rRcz%w8il-lXFFClXyXMX{)ot)Cs3cg(RvbdKa!LzPIMyqbY_H3%Y%>cVvr5
N+jo|Dc`z_o0{~pXCiwsW

diff --git a/templates/images/icons/edit.gif b/templates/images/icons/edit.gif
deleted file mode 100644
index c1d0ca62cc3bff83d483ff33a45324d266e87cc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmV;E0Brw9Nk%w1VGsZi0J9GO??*=2F)_LzC%(3@^yjG9*x38_veC}ISXfxXfhz3Y
zlJB@Q`luQI(_8=m0PpYbA^8LW000jFEC2ui01yBW000C)@X1LfxHZ3WL(o)lcmgOj
z%`ph2i7vxnJ}<*0bF(aWuG=`*uIKs@LA4;rU?3=t8iiA#1UVGgnFMjwN*tyL06Tdh
BJz@X=

diff --git a/templates/images/icons/edit_disabled.gif b/templates/images/icons/edit_disabled.gif
deleted file mode 100644
index 29e3f5e63f529815b5491de48a5f87c6c3ceca21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmZ?wbhEHb6krfwI3mW-*Vk8CTDoo9w*LP9wzjs`*4CRhZ=OAS_Ta&T&z?O?N=mwZ
z{rcz6pA!=kBO@cPUAy+>%a;QO4&1$acjwNXH*VZuU|@Lv{ymVy1r&d>FfuTRG3bC4
zfb3*o^;n?Vw<JQqWo6W9Nfzy&GV6u9MM^n(YoBv8K1e(1sy3PNqJSk+huf3S*XQ^o
jUwksDX@ijDgcg_T$sMZKBU}%ub;)FJUs1%($Y2csPyJE~

diff --git a/templates/images/icons/folder.gif b/templates/images/icons/folder.gif
deleted file mode 100644
index de9152b0d7bb72e3d10d3f7de01b4c5da64ae5c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87
zcmZ?wbhEHb6ky<En8?KN|NnpE^3eD1-!m{UDE?$&WME)o&;ha;K=KSs8dLgLu6`&V
p!La$#(-m#+Lh?$T#PY6ZOjDYf*EY*dS!Q3Z#^x>TMQ)4?)&Re19by0g

diff --git a/templates/images/icons/letter.gif b/templates/images/icons/letter.gif
deleted file mode 100644
index 7952265333f075597cdf789b508ca0eab41f92c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 873
zcmZ?wbhEHb6ky<E_|C-e|NnpE@=%6RFd70QG6WQVvM@3*Ffr(Wd=JVK3><C@tQ;~P
z8x|aFW@pxjkziQZz`&ry)NsS#p-Y#bw%C#rg$o@!gq*WvZWKN|(y!>cC}qWmC&#7;
WxpV2<40`4~L(+aziiLp!gEau!J|lYo

diff --git a/templates/images/icons/mail.gif b/templates/images/icons/mail.gif
deleted file mode 100644
index af8c2f40c5239f48c5779b4c713023fa28b19aab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmZ?wbhEHb6ky<E_|C*&Tps%W|9^&2Fd70QG6WQVvM@3*Ffr(Wd=JVK3>>ZutQ;~P
z8x|aF<`Cv%Ij~{j;dUklmKh!!m0TGFb)!-w7#1Jt<ahM?vSOpk$!<RFc{(eN7N44;
V5W8uQMseEl4*p^@5di@PYXGJNA)^2Q

diff --git a/templates/images/icons/mail_disabled.gif b/templates/images/icons/mail_disabled.gif
deleted file mode 100644
index e16033181c2481e969404a83f90f945f2ee3443d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88
zcmZ?wbhEHb6ky<En8?I1bLPx<@7}$C|DJ(?LGdRGBLf2ygAS0*0Fq~5(wx%2@^mf3
r;yFw$-NtO8*%AfUOeaozvGj#nYWAzLJnvH<((Wgkew`S=z+epk?LZ%s

diff --git a/templates/images/icons/view.gif b/templates/images/icons/view.gif
deleted file mode 100644
index a9bda4efcc62a37cec0cc2b55826ede353d113a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmZ?wbhEHb6krfwSj5V3_3+^XpFai}8z;oa|NsC0{rmR}V4(Pug^_`Ql|cu@1F2<T
zHj3DF$F^XHyVk_bJkiW$($7;Dn);~<&Uvwm&uN*<27%Mu3HK`&-nKp3-!9EodtmXV
Ii3|+Z01<yDH2?qr

diff --git a/templates/images/info.gif b/templates/images/info.gif
deleted file mode 100644
index ef1291b8d283ebe00b6925ab4b30b827eed8c038..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmV;o0!aNwNk%w1VGsZj0Oo%Hs=unP!mg2}k;u@<(%RC#)xP)o_l};9!pg#^yQtpj
z-m}TGf|P>B&&IXNwTYaGy~(|)wyB=6o{XG~&(_b!(#QDw_@=t1q`9P`wxXZ1o}96q
zm#LSOr<BRl$+^+Fo35MP<K2myiK4Hfm#3Gn#ILKstFF1OhM0z<xufCh;oIfgkDrgt
z)Xl`r#JA12yvDqsw4s%xm6)fPj-8H(nTV*osLs{Svd6N7m4vLnteLBswZOHKqLQh;
zs+Ogeu*I;Wu%pJ*#@OE2fRcdJ+SHn@nxC$pov)ppub!E#nVYJc%+t)p+r^EajiI%o
z%F@c~@9T`7i>JJ&kfV^f&$-0T#LCplpR=E;y{gjO($wG7+2PsS=G?o=yYKYx$ll1$
z*w2QShKieto2i__*uuZbz{lOko~xev`})Jo!??q^yT!Z2(ZjI6u=x4-!_36A%(S=8
zx16n<i=K?5x1*k{p0B*Gywbe8(7T0~g!lRPkD-r{ppgIn|NsC0A^8LW004ggEC2ui
z01yBX000O7fHQr4G&Cm-hyy%56N57cH4G#-aCS9fKWs%K3^fORIS~{~dJk$X5kx%=
zFgb)WLq8&XBzt~04-X<YK@&7^M|2$=5>am+0v%3#6hA=}QXC*ybqNV|8b%!=5Nil`
z0!Vc>0V^s(7*8MqOE&{^N*O*SFBX0)CN?oUd<_FT5)uG;QNVy71q%XTKtjdL00}Vw
zEWp#mo(efQY+&hN#f2LzCL9z1WAVcRA6Sx5h!AE&$O30do&*5_K_4gyF5swA#-M^Y
zKrToiKxP6OE*Jpd$YZce2>=qVoEQU&jg~A^aC}L#B}Iw~Olq)z#2`Y5HUM<!0N^DA
dj~plz4hZTqVTKw46)F%IFk%9WJ~ILV06XSwWYYiu

diff --git a/templates/images/letter.gif b/templates/images/letter.gif
deleted file mode 100644
index ed58e12e9ad8920fd88d7ba63c326eb153776457..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6ky<Cn8?hapzxo8;Xec@{$ycfU|?p@VE_V<JOh*VoJP)LyiBeFt2c^2
oTk_3guHs$csZ&3vN~TX#Es0xsYLULpx$HN0zb@r4;$pA{06Y93h5!Hn

diff --git a/templates/images/mail.gif b/templates/images/mail.gif
deleted file mode 100644
index 827f60bc958de8e324825d432c46052d7f963d0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6lLIHn8?KNpMl{&7%(s}DE?$&WME)o&;ha;K=KSs`coQLX6p(pnj^Hs
tS(EGAp%}-xp9{OnY!l4Pmd^Ci-FE6FcmBmS*RH<(T`6|NWibPTH2{pnB3A$a

diff --git a/templates/images/menulist.gif b/templates/images/menulist.gif
deleted file mode 100644
index 601671feacc00e2b8d848de8f70c362df38ece23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50
zcmZ?wbhEHbWMSZ9XkcXMnA!3E{d>iqEQ|~cj0`#qKmd|qVB+lQXWPwnZW0eGgEas?
C#S5hX

diff --git a/templates/images/progbar.gif b/templates/images/progbar.gif
deleted file mode 100644
index 7db3237acf998a4811bb9e9d33cdb37e96d466c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71
zcmZ?wbhEHbWM$xIXkcVmwR_e7|Nj;Li8>dhCYGe8D3oWGWGIAWq$;?3`UWuQFaQBa
XDFYKP4_{l=oF8H(B~hKyIt<nTH#Zdk

diff --git a/templates/images/progbg.gif b/templates/images/progbg.gif
deleted file mode 100644
index b4a3eacaf97c32f01498119fc43a0a9ca50a5c81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmV+<0o(pZNk%w1Vfg_Y0HFc^0000<JTU+N|NsC0A^sIZa%Ew3Wn>_CX>@2HRA^-&
zM@dak03rDV0SW*E04x9i008*`8vp<T+>DN?%k2-NoV41Dv);V>4~F7MGJ#R1>dLn6
z3&-+IH)oCK`p)<M5453z#G>(tOe#~irSl1mN~f?U^@`1Ew@@qh3l59NA}{%jPOHP_
zwfhZ^|Jw4p{f-CG^ZdU5FR%wVNLV-~Xqc$D=!D4l2pO5<C|PNFIYNoK$=NBP=@}~8
zIW%f|ikhmr%G&Ds3L7gsOIvGu`vI_{yW8uV!wbw4j6<AfOoN>KE3Bg|^9;>=JY5qF
qbB$d+ll{`&^6eJBGETnDeI8S;vR=}D_C69XpRQi-J$w&S002AOPK=fS


From f33681cef76bfb0ba0045a9e4b67cbf33d36bc1b Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Fri, 6 Apr 2018 11:10:04 +0300
Subject: [PATCH 070/100] Add fi locale template for initial decline

---
 locale/fi_FI/emailTemplates.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/locale/fi_FI/emailTemplates.xml b/locale/fi_FI/emailTemplates.xml
index 82dca027fec..f2189467209 100644
--- a/locale/fi_FI/emailTemplates.xml
+++ b/locale/fi_FI/emailTemplates.xml
@@ -825,4 +825,17 @@ Ystävällisin terveisin,<br />
 		<body><![CDATA[Kirjoita viesti]]></body>
 		<description>The default (blank) message used in the Notification Center Message Listbuilder.</description>
 	</email_text>
+	<email_text key="EDITOR_DECISION_INITIAL_DECLINE">
+		<subject>Toimittajan päätös</subject>
+		<body>
+			<![CDATA[Hyvä {$authorName},<br />
+<br />
+Olemme tehneet päätöksen julkaisuun {$contextName} lähettämäänne käsikirjoitusta &quot;{$submissionTitle}&quot; koskien.<br />
+<br />
+Päätöksemme on: Käsikirjoitus on hylätty<br />
+<br />
+{$editorialContactSignature}<br />]]></body>
+		<description>This email is send to the author if the editor declines his submission initially, before the review stage</description>
+	</email_text>	
+	
 </email_texts>

From 6ae42e27d333c858a73ea3dd0d1a6a60602fdda1 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Fri, 6 Apr 2018 21:21:23 -0700
Subject: [PATCH 071/100] Custom block manager submodule update

---
 plugins/generic/customBlockManager | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager
index ec5838a0c60..4a4e64af6de 160000
--- a/plugins/generic/customBlockManager
+++ b/plugins/generic/customBlockManager
@@ -1 +1 @@
-Subproject commit ec5838a0c601d75c86f6d72a0ed8ac9f0cd09bba
+Subproject commit 4a4e64af6dea14048d041e7a9d481be8bc85d111

From 586610e742bfe6f77cde288dc20ea1dbc574d57b Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 9 Apr 2018 15:44:02 +0200
Subject: [PATCH 072/100] pkp/pkp-lib#3556 submodule update ##bozana/3556##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 5db2a679a9b..76c3b5a7d38 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 5db2a679a9b159c24eb7901645f2fdc527aff2e9
+Subproject commit 76c3b5a7d38ab71b15d1afac17df6350e094d7f1

From cdfbc41b9609105690413c317e8287eeb836a026 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 9 Apr 2018 19:00:23 +0200
Subject: [PATCH 073/100] pkp/pkp-lib#3563 place sr_SR migration before files
 migration

---
 classes/install/Upgrade.inc.php | 8 ++++----
 dbscripts/xml/upgrade.xml       | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/classes/install/Upgrade.inc.php b/classes/install/Upgrade.inc.php
index fbf94a5fe7f..e6cf04c5aa8 100644
--- a/classes/install/Upgrade.inc.php
+++ b/classes/install/Upgrade.inc.php
@@ -2675,7 +2675,7 @@ function migrateSRLocale() {
 
 		// Consider issue cover images
 		// Note that the locale column values are already changed above
-		$settingValueResult = $journalSettingsDao->retrieve('SELECT a.*, b.journal_id FROM issue_settings a, issues b WHERE a.setting_name = \'coverImage\' AND a.locale = ? AND a.setting_value LIKE ? AND a.setting_type = \'string\' AND b.issue_id = a.issue_id', array($newLocale, '%' .$oldLocale .'%'));
+		$settingValueResult = $journalSettingsDao->retrieve('SELECT a.*, b.journal_id FROM issue_settings a, issues b WHERE a.setting_name = \'fileName\' AND a.locale = ? AND a.setting_value LIKE ? AND a.setting_type = \'string\' AND b.issue_id = a.issue_id', array($newLocale, '%' .$oldLocale .'%'));
 		while (!$settingValueResult->EOF) {
 			$row = $settingValueResult->getRowAssoc(false);
 			$oldCoverImage = $row['setting_value'];
@@ -2684,14 +2684,14 @@ function migrateSRLocale() {
 				$publicFileManager->copyJournalFile($row['journal_id'], $publicFileManager->getContextFilesPath(ASSOC_TYPE_JOURNAL, $row['journal_id']) . '/' . $oldCoverImage, $newCoverImage);
 				$publicFileManager->removeJournalFile($row['journal_id'], $oldCoverImage);
 			}
-			$journalSettingsDao->update('UPDATE issue_settings SET setting_value = ? WHERE issue_id = ? AND setting_name = \'coverImage\' AND locale = ?', array($newCoverImage, (int) $row['issue_id'], $newLocale));
+			$journalSettingsDao->update('UPDATE issue_settings SET setting_value = ? WHERE issue_id = ? AND setting_name = \'fileName\' AND locale = ?', array($newCoverImage, (int) $row['issue_id'], $newLocale));
 			$settingValueResult->MoveNext();
 		}
 		$settingValueResult->Close();
 
 		// Consider article cover images
 		// Note that the locale column values are already changed above
-		$settingValueResult = $journalSettingsDao->retrieve('SELECT a.*, b.context_id FROM submission_settings a, submissions b WHERE a.setting_name = \'coverImage\' AND a.locale = ? AND a.setting_value LIKE ? AND a.setting_type = \'string\' AND b.submission_id = a.submission_id', array($newLocale, '%' .$oldLocale .'%'));
+		$settingValueResult = $journalSettingsDao->retrieve('SELECT a.*, b.context_id FROM submission_settings a, submissions b WHERE a.setting_name = \'fileName\' AND a.locale = ? AND a.setting_value LIKE ? AND a.setting_type = \'string\' AND b.submission_id = a.submission_id', array($newLocale, '%' .$oldLocale .'%'));
 		while (!$settingValueResult->EOF) {
 			$row = $settingValueResult->getRowAssoc(false);
 			$oldCoverImage = $row['setting_value'];
@@ -2700,7 +2700,7 @@ function migrateSRLocale() {
 				$publicFileManager->copyJournalFile($row['context_id'], $publicFileManager->getContextFilesPath(ASSOC_TYPE_JOURNAL, $row['context_id']) . '/' . $oldCoverImage, $newCoverImage);
 				$publicFileManager->removeJournalFile($row['context_id'], $oldCoverImage);
 			}
-			$journalSettingsDao->update('UPDATE submission_settings SET setting_value = ? WHERE submission_id = ? AND setting_name = \'coverImage\' AND locale = ?', array($newCoverImage, (int) $row['submission_id'], $newLocale));
+			$journalSettingsDao->update('UPDATE submission_settings SET setting_value = ? WHERE submission_id = ? AND setting_name = \'fileName\' AND locale = ?', array($newCoverImage, (int) $row['submission_id'], $newLocale));
 			$settingValueResult->MoveNext();
 		}
 		$settingValueResult->Close();
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index f84125fd842..ed0c935d3c2 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -83,6 +83,10 @@
 	<code function="installDefaultNavigationMenus" />
 	<code function="migrateStaticPagesToNavigationMenuItems" />
 
+	<upgrade minversion="2.4.0.0" maxversion="3.1.1.9">
+		<code function="migrateSRLocale" />
+	</upgrade>
+
 	<upgrade minversion="2.4.0.0" maxversion="2.4.9.9">
 		<code function="concatenateIntoAbout" />
 		<code function="concatenateIntoMasthead" />
@@ -190,7 +194,6 @@
 	<upgrade minversion="2.4.0.0" maxversion="3.1.0.9">
 		<data file="dbscripts/xml/upgrade/3.1.1_update.xml" />
 		<code function="installEmailTemplate" key="REVISED_VERSION_NOTIFY" locales="ar_IQ,da_DK,en_US,es_ES,fa_IR,fi_FI,fr_CA,fr_FR,id_ID,pt_PT,ru_RU,sv_SE" />
-		<code function="migrateSRLocale" />
 		<code function="clearDataCache" />
 	</upgrade>
 

From 6e73a30be55eeca0ba971a8593d0d01bb6931004 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Tue, 10 Apr 2018 14:39:49 +0100
Subject: [PATCH 074/100] Some pt localization

---
 locale/pt_PT/api.xml                             | 16 ++++++++++++++++
 plugins/generic/openAIRE/locale/pt_PT/locale.xml |  1 +
 .../importexport/doaj/locale/pt_PT/locale.xml    |  1 +
 .../importexport/medra/locale/pt_PT/locale.xml   |  1 +
 4 files changed, 19 insertions(+)
 create mode 100644 locale/pt_PT/api.xml

diff --git a/locale/pt_PT/api.xml b/locale/pt_PT/api.xml
new file mode 100644
index 00000000000..2e2cf37bb27
--- /dev/null
+++ b/locale/pt_PT/api.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="api.submissions.403.unpublishedIssues">Não tem permissões para ver edições ainda não publicadas.</message>
+</locale>
diff --git a/plugins/generic/openAIRE/locale/pt_PT/locale.xml b/plugins/generic/openAIRE/locale/pt_PT/locale.xml
index c6c9fb03820..b5a1e5fc694 100644
--- a/plugins/generic/openAIRE/locale/pt_PT/locale.xml
+++ b/plugins/generic/openAIRE/locale/pt_PT/locale.xml
@@ -16,4 +16,5 @@
 	<message key="plugins.generic.openAIRE.description">O plugin OpenAIRE inclui o elemento projectID nos metadados do artigo e estende a interface OAI-PMH para se adequar às Orientações do OpenAIRE 1.1, auxiliando as revistas que usam o OJS a serem compatíveis com o OpenAIRE.</message>
 	<message key="plugins.generic.openAIRE.projectID">OpenAIRE Número de Projeto (Project ID)</message>
 	<message key="plugins.generic.openAIRE.projectIDValid">Indique um número de projeto válido (6 números)</message>
+	<message key="plugins.generic.openAIRE.projectID.description"><![CDATA[Caso o trabalho aqui apresentado tenha resultado de uma iniciativa Europeia de acordo com a plataforma de metadados <a href="https://www.openaire.eu/" target="_blank">OpenAIRE</a>, por favor inclua o identificador de projeto (ProjectID), um número de seis dígitos que corresponde ao identificador do Contrato de Financiamento.]]></message>
 </locale>
diff --git a/plugins/importexport/doaj/locale/pt_PT/locale.xml b/plugins/importexport/doaj/locale/pt_PT/locale.xml
index 95cc34cd826..5b81ceb6757 100644
--- a/plugins/importexport/doaj/locale/pt_PT/locale.xml
+++ b/plugins/importexport/doaj/locale/pt_PT/locale.xml
@@ -23,4 +23,5 @@
 	<message key="plugins.importexport.doaj.settings.form.automaticRegistration.description">O OJS depositará artigos automaticamente junto do DOAJ. Por favor, note que esta acção pode demorar a ser processada. Pode verificar se há todos os artigos não registados.</message>
 	<message key="plugins.importexport.doaj.settings.form.testMode.description">Use a API de teste DOAJ (ambiente de teste) para o registo. Não se esqueça de remover esta opção para a produção.</message>
 	<message key="plugins.importexport.doaj.register.error.mdsError">O depósito não foi bem sucedido! A API DOAJ devolveu um erro: '{$param}'.</message>
+	<message key="plugins.importexport.doaj.senderTask.name">Tarefa de registo automático no DOAJ</message>
 </locale>
diff --git a/plugins/importexport/medra/locale/pt_PT/locale.xml b/plugins/importexport/medra/locale/pt_PT/locale.xml
index 8828a541adb..7a3ba6c21de 100644
--- a/plugins/importexport/medra/locale/pt_PT/locale.xml
+++ b/plugins/importexport/medra/locale/pt_PT/locale.xml
@@ -38,4 +38,5 @@
 	<message key="plugins.importexport.medra.cliUsage">Modo de Utilização: 
 {$scriptName} {$pluginName} export [xmlFileName] [journal_path] {issues|articles|galleys} objectId1 [objectId2] ...
 {$scriptName} {$pluginName} register [journal_path] {issues|articles|galleys} objectId1 [objectId2] ...</message>
+	<message key="plugins.importexport.medra.intro"><![CDATA[Se pretende registar os DOI no sistema mEDRA, siga as indicações referidas no <a href="http://www.medra.org/en/guide.htm" target="_blank">Sítio do mEDRA (EN)</a> para receber um utilizador e uma senha. Se não tiver o seu próprio utilizador e respetiva senha, poderá, ainda assim, exportar nos formados XML do mEDRA (Onix para DOI) mas não poderá registar os seus DOI no sistema mEDRA a partir do OJS. Note the a senha será armazenada em formato texto, ou seja, não encriptada, dados os requisitos do serviço de registo do mEDRA.]]></message>
 </locale>

From 79e5a27af48e21f6ce53c5ee73ef36cf90c565a4 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Thu, 12 Apr 2018 15:18:06 +0100
Subject: [PATCH 075/100] Some more

---
 locale/pt_PT/editor.xml  | 12 ++----
 locale/pt_PT/locale.xml  | 90 ++++++----------------------------------
 locale/pt_PT/manager.xml |  3 --
 3 files changed, 15 insertions(+), 90 deletions(-)

diff --git a/locale/pt_PT/editor.xml b/locale/pt_PT/editor.xml
index 74621163fd3..c466033dfd5 100644
--- a/locale/pt_PT/editor.xml
+++ b/locale/pt_PT/editor.xml
@@ -34,8 +34,6 @@
 	<message key="editor.notifyUsers.includeToc">Incluir sumário da edição:</message>
 	<message key="editor.editorAdministration">Administração do Editor</message>
 	<message key="editor.issues.createIssue">Criar Edição</message>
-	<message key="editor.issues.backIssues">Edições Anteriores</message>
-	<message key="editor.issues.futureIssues">Edições Futuras</message>
 	<message key="editor.issues.currentIssue">Edição Actual</message>
 	<message key="editor.issues.numArticles">Artigos</message>
 	<message key="editor.issues.noArticles">Nenhum artigo agendado para esta edição.</message>
@@ -59,15 +57,12 @@
 	<message key="editor.issues.remove">Remover</message>
 	<message key="editor.issues.proofed">Corrigido</message>
 	<message key="editor.issues.removeCoverPage">Remover imagem da capa?</message>
-	<message key="editor.issues.invalidCoverPageFormat">Formato inválido. Formatos aceitáveis são .gif, .jpg ou .png. Verifique as configurações de MimeType do servidor e permissões de pastas.</message>
 	<message key="editor.issues.styleFile">Folha de Estilos</message>
 	<message key="editor.issues.invalidStyleFormat">O formato de Folha de Estilos é inválido. Certifique-se que o documento enviado é um documento CSS válido! Documentos CSS com comentários no início poderão ser rejeitados. Verifique as configurações de MimeType do servidor e permissões de pastas.</message>
 	<message key="editor.issues.removeStyleFile">Eliminar Folha de Estilos?</message>
 	<message key="editor.issues.coverPageCaption">Legenda da capa</message>
 	<message key="editor.issues.showCoverPage">Criar capa personalizada para esta edição.</message>
 	<message key="editor.issues.coverPageDisplay">Exibir</message>
-	<message key="editor.issues.hideCoverPageArchives">Não exibir miniatura da capa na lista de edições</message>
-	<message key="editor.issues.hideCoverPageCover">Não exibir imagem de capa antes do sumário</message>
 	<message key="editor.issues.openAccess">Acesso Livre</message>
 	<message key="editor.issues.subscription">Subscrição</message>
 	<message key="editor.issues.identification">Identificação</message>
@@ -107,15 +102,11 @@
 	<message key="editor.article.scheduleForPublication">Agendar para publicar em</message>
 	<message key="editor.article.scheduleForPublication.toBeAssigned">A Agendar</message>
 	<message key="editor.article.payment.publicationFeeNotPaid">A Taxa para Publicação do artigo não foi paga. Uma vez realizado o pagamento, será permitido agendar o artigo para publicação.</message>
-	<message key="editor.article.showCoverPage">Criar capa para este artigo com os seguintes elementos.</message>
-	<message key="editor.article.hideCoverPageToc">Não exibir miniatura da capa no sumário</message>
-	<message key="editor.article.hideCoverPageAbstract">Não exibir imagem de capa na página de resumo de artigo</message>
 	<message key="editor.article.remove">Eliminar</message>
 	<message key="editor.issues.enableOpenAccessDate">Activar acesso livre adiado</message>
 	<message key="editor.issues.unpublishIssue">Despublicar edição</message>
 	<message key="editor.issues.confirmUnpublish">Deseja realmente despublicar esta edição?</message>
 	<message key="editor.submissionReview.cannotSendToCopyediting">Antes de enviar a submissão para Copyediting, use o link Notificar Autor para informá-lo sobre a decisão e seleccionar a versão que vai ser enviada.</message>
-	<message key="editor.submissionReview.sendToCopyediting">Enviar para Copyediting</message>
 	<message key="editor.notifyUsers.allReaders">Todos os leitores ({$count} utilizadores)</message>
 	<message key="editor.notifyUsers.allAuthors">Todos os autores publicados ({$count} utilizadores)</message>
 	<message key="editor.notifyUsers.allIndividualSubscribers">Todos os assinantes individuais ({$count} utilizadores)</message>
@@ -153,4 +144,7 @@
 	<message key="editor.submission.selectGalleyFiles">Seleccionar Ficheiros Edição</message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Os ficheiros de rascunho finais nesta lista são transformados por um Copyeditor em versões copiadas, carregadas abaixo em <span class ="pkp_help_title">Copyediting </span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Todos os ficheiros que já foram enviados para qualquer etapa de submissão podem ser adicionados à Listagem de Revisão, marcando a caixa de selecção Incluir abaixo e clicando em Pesquisar: todos os ficheiros disponíveis serão listados e podem ser escolhidos para inclusão.</message>
+	<message key="editor.issues.confirmSetCurrentIssue">Deseja realmente definir esta edição como a atual?</message>
+	<message key="grid.action.setCurrentIssue">Definir como Edição Atual</message>
+	<message key="editor.publicIdentificationExistsForTheSameType">O identificador público '{$publicIdentifier}' já existe para outro objeto do mesmo tipo. Por favor escolha identificadores únicos para os objetos do mesmo tipo da sua revista.</message>
 </locale>
diff --git a/locale/pt_PT/locale.xml b/locale/pt_PT/locale.xml
index bb877f7af88..a7dce7c3e15 100644
--- a/locale/pt_PT/locale.xml
+++ b/locale/pt_PT/locale.xml
@@ -247,15 +247,6 @@
 Configurar o suporte ao LOCKSS para o OJS é necessário somente após a publicação de uma edição estar quase completa, bastando seguir os passos a seguir:]]></message>
 
 	<!-- Setup Step 3 -->
-	<message key="manager.setup.subjectClassificationDescription"><![CDATA[A revista utiliza um sistema de classificação de assunto disponível na web.<br />
-Título do sistema de classificação:]]></message>
-	<message key="manager.setup.registerJournalForIndexingDescription"><![CDATA[Para ter o conteúdo desta revista indexado dentro de um sistema global de distribuição de bases de pesquisa, <a href="http://pkp.sfu.ca/harvester/add.php" target="_blank">registe</a> o URL da revista no <a href="http://pkp.sfu.ca/harvester/" target="_blank">Colectador de Metadados</a> do Public Knowledge Project. Esta ferramenta recolha os recolha de cada item indexado desta revista, possibilitando pesquisas colectivas e precisas entre os portais de pesquisa que utilizam o protocolo de recolha de metadados do <a href="http://www.openarchives.org/OAI/openarchivesprotocol.htm#Introduction" target="_blank">Open Archives Initiative, OAI-PMH</a>.
-<br /><br />
-Caso o administrador do portal já tenha registado a revista no portal do Colectador do PKP, a revista será automaticamente indexada, sem necessidade de registo individual.
-<br /><br />
-<a href="http://pkp.sfu.ca/harvester/add.php" target="_blank">Clique aqui</a> e insira <span class="highlight">{$siteUrl}</span> no campo <strong>Site URL</strong>, e <span class="highlight">{$oaiUrl}</span> no campo <strong>Base URL for OAI Archive</strong>.]]></message>
-
-
 	<!-- Setup Step 4 -->
 	<message key="manager.setup.basicEditorialStepsDescription"><![CDATA[Passos: Fila de Submissão > Revisão de Submissão > Edição de Submissão > Fila de Espera > Sumário.<br /><br />
 Escolha um modelo para administrar os aspectos do processo editorial. (Para designar um Director e Editores de Secção, aceda a opção Editores em Administração da Revista.)]]></message>
@@ -425,7 +416,6 @@ Escolha um modelo para administrar os aspectos do processo editorial. (Para desi
 	<!-- Registration -->
 	<message key="user.register.noJournals">Não há revistas para se registar neste portal.</message>
 	<message key="user.register.privacyStatement">Política de Privacidade</message>
-	<message key="user.register.loginToRegister">Insira o nome de utilizador e senha para registar-se na revista.</message>
 	<message key="user.register.registrationDisabled">Registo de utilizadores desactivado no momento.</message>
 	<message key="user.register.form.passwordLengthTooShort">Senha inserida não contém o mínimo de caracteres.</message>
 	<message key="user.register.readerDescription">Notificado via e-mail da publicação de nova edição da revista.</message>
@@ -486,7 +476,6 @@ Escolha um modelo para administrar os aspectos do processo editorial. (Para desi
 	<message key="about.focusAndScope">Âmbito</message>
 	<message key="about.sectionPolicies">Políticas de Secção</message>
 	<message key="about.submissions">Submissões</message>
-	<message key="about.onlineSubmissions">Submissões Online</message>
 	<message key="about.onlineSubmissions.login">Acesso</message>
 	<message key="about.onlineSubmissions.registrationRequired">{$login} ou {$register} para submeter um artigo.</message>
 	<message key="about.authorGuidelines">Instruções para Autores</message>
@@ -583,7 +572,6 @@ O servidor actualmente tem suporte a mbstring: <strong>{$supportsMBString}</stro
 	<message key="log.review.reviewerUnassigned">{$reviewerName} liberada(o) da ronda {$round} de revisão da submissão {$submissionId}.</message>
 	<message key="log.review.reviewInitiated">A ronda {$round} de revisão da submissão {$submissionId}, designada a {$reviewerName}, foi iniciada.</message>
 	<message key="log.review.reviewReinitiated">A ronda {$round} de revisão da submissão {$submissionId}, designada a {$reviewerName}, foi iniciada novamente.</message>
-	<message key="log.review.reviewCancelled">A ronda {$round} de revisão da submissão {$submissionId}, designada a {$reviewerName}, foi cancelada.</message>
 	<message key="log.review.reviewCleared">{$reviewerName} foi liberada(o) da ronda {$round} de revisão da submissão {$submissionId}.</message>
 	<message key="log.review.reviewerRated">{$reviewerName} recebeu classificação para a ronda {$round} de revisão da submissão {$submissionId}.</message>
 	<message key="log.review.reviewDueDateSet">Foi definido para {$dueDate} o prazo para conclusão da ronda {$round} de revisão da submissão {$submissionId}, designada a {$reviewerName}.</message>
@@ -743,13 +731,6 @@ Autores que publicam nesta revista concordam com os seguintes termos:
 	<message key="rt.admin.settings.addComment.anonymous">Utilizadores devem estar registados e ligados para comentar, com permissão de anonimato.</message>
 	<message key="rt.admin.settings.addComment.unauthenticated">Não é necessário estar registado para comentar, com permissão de anonimato.</message>
 	<message key="debug.notes.currencyListLoad">Lista de moedas "{$filename}" do ficheiro XML</message>
-	<message key="admin.languages.downloadUnavailable"><![CDATA[<p>Não é possível transferir idiomas do servidor do Public Knowledge Project. Os motivos possíveis são:
-	<ul>
-		<li>O servidor não possui ou não permite a execução da ferramenta "tar" GNU</li>
-		<li>O sistema não possui permissão para alterar o ficheiro de registo de idiomas, normalmente "registry/locales.xml".</li>
-                <li>O servidor não possui permissões para conexão remota ao servidor do PKP</li>
-	</ul>
-Idiomas estão disponíveis para download manual no <a href="http://pkp.sfu.ca">portal do PKP</a>.</p>]]></message>
 	<message key="reader.subscriptionRequiredLoginText">Subscrição exigida para acesso ao item. Para verificar a sua subscrição, aceda à revista.</message>
 	<message key="about.authorFees">Taxas para Autores</message>
 	<message key="about.authorFeesMessage">Este periódico cobra as seguintes taxas aos autores</message>
@@ -831,8 +812,8 @@ Pode-se opcionalmente informar o motivo pelo qual está sendo desactivado o regi
 	<message key="user.subscriptions.purchaseNewSubscription">Adquirir nova subscrição</message>
 	<message key="user.subscriptions.purchaseIndividualSubscription">Adquirir Subscrição Individual</message>
 	<message key="user.subscriptions.purchaseInstitutionalSubscription">Adquirir Subscrição Institucional</message>
-	<message key="user.subscriptions.expires">Vencimento</message>
-	<message key="user.subscriptions.expired">Vencida</message>
+	<message key="user.subscriptions.expires">Expira em {$date}</message>
+	<message key="user.subscriptions.expired">Expirou em {$date}</message>
 	<message key="user.subscriptions.viewSubscriptionTypes">Ver tipos disponíveis de Subscrições</message>
 	<message key="user.subscriptions.form.typeId">Tipo de Subscrição</message>
 	<message key="user.subscriptions.form.membership">Registo em Entidade de Classe</message>
@@ -894,43 +875,8 @@ Pode-se opcionalmente informar o motivo pelo qual está sendo desactivado o regi
 	<message key="issue.nonpdf.title">Download Número</message>
 	<message key="issue.viewIssue">Ver Número</message>
 	<message key="site.noJournals">Não existem revistas.</message>
-	<message key="gifts.buyer">De</message>
-	<message key="gifts.buyerDescription">Quem oferece o donativo?</message>
-	<message key="gifts.recipient">Para</message>
-	<message key="gifts.recipientDescription">Para quem é o donativo?</message>
-	<message key="gifts.thankYou">Obrigado</message>
-	<message key="gifts.thankYouMessage">A oferta do seu donativo foi concluída. Receberá uma cópia da prenda através de e-mail logo que o pagamento seja processado.</message>
-	<message key="gifts.purchaseGiftIndividualSubscription">Subscrição de Donativo</message>
-	<message key="gifts.subscriptionFormIntroduction">Por favor, preencha o formulário abaixo. A informação sobre o contacto, assim como a nota sobre o donativo, será usada para enviar ao destinatário e informá-lo que sobre o novo donativo subscrito (receberá também uma cópia deste e-mail).</message>
-	<message key="gifts.details">Detalhes Donativo</message>
-	<message key="gifts.detailsDescription">Por favor, escolha o donativo em baixo e inclua uma mensagem personalisada que será enviada ao destinatário (receberá também uma cópia deste e-mail).</message>
-	<message key="gifts.gift">Donativo</message>
-	<message key="gifts.noteTitle">Título</message>
-	<message key="gifts.note">Nota Donativo</message>
-	<message key="gifts.noteTitleRequired">Por favor, indique um título para a sua mensagem pernonalisada.</message>
-	<message key="gifts.noteRequired">Por favor, indique uma mensagem pernonalisada.</message>
-	<message key="gifts.localeRequired">Por favor, seleccione o idioma para a sua mensagem pernonalisada.</message>
-	<message key="gifts.myGifts">Meus Donativos</message>
-	<message key="gifts.manageMyGifts">Gerir Meus Donativos</message>
-	<message key="gifts.redeemGift">Resgatar Donativo</message>
-	<message key="gifts.status.notRedeemed">Disponível</message>
-	<message key="gifts.status.redeemed">Resgatadas</message>
-	<message key="gifts.status.redeemGift">Resgatar Donativo</message>
-	<message key="gifts.subscriptions">Subscrições</message>
-	<message key="gifts.subscriptionsDescription">A subscrição de donativo resgatado substituirá a sua actual subscrição (se possuir alguma). As subscrições têm início na data de resgate e serão válidas durante o período do tipo de subscrição.</message>
-	<message key="gifts.purchaseGiftSubscription">Fazer a subscrição de donativo</message>
-	<message key="gifts.giftSubscriptionsAvailable">As subscrições de donativos também estão disponíveis. As subscrições de donativos podem ser feitas em qualquer altura pelo destinatário e são uma excelente forma de apoiar esta revista.</message>
-	<message key="gifts.noSubscriptions">Nenhuma subscrição donativos</message>
-	<message key="gifts.giftRedeemed">O donativo foi resgatado com sucesso.</message>
-	<message key="gifts.noGiftToRedeem">O donativo não está disponível para resgate.</message>
-	<message key="gifts.giftAlreadyRedeemed">Este donativo já foi resgatado.</message>
-	<message key="gifts.giftNotValid">O donativo não é válido e não pode ser resgatado.</message>
-	<message key="gifts.subscriptionTypeNotValid">O tipo de subscrição para este donativo não é válida. Por favor contacte o gestor de assinaturas.</message>
-	<message key="gifts.subscriptionNonExpiring">O donativo não foi resgatado uma vez que possui uma assinatura vitalícia com esta revista.</message>
 	<message key="payment.loginRequired.forIssue">Subscrição ou compra de número necessários para acedero ao artigo. Para verificar a subscrição, aceda a compra anterior, ou compre número, faça login na revista.</message>
 	<message key="payment.type.purchaseIssue">Taxa Compra Número</message>
-	<message key="payment.type.gift">Donativo</message>
-	<message key="payment.type.gift.subscription">Subscrição</message>
 	<message key="installer.allowFileUploads"><![CDATA[O servidor actualmente permite uploads de ficheiros: <strong>{$allowFileUploads}</strong>]]></message>
 	<message key="installer.maxFileUploadSize"><![CDATA[O servidor actualmente permite o upload máximo de ficheiros com o tamanho de: <strong>{$maxFileUploadSize}</strong>]]></message>
 	<message key="site.upgradeAvailable.admin"><![CDATA[Está disponível uma nova versão do OJS! Actualmente usa a versão do OJS {$currentVersion}. A versão mais recente do OJS {$latestVersion}. Por favor visite <a href="http://pkp.sfu.ca/ojs_download" target="_new">this page</a> para fazer download da versão mais recente e encontre as instruções para a actualização]]></message>
@@ -943,31 +889,9 @@ Pode-se opcionalmente informar o motivo pelo qual está sendo desactivado o regi
 
 
 
-	<message key="dashboard.myQueue">Painel de Controlo</message>
 	<message key="editor.navigation.issues">Números</message>
 	<message key="editor.issues.futureIssues">Próximos</message>
 	<message key="editor.issues.backIssues">Anteriores</message>
-	<message key="navigation.settings">Definições</message>
-	<message key="navigation.access">Gestão de acessos</message>
-	<message key="navigation.tools">Ferramentas</message>
-	<message key="navigation.admin">Administrador</message>
-	<message key="navigation.viewFrontend">Previsualizar</message>
-	<message key="navigation.submissions">Submissões</message>
-	<message key="navigation.archives">Arquivo</message>
-	<message key="navigation.items.shownTotal">Total</message>
-	<message key="navigation.tools.importExport">Importar / exportar</message>
-	<message key="navigation.tools.statistics">Estatísticas</message>
-	<message key="submission.submit.newSubmissionSingle">Submeter</message>
-	<message key="submission.mySubmissions">As minhas submissões</message>
-	<message key="common.queue.long.myAssigned">As minhas tarefas</message>
-	<message key="grid.submission.itemTitle">Título</message>
-	<message key="workflow.stage">Estado</message>
-	<message key="workflow.review.externalReview">Revisão externa</message>
-	<message key="common.tasks">Tarefas ativas</message>
-	<message key="manager.website">Website</message>
-	<message key="manager.workflow">Fluxo de trabalho</message>
-	<message key="manager.distribution">Permissões</message>
-	<message key="manager.siteAccessOptions.siteAccessOptions">Opções de acesso</message>
 	<message key="submission.layout.galley.remotelyHostedContent">Esta edição estará disponível num site separado.</message>
 	<message key="submission.layout.galley.remoteURL">URL do conteúdo hospedado remotamente</message>
 	<message key="context.current">Revista Actual:</message>
@@ -1059,4 +983,14 @@ Setting up CLOCKSS support for Open Journal Systems does not need to take place
 	<message key="search.cli.rebuildIndex.indexing">Indexão "{$journalName}"</message>
 	<message key="search.cli.rebuildIndex.indexingByJournalNotSupported">A execução da pesquisa não permite a re-indexação por revista.</message>
 	<message key="search.cli.rebuildIndex.unknownJournal">O caminho fornecido "{$journalPath}" não pôde ser usado nesta revista.</message>
+	<message key="subscriptions.status.noSubscription">Não tem uma subscrição ativa.</message>
+	<message key="reader.purchasePrice">({$currency} {$price})</message>
+	<message key="manager.setup.porticoDescription">O Portico é um serviço sem fins lucrativos com vista à preservação de publicações digitais, incluindo revistas eletrónicas, e-books, e outras coleções históricas digitalizadas. Se a sua revista tiver um contrato com o Portico, poderá ativá-lo aqui:</message>
+	<message key="payment.type.publication.required">A taxa de publicação está em pagamento.</message>
+	<message key="payment.requestPublicationFee">Solicitar taxa de publicação ({$feeAmount})</message>
+	<message key="payment.notFound">Foi solicitado um pagamento, mas o prazo expirou. Contacte o Gestor da Revista para mais informação.</message>
+	<message key="navigation.subscriptions">Subscrições</message>
+	<message key="log.editor.submissionExpedited">{$editorName} tomou o processo de edição do artigo {$submissionId}.</message>
+	<message key="notification.type.publicationScheduled">Esta submissão foi agendada para publicação.</message>
+	<message key="log.editor.recommendation">O editor {$editorName} registou uma recomendação ({$decision}) para o artigo {$submissionId}.</message>
 </locale>
diff --git a/locale/pt_PT/manager.xml b/locale/pt_PT/manager.xml
index 53deb013d96..3801025e6b0 100644
--- a/locale/pt_PT/manager.xml
+++ b/locale/pt_PT/manager.xml
@@ -320,7 +320,6 @@
 	<message key="manager.subscriptionPolicies.expiryReminderAfterWeeks1">Notificar assinantes via e-mail</message>
 	<message key="manager.subscriptionPolicies.expiryReminderAfterWeeks2">semana(s) depois da expiração da subscrição.</message>
 	<message key="manager.subscriptionPolicies.expiryReminderBeforeWeeks1">Notificar assinantes via e-mail</message>
-	<message key="manager.subscriptionPolicies.expiryReminderBeforeWeeks2">semana(s) antes da expiração da subscrição.</message>
 	<message key="manager.subscriptionPolicies.expiryReminders">Lembretes de Expiração de Subscrição</message>
 	<message key="manager.subscriptionPolicies.expiryRemindersDescription">Lembretes automáticos via e-mail (editáveis nas configurações da revista por Editores-Gestores na área de E-mails Padrão) podem ser enviados aos subscritores tanto antes quanto após expiração da subscrição.</message>
 	<message key="manager.subscriptionPolicies.expiryRemindersDisabled"><![CDATA[<strong>Aviso:</strong> Para activar esta opção, o administrador do portal deverá activar a opção <tt>scheduled_tasks</tt> no ficheiro de configuração do sistema. Configurações adicionais no servidor podem ser necessárias para o funcionamento correcto da opção (que pode não ser possível em todos os servidores!), como indicado na documentação do sistema.]]></message>
@@ -543,9 +542,7 @@
 	<message key="manager.setup.clockssLicenseLabel">Descrição Licença CLOCKSS</message>
 	<message key="manager.statistics.reports.defaultReport.issuePageViews">Visualizações do sumário do número</message>
 	<message key="manager.subscriptionPolicies.enableSubscriptionExpiryReminderBeforeMonthsValid">Use a caixa de selecção fornecida.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderAfterMonths1">Notificar os assinantes por e-mail</message>
 	<message key="manager.subscriptionPolicies.expiryReminderAfterMonths2">mês(s)após caducidade da inscrição.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderBeforeMonths1">Notificar os assinantes por e-mail</message>
 	<message key="manager.subscriptionPolicies.expiryReminderBeforeMonths2">mês(s) antes da caducidade da inscrição.</message>
 	<message key="grid.category.path">Caminho</message>
 	<message key="grid.action.addSection">Adicionar Secção</message>

From c307ae71c470fcc8c49124c21b54a836915310e4 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 12 Apr 2018 11:20:19 -0700
Subject: [PATCH 076/100] Submodule update

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 76c3b5a7d38..1a080afd89e 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 76c3b5a7d38ab71b15d1afac17df6350e094d7f1
+Subproject commit 1a080afd89eb50871803972ec80b0ce0c961ba8b

From 74a528c24f43ef2de53c2a8d281752f01ab0781e Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 12 Apr 2018 11:20:51 -0700
Subject: [PATCH 077/100] Submodule updates

---
 plugins/generic/lensGalley | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/lensGalley b/plugins/generic/lensGalley
index 5a0465cfee3..90a78e8f3a6 160000
--- a/plugins/generic/lensGalley
+++ b/plugins/generic/lensGalley
@@ -1 +1 @@
-Subproject commit 5a0465cfee3193a4aae188ac89370b692952a82c
+Subproject commit 90a78e8f3a691d760b30d8fe0e44273c47e75875

From 1323ea5ab6c0757f06f3ab1e38a164ac315b8adf Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 12 Apr 2018 13:12:55 -0700
Subject: [PATCH 078/100] Submodule update

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 1a080afd89e..7a9d7eb70a9 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 1a080afd89eb50871803972ec80b0ce0c961ba8b
+Subproject commit 7a9d7eb70a97b5478b6f1a215b9bcad4f4224e7c

From 138fa42df43f8d1c77efcec3d037189df8e8400d Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Fri, 13 Apr 2018 15:08:02 +0100
Subject: [PATCH 079/100] pkp/pkp-lib#3589 Fix back-compat code for issue API
 params

---
 api/v1/issues/IssueHandler.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v1/issues/IssueHandler.inc.php b/api/v1/issues/IssueHandler.inc.php
index 61afa51d280..16b328529c6 100644
--- a/api/v1/issues/IssueHandler.inc.php
+++ b/api/v1/issues/IssueHandler.inc.php
@@ -134,8 +134,8 @@ public function getIssueList($slimRequest, $response, $args) {
 				case 'year':
 
 					// Support deprecated `year`, `number` and `volume` params
-					if (substr($param, -1) === 's') {
-						$param = substr($param, 0, -1);
+					if (substr($param, -1) !== 's') {
+						$param .= 's';
 					}
 
 					if (is_string($val) && strpos($val, ',') > -1) {

From 224c89de55667db93f4f927a056ddcc36ad6f863 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Fri, 13 Apr 2018 16:52:42 +0100
Subject: [PATCH 080/100] Finished PT translations

---
 locale/pt_PT/manager.xml                      |  35 +++--
 locale/pt_PT/submission.xml                   |   2 +
 plugins/auth/ldap/locale/pt_PT/locale.xml     |   2 +
 .../subscription/locale/pt_PT/locale.xml      |   6 +-
 .../generic/backup/locale/pt_PT/locale.xml    |  38 ++++++
 .../generic/browse/locale/pt_PT/locale.xml    |  34 +++++
 .../generic/lucene/locale/pt_PT/locale.xml    | 124 ++++++++++++++++++
 .../locale/pt_PT/locale.xml                   |  20 +++
 .../usageStats/locale/pt_PT/locale.xml        |  28 ++--
 .../native/locale/pt_PT/locale.xml            |   3 +
 .../paymethod/paypal/locale/pt_PT/locale.xml  |   6 +
 plugins/pubIds/doi/locale/pt_PT/locale.xml    |  13 +-
 .../subscriptions/locale/pt_PT/locale.xml     |  19 +++
 13 files changed, 295 insertions(+), 35 deletions(-)
 create mode 100644 plugins/generic/backup/locale/pt_PT/locale.xml
 create mode 100644 plugins/generic/browse/locale/pt_PT/locale.xml
 create mode 100644 plugins/generic/lucene/locale/pt_PT/locale.xml
 create mode 100644 plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
 create mode 100644 plugins/reports/subscriptions/locale/pt_PT/locale.xml

diff --git a/locale/pt_PT/manager.xml b/locale/pt_PT/manager.xml
index 3801025e6b0..5d2e157fda7 100644
--- a/locale/pt_PT/manager.xml
+++ b/locale/pt_PT/manager.xml
@@ -57,7 +57,7 @@
 	<message key="manager.payment.readerFees">Taxas para Leitores</message>
 	<message key="manager.payment.readerFeesDescription">As opções definidas (bem como as descrições, que podem ser alteradas, e as taxas) serão exibidas na secção Políticas Sobre da revista, assim como nos locais onde pagamento é exigido.</message>
 	<message key="manager.payment.records">Registos</message>
-	<message key="manager.payments">Formas de Pagamento</message>
+	<message key="manager.payments">Pagamentos</message>
 	<message key="manager.payment.userName">Utilizador</message>
 	<message key="manager.people.allEnrolledUsers">Utilizadores registados nesta revista</message>
 	<message key="manager.people.allJournals">Todas as Revistas</message>
@@ -141,7 +141,7 @@
 	<message key="manager.setup.enableAnnouncementsHomepage1">Mostrar</message>
 	<message key="manager.setup.enableAnnouncementsHomepage2">das notícias mais recentes na página inicial da revista.</message>
 	<message key="manager.setup.enableUserRegistration">Utilizadores podem se registar numa revista, assumindo um ou mais papéis, listados a seguir:</message>
-	<message key="manager.setup.focusAndScope">Enfoque</message>
+	<message key="manager.setup.focusAndScope">Foco e Âmbito</message>
 	<message key="manager.setup.forAuthorsToIndexTheirWork">Indexação da submissão</message>
 	<message key="manager.setup.forAuthorsToIndexTheirWorkDescription"><![CDATA[O sistema adopta o Protocolo para Recolha de Metadados do <a href="http://www.openarchives.org/" target="_blank">Open Archives Initiative</a>, que é um padrão emergente para proporcionar acesso com base na indexação a recursos electrónicos de pesquisa numa escala global. Os autores farão uso de um padrão similar para incluir os metadados da submissão. O Director da revista deverá escolher as categorias para indexação e apresentar aos autores exemplos relevantes para auxiliá-los na indexação, separando os termos com ponto-e-vírgula (Ex.: termo1; termo2). Os termos deverão ser fornecidos como exemplos, utilizando as expressões "Ex." ou "Por exemplo,".]]></message>
 	<message key="manager.setup.form.contactEmailRequired">É obrigatório e-mail do contacto principal!</message>
@@ -317,9 +317,6 @@
 	<message key="manager.subscriptionPolicies.expiryFullDescription">Leitores perdem acesso a todo o conteúdo exclusivo a subscritores na data de expiração.</message>
 	<message key="manager.subscriptionPolicies.expiryPartial">Expiração parcial</message>
 	<message key="manager.subscriptionPolicies.expiryPartialDescription">Leitores mantêm acesso apenas a conteúdo publicado anteriormente à expiração. Novas publicações não permitirão acesso a conteúdo exclusivo a subscritores.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderAfterWeeks1">Notificar assinantes via e-mail</message>
-	<message key="manager.subscriptionPolicies.expiryReminderAfterWeeks2">semana(s) depois da expiração da subscrição.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderBeforeWeeks1">Notificar assinantes via e-mail</message>
 	<message key="manager.subscriptionPolicies.expiryReminders">Lembretes de Expiração de Subscrição</message>
 	<message key="manager.subscriptionPolicies.expiryRemindersDescription">Lembretes automáticos via e-mail (editáveis nas configurações da revista por Editores-Gestores na área de E-mails Padrão) podem ser enviados aos subscritores tanto antes quanto após expiração da subscrição.</message>
 	<message key="manager.subscriptionPolicies.expiryRemindersDisabled"><![CDATA[<strong>Aviso:</strong> Para activar esta opção, o administrador do portal deverá activar a opção <tt>scheduled_tasks</tt> no ficheiro de configuração do sistema. Configurações adicionais no servidor podem ser necessárias para o funcionamento correcto da opção (que pode não ser possível em todos os servidores!), como indicado na documentação do sistema.]]></message>
@@ -338,7 +335,6 @@
 	<message key="manager.subscriptionPolicies.subscriptionContact">Gestor de Subscrições</message>
 	<message key="manager.subscriptionPolicies.subscriptionContactDescription">O contacto a seguir será exibido em Subscrições, em Sobre a Revista.</message>
 	<message key="manager.subscriptionPolicies.subscriptionContactEmailValid">Forneça um e-mail válido.</message>
-	<message key="manager.subscriptionPolicies.subscriptionPoliciesSaved">As políticas de subscrição foram actualizadas.</message>
 	<message key="manager.subscriptions">Subscrições</message>
 	<message key="manager.subscriptions.confirmDelete">Deseja realmente eliminar esta subscrição?</message>
 	<message key="manager.subscriptions.create">Criar Novo Subscritor</message>
@@ -475,7 +471,6 @@
 	<message key="manager.subscriptionTypes.form.individual">Individual (utilizadores validados via autenticação)</message>
 	<message key="manager.subscriptionTypes.form.options">Opções</message>
 	<message key="manager.language.submissions">Submissões</message>
-	<message key="manager.payment.options.acceptGiftSubscriptionPayments">Esta acção activará os pagamentos para a assinatura de donativos, permitindo aos leitores oferecer assinaturas a outros leitores.</message>
 	<message key="manager.payment.options.purchaseIssueFee">Comprar Número</message>
 	<message key="manager.sections.confirmDelete">Tem a certeza que pretende eliminar permanentemente esta secção?</message>
 	<message key="manager.sections.alertDelete">Antes de ser eliminada esta secção, tem de remover os artigos publicados noutras secções.</message>
@@ -512,7 +507,7 @@
 	<message key="plugins.importexport.common.register.success">Registo com sucesso!</message>
 	<message key="manager.website.archiving">Arquivamento</message>
 	<message key="manager.section.noSectionEditors"><![CDATA[Ainda não existem Editores de Secção. Associe este papel a pelo menos um utilizador através da Administração>Configurações> Utilizadores& amp; Papéis em primeiro lugar.]]></message>
-	<message key="manager.setup.masthead">Masthead</message>
+	<message key="manager.setup.masthead">Título</message>
 	<message key="manager.setup.editorialTeam">Equipa Editorial</message>
 	<message key="manager.setup.editorialTeam.description">Lista de editores, diretores e outras pessoas associados à revista.</message>
 	<message key="manager.setup.homepageContent">Conteúdo da HomePage da Revista</message>
@@ -542,8 +537,6 @@
 	<message key="manager.setup.clockssLicenseLabel">Descrição Licença CLOCKSS</message>
 	<message key="manager.statistics.reports.defaultReport.issuePageViews">Visualizações do sumário do número</message>
 	<message key="manager.subscriptionPolicies.enableSubscriptionExpiryReminderBeforeMonthsValid">Use a caixa de selecção fornecida.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderAfterMonths2">mês(s)após caducidade da inscrição.</message>
-	<message key="manager.subscriptionPolicies.expiryReminderBeforeMonths2">mês(s) antes da caducidade da inscrição.</message>
 	<message key="grid.category.path">Caminho</message>
 	<message key="grid.action.addSection">Adicionar Secção</message>
 	<message key="manager.setup.section.description">Os artigos que integram números publicados numa revista são organizados em Secções, tipicamente por tema ou tipo de conteúdo (por exemplo, artigos revistos, pesquisa, etc.).</message>
@@ -581,4 +574,26 @@
 	<message key="manager.setup.clockssRegister"><![CDATA[Inscreva-se no serviço CLOCKSS visitando <a href="http://clockss.org/" target="_blank">o site CLOCKSS</a>.]]></message>
 	<message key="manager.setup.clockssTitle">CLOCKSS</message>
 	<message key="manager.setup.Issn">ISSN</message>
+	<message key="manager.paymentTypes">Formas de Pagamento</message>
+	<message key="manager.setup.plnPluginEnable">Plugin PKP PN ativo</message>
+	<message key="subscriptionManager.subscription.confirmRemove">Deseja realmente apagar esta subscrição?</message>
+	<message key="plugins.importexport.common.validation">Validar o XML antes de exportar e registar.</message>
+	<message key="plugins.importexport.common.export.error.inputFileNotReadable">Ficheiro de entrada {$param} não é legível.</message>
+	<message key="manager.navigationMenus.subscriptions.description">Ligação para uma página a descrever as subscrições disponíveis.</message>
+	<message key="manager.navigationMenus.mySubscriptions.description">Ligação para uma página a descrever as subscrições atuais e anteriores do visitante.</message>
+	<message key="manager.navigationMenus.mySubscriptions.conditionalWarning">Esta ligação só será apresentada quando um visitante estiver autenticado.</message>
+	<message key="manager.subscriptionPolicies.xMonths">{$x} Meses</message>
+	<message key="manager.subscriptionPolicies.xWeeks">{$x} Semanas</message>
+	<message key="manager.subscriptions.confirmRenew">Confirma a renovação desta subscrição?</message>
+	<message key="manager.subscriptionPolicies.expiryReminderAfterMonths">Notificar os subscritores por email após expiração da subscrição</message>
+	<message key="manager.subscriptionPolicies.expiryReminderAfterWeeks">Notificar os subscritores por email após expiração da subscrição</message>
+	<message key="manager.subscriptionPolicies.expiryReminderBeforeMonths">Notificar os subscritores por email antes da expiração da subscrição.</message>
+	<message key="manager.subscriptionPolicies.expiryReminderBeforeWeeks">Notificar os subscritores por email antes da expiração da subscrição.</message>
+	<message key="manager.setup.plnDescription">A Rede de Preservação do PKP (PKP PN) providencia serviços gratuitos de preservação para qualquer revista OJS que cumpra um conjunto básico de critérios.</message>
+	<message key="manager.setup.plnSettingsDescription">Clique na ligação Configurações para aceitar os termos de uso para o PKP PN.</message>
+	<message key="manager.setup.otherLockss">Opções Alternativas de Arquivo</message>
+	<message key="manager.setup.plnPluginArchiving">Rede de Preservação PKP (PKP PN)</message>
+	<message key="manager.setup.plnPluginNotInstalled">A Rede de Preservação do PKP (PKP PN) providencia serviços gratuitos de preservação para qualquer revista OJS que cumpra um conjunto básico de critérios O plugin PKP PN para OJS 3 está em desenvolvimento e ficará disponível na galeria de plugins em breve.</message>
+	<message key="manager.setup.porticoEnable">Ative o Portico para armazenar e distribuir os conteúdos da revista às bibliotecas participantes no Portico.</message>
+	<message key="manager.setup.porticoTitle">Portico</message>
 </locale>
diff --git a/locale/pt_PT/submission.xml b/locale/pt_PT/submission.xml
index 42f4aef061b..d7d7bf5ed9a 100644
--- a/locale/pt_PT/submission.xml
+++ b/locale/pt_PT/submission.xml
@@ -72,4 +72,6 @@
 	<message key="submission.citationFormat.notFound">O formato de citação solicitado não pôde ser recuperado.</message>
 	<message key="submission.metadataDescription">Estas especificações são baseadas no conjunto de metadados Dublin Core, um padrão internacional usado para descrever o conteúdo da revista.</message>
 	<message key="section.any">Qualquer Secção</message>
+	<message key="submission.submit.form.wordCountAlert">O seu resumo é demasiado longo. Por favor encurte-o de modo a conter menos palavras do que as indicadas abaixo para esta secção.</message>
+	<message key="submission.abstract.wordCount.description">O resumo deverá ter no máximo {$wordCount} palavras.</message>
 </locale>
diff --git a/plugins/auth/ldap/locale/pt_PT/locale.xml b/plugins/auth/ldap/locale/pt_PT/locale.xml
index 57a6f35fbc5..a34699f10a9 100644
--- a/plugins/auth/ldap/locale/pt_PT/locale.xml
+++ b/plugins/auth/ldap/locale/pt_PT/locale.xml
@@ -36,4 +36,6 @@
 	<message key="plugins.auth.ldap.settings.saslprop">Propriedades de Segurança SASL</message>
 	<message key="plugins.auth.ldap.settings.uid">Atributo do nome da conta</message>
 	<message key="plugins.auth.ldap.settings.uid.description">O atributo cujo valor identifica unicamente o objecto do utilizador, tais como uid ou vc ou sAMAccountName.</message>
+	<message key="plugins.auth.ldap.settings.pwhash.description"><![CDATA[Formato de <em>hash</em> usado no servidor para armazenas as senhas. É recomendado o SSHA.]]></message>
+	<message key="plugins.auth.ldap.settings.sasl">Use SASL em vez da autenticação simples</message>
 </locale>
diff --git a/plugins/blocks/subscription/locale/pt_PT/locale.xml b/plugins/blocks/subscription/locale/pt_PT/locale.xml
index 6bbe1e9d0f7..a6199c05d85 100644
--- a/plugins/blocks/subscription/locale/pt_PT/locale.xml
+++ b/plugins/blocks/subscription/locale/pt_PT/locale.xml
@@ -18,8 +18,10 @@
 	<message key="plugins.block.subscription.description">Este plugin oferece informações sobre a subscrição nas barras laterais.</message>
 	<message key="plugins.block.subscription.blockTitle">Subscrição</message>
 	<message key="plugins.block.subscription.expires">Expiração</message>
-	<message key="plugins.block.subscription.providedBy">Acesso fornecido por:</message>
-	<message key="plugins.block.subscription.comingFromIP">IP de proveniência:</message>
+	<message key="plugins.block.subscription.providedBy">Acesso fornecido por: {$institutionName}</message>
+	<message key="plugins.block.subscription.comingFromIP">IP de proveniência: {$ip}</message>
 	<message key="plugins.block.subscription.about">Subscrições</message>
 	<message key="plugins.block.subscription.loginToVerifySubscription">Aceda ao sistema para verificar a sua subscrição</message>
+	<message key="plugins.block.subscription.subscriptionRequired">É necessária uma subscrição para aceder a alguns recursos.</message>
+	<message key="plugins.block.subscription.subscriptionRequired.learnMore">Saber Mais</message>
 </locale>
diff --git a/plugins/generic/backup/locale/pt_PT/locale.xml b/plugins/generic/backup/locale/pt_PT/locale.xml
new file mode 100644
index 00000000000..27736e6f174
--- /dev/null
+++ b/plugins/generic/backup/locale/pt_PT/locale.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="plugins.generic.backup.name">Plugin de Cópias de Segurança</message>
+	<message key="plugins.generic.backup.description">Este plugin cria uma cópia de segurança da instalação.</message>
+	<message key="plugins.generic.backup.link">Download da Cópia de Segurança</message>
+	<message key="plugins.generic.backup.longdescription"><![CDATA[<p>As ligações seguintes permitem ao Administrador do Sítio descarregar uma cópia de segurança completa dos vários componentes de uma instalação. Uma cópia de segurança completa inclui <strong>todos</strong> os seguintes componentes. Consulte a documentação técnica para mais informação de como estes componentes se inter-relacionam.</p>]]></message>
+	<message key="plugins.generic.backup.db">Base de Dados</message>
+	<message key="plugins.generic.backup.files">Ficheiros</message>
+	<message key="plugins.generic.backup.code">Código</message>
+	<message key="plugins.generic.backup.db.config"><![CDATA[{$footNoteNum}. <strong>AVISO:</strong> A ferramenta responsável por criar a cópia de segurança da base de dados não foi configurada no ficheiro config.inc.php. A configuração irá depender da configuração do seu servidor e do tipo de base de dados que usa. Deve ser especificado na secção denominada  [cli], numa opção de configuração chamada  "dump". Para uma base de dados  MySQL, use a ferramenta mysqldump:<br />
+<pre>[cli]
+dump = "/usr/bin/mysqldump -h %s -u %s -p%s %s"
+</pre>
+Os "%s" serão substituídos, por ordem:<ol>
+	<li>Nome do servidor da base de dados</li>
+	<li>Nome do utilizador da base de dados</li>
+	<li>Senha para o utilizador na base de dados</li>
+	<li>Nome da base de dados</li>
+</ol>
+Note que este processo necessita de indicar a senha na linha de comando, o que pode ser um problema de segurança.<br /><br />]]></message>
+	<message key="plugins.generic.backup.tar.config"><![CDATA[{$footNoteNum}. <strong>AVISO:</strong> A ferramenta "tar" não foi configurada no ficheiro de configuração  config.inc.php. A configuração irá depender da configuração do seu servidor, pelo que o deverá especificar numa secção denominada [cli], numa opção de configuração chamada "tar", especificando o caminho completo para esta ferramenta:<br />
+<pre>[cli]
+tar = "/bin/tar"
+</pre><br />]]></message>
+	<message key="plugins.generic.backup.failure"><![CDATA[<strong>AVISO:</strong> Deverá ter ocorrido um erro durante o processo de criação da cópia de segurança. A causa mais provável será a inexistência de permissões para armazenar o ficheiro.]]></message>
+</locale>
diff --git a/plugins/generic/browse/locale/pt_PT/locale.xml b/plugins/generic/browse/locale/pt_PT/locale.xml
new file mode 100644
index 00000000000..6711dbb299a
--- /dev/null
+++ b/plugins/generic/browse/locale/pt_PT/locale.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="plugins.generic.browse.displayName">Navegar</message>
+	<message key="plugins.generic.browse.description">Este plugin permite navegar por secções e/ou os seus tipos de identificação.</message>
+	<message key="plugins.generic.browse.manager.settings.excludedSections">Secções Excluídas</message>
+	<message key="plugins.generic.browse.search.sectionIndex">Navegar o Índice de Secções</message>
+	<message key="plugins.generic.browse.search.identifyTypeDetails">Detalhes do Tipo de Identificação</message>
+	<message key="plugins.generic.browse.manager.settings">Configurações</message>
+	<message key="plugins.generic.browse.manager.settings.description">Por favor configure as seguintes possibilidades de navegação:</message>
+	<message key="plugins.generic.browse.manager.settings.browseSettings">Configurações de Navegação</message>
+	<message key="plugins.generic.browse.manager.settings.browse">Navegar</message>
+	<message key="plugins.generic.browse.manager.settings.browseByObjects">Escolha os objetos pelos quais deverá ser possível navegar.</message>
+	<message key="plugins.generic.browse.manager.settings.enableBrowseBySections">Por Secção</message>
+	<message key="plugins.generic.browse.manager.settings.enableBrowseByIdentifyTypes">Por Tipo de Identificação</message>
+	<message key="plugins.generic.browse.manager.settings.excludedSections.description">Escolha as secções que não deverão ser consideradas.</message>
+	<message key="plugins.generic.browse.manager.settings.excludedIdentifyTypes">Tipos de Identificação Excluídos</message>
+	<message key="plugins.generic.browse.manager.settings.excludedIdentifyTypes.description">Escolha os tipos de identificação que não devem ser considerados.</message>
+	<message key="plugins.generic.browse.search.sections">Por Secções</message>
+	<message key="plugins.generic.browse.search.sectionDetails">Detalhes de Secção</message>
+	<message key="plugins.generic.browse.search.identifyTypes">Por Tipos de Identificação</message>
+	<message key="plugins.generic.browse.search.identifyTypeIndex">Navegar Índice de Tipos de Identificação</message>
+</locale>
diff --git a/plugins/generic/lucene/locale/pt_PT/locale.xml b/plugins/generic/lucene/locale/pt_PT/locale.xml
new file mode 100644
index 00000000000..3f63de4caef
--- /dev/null
+++ b/plugins/generic/lucene/locale/pt_PT/locale.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="plugins.generic.lucene.displayName">Plugin de Pesquisa Lucene</message>
+	<message key="plugins.generic.lucene.faceting.title">refine a sua pesquisa</message>
+	<message key="plugins.generic.lucene.faceting.type">Método/Abordagem</message>
+	<message key="plugins.generic.lucene.faceting.coverage">Cobertura</message>
+	<message key="plugins.generic.lucene.faceting.journalTitle">Revista</message>
+	<message key="plugins.generic.lucene.faceting.authors">Autor</message>
+	<message key="plugins.generic.lucene.faceting.publicationDate">Data de Publicação</message>
+	<message key="plugins.generic.lucene.settings.indexRebuild">Reindexar</message>
+	<message key="plugins.generic.lucene.settings.startServer">Iniciar Servidor</message>
+	<message key="plugins.generic.lucene.settings.stopServer">Parar Servidor</message>
+	<message key="plugins.generic.lucene.settings.usageStatistics">Estatísticas de Uso</message>
+	<message key="plugins.generic.lucene.settings.username">Utilizador</message>
+	<message key="plugins.generic.lucene.sectionForm.ranking.never">Nunca Mostrar</message>
+	<message key="plugins.generic.lucene.sectionForm.ranking.low">Menos Prioridade</message>
+	<message key="plugins.generic.lucene.sectionForm.ranking.normal">Prioridade Normal</message>
+	<message key="plugins.generic.lucene.sectionForm.ranking.high">Mais Prioridade</message>
+	<message key="plugins.generic.lucene.settings.searchFeatures">Configuração de Funcionalidades de Pesquisa</message>
+	<message key="plugins.generic.lucene.description">O plugin Lucene permite suporte multi-língua, resultados de pesquisa com maior relevância, indexação mais rápida, mais escalabilidade, entre outras vantagens.</message>
+	<message key="plugins.generic.lucene.faceting.discipline">Área do Conhecimento</message>
+	<message key="plugins.generic.lucene.faceting.subject">Palavra-Chave</message>
+	<message key="plugins.generic.lucene.message.coreNotFound">O núcleo solicitado '{$core}' não foi encontrado no servidor Solr. Está disponível?</message>
+	<message key="plugins.generic.lucene.message.indexingIncomplete">Ocorreu um erro durante a indexação: processados {$numProcessed} de um conjunto de {$batchCount} ({$numDeleted} documentos apagados neste conjunto).</message>
+	<message key="plugins.generic.lucene.settings.usernameInstructions">O servidor Solr usa autenticação HTTP BASIC. Introduza o nome do utilizador.</message>
+	<message key="plugins.generic.lucene.settings.usernameRequired">Introduza um nome de utilizador válido para autenticar no servidor Solr (o carácter ':' não é permitido).</message>
+	<message key="plugins.generic.lucene.sectionForm.rankingBoost">Peso de Ordenação Personalizado</message>
+	<message key="plugins.generic.lucene.results.didYouMean">Quereria dizer</message>
+	<message key="plugins.generic.lucene.settings">Configurações</message>
+	<message key="plugins.generic.lucene.settings.customRanking">Ordenação Personalizada (permite indicar pesos diferentes para cada secção da revista)</message>
+	<message key="plugins.generic.lucene.settings.faceting">Facetas (apresenta uma caixa de navegação com filtros adicionais para refinar a pesquisa)</message>
+	<message key="plugins.generic.lucene.settings.indexRebuildJournal">Reindexar a revista "{$journalName}"</message>
+	<message key="plugins.generic.lucene.settings.internalError">Seleção inválida.</message>
+	<message key="plugins.generic.lucene.settings.password">Senha</message>
+	<message key="plugins.generic.lucene.settings.passwordInstructions">Introduza a senha do servidor Solr.</message>
+	<message key="plugins.generic.lucene.settings.solrServerSettings">Configurações do servidor Solr</message>
+	<message key="plugins.generic.lucene.settings.spellcheck">Sugestões Alternativas de Correção Ortográfica (mostra termos de pesquisa alternativos)</message>
+	<message key="plugins.generic.lucene.message.indexOnline">Índice com {$numDocs} documentos disponíveis.</message>
+	<message key="plugins.generic.lucene.message.pullIndexingDisabled"><![CDATA[Mecanismo para solicitar indexação (<em>pull indexing</em>) não está ativo, pelo que o deverá ativar nas configurações do plugin.]]></message>
+	<message key="plugins.generic.lucene.message.webServiceError">O serviço web do Lucene retornou um erro.</message>
+	<message key="plugins.generic.lucene.settings.autosuggest">Auto-Sugerir (mostra uma caixa dinâmica com sugestões de termos de pesquisa, enquanto se introduz a expressão de pesquisa)</message>
+	<message key="plugins.generic.lucene.settings.highlighting">Realces (apresenta um pequeno excerto de cada artigo que contenha as palavras pesquisadas)</message>
+	<message key="plugins.generic.lucene.settings.indexRebuildAllJournals">Reindexar todas as revistas</message>
+	<message key="plugins.generic.lucene.settings.pullIndexing"><![CDATA[Indexação Remota (<em>Pull indexing</em>, é uma funcionalidade avançada. Leia o README para mais informação)]]></message>
+	<message key="plugins.generic.lucene.settings.startStopServer">Administração do Servidor Solr</message>
+	<message key="plugins.generic.lucene.message.searchServiceOffline">Infelizmente o serviço de pesquisa OJS está atualmente incontactável.</message>
+	<message key="plugins.generic.lucene.message.techAdminInformed">O técnico desta revista foi informado sobre este problema.</message>
+	<message key="plugins.generic.lucene.rebuildIndex.couldNotDeleteFieldCache">Não foi possível apagar a cache. Por favor execute  'rm cache/fc-plugins-lucene-fieldCache.php' manualmente, com as permissões apropriadas.</message>
+	<message key="plugins.generic.lucene.rebuildIndex.rebuildDictionaries">A reindexar os dicionários</message>
+	<message key="plugins.generic.lucene.settings.instId">ID de Instalação Único</message>
+	<message key="plugins.generic.lucene.settings.luceneSettings">Plugin Lucene: Configurações</message>
+	<message key="plugins.generic.lucene.rebuildIndex.pullResult">{$numMarked} artigos marcados para serem atualizados</message>
+	<message key="plugins.generic.lucene.rebuildIndex.updateBoostFile">A atualizar dados estatísticos de uso</message>
+	<message key="plugins.generic.lucene.results.syntaxInstructions"><![CDATA[Dicas de pesquisa: <ul>
+			<li>Os termos de pesquisa tanto podem ser escritos em maiúsculas como em minúsculas</li>
+			<li>Palavras demasiado comuns são ignoradas</li>
+			<li>Por omissão, qualquer artigo que inclua  <em>qualquer</em> termo da expressão de pesquisa é retornado  (ou seja., é implícita o uso de <em>OR</em> (ou))</li>
+			<li>Garanta que a palavra existe no artigo colocando-lhe, como prefixo, o símbolo <strong>+</strong>; e.g., <em>+revista +acesso escolar academico</em> garantirá que pelo menos <em>revista</em> e <em>acesso</em> existem em todos os documentos retornados</li>
+			<li>Combine múltiplas palavras com <em>AND</em> (e) para encontrar artigos que inclua todos os termos; e.g., <em>educação AND investigação</em></li>
+			<li>Exclua uma palavra colocando-lhe, como prefixo, o símbolo <strong>-</strong> ou <em>NOT</em> (não); e.g., <em>online -política</em> ou <em>online NOT política</em></li>
+			<li>Procure uma expressão específica colocando-a entre aspas; e.g., <em>"publicação de acesso aberto"</em>. Dica: colocar palavras Chinesas ou Japonesas entre aspas  irá ajudá-lo a encontrar essas palavras exatas, e.g. "中国".</li>
+			<li>Use parêntesis para criar pesquisas mais complexas; e.g., <em>arquivo ((revista AND conferência) NOT tese)</em></li>
+		 </ul>]]></message>
+	<message key="plugins.generic.lucene.settings.autosuggestTypeExplanation"><![CDATA[<strong>Verificar termos para resultados</strong>: Sugerir termos que produzam, realmente, resultados. As sugestões serão validadas e cruzadas sobre a revista atual e os termos introduzidos noutros campos de pesquisa<br />
+		<strong>Usar  dicionário global</strong>: Esta abordagem é mais rápida e consome menos recursos no servidor de pesquisa, pelo que escala melhor, no caso de ter muitas revistas e edições. As sugestões poderão, no entanto, ter termos irrelevantes, e.g., obtidos de outras revistas, ou termos que não produzirão quaisquer resultados.]]></message>
+	<message key="plugins.generic.lucene.settings.autosuggestTypeFaceting">Verificar termos para resultados</message>
+	<message key="plugins.generic.lucene.settings.autosuggestTypeSuggester">Usar dicionário global</message>
+	<message key="plugins.generic.lucene.settings.description"><![CDATA[O plugin Lucene aceder a um índice de pesquisa Lucene através de um servidor Solr. Esta página de configuração permite configurar o acesso ao servidor Solr. <strong>Tenha em atenção o README do plugin (plugins/generic/lucene/README) antes de tentar mudar a configuração pré-definida.</strong>  Se está a usar uma situação embebida, por trás de uma <em>firewall</em>, como explicado no README, então provavelmente poderá deixar os parâmetros de configuração pré-definidos.]]></message>
+	<message key="plugins.generic.lucene.settings.dictionaryRebuild">Recalcular dicionários</message>
+	<message key="plugins.generic.lucene.settings.facetingSelectCategory">Pode escolher uma categoria específica de faceta (os metadados correspondentes devem ser selecionados para indexação, no passo 3.4 da configuração da revista).</message>
+	<message key="plugins.generic.lucene.settings.featureDescription">O plugin Lucene permite várias funcionalidades opcionais de pesquisa. A maior parte destas funcionalidades vêm pré-ativadas, mas podem ser desativadas ou reconfiguradas.</message>
+	<message key="plugins.generic.lucene.settings.indexAdministration">Administração de Índices</message>
+	<message key="plugins.generic.lucene.settings.indexRebuild.confirm">Recalcular o índice e/ou os dicionários podem demorar bastante tempo. Deseja continuar o processo?</message>
+	<message key="plugins.generic.lucene.settings.indexRebuildDescription">Se o índice do Lucene se tornar desatualizado ou corrompido, poderá reindexar os seus dados, por revista, ou para todas as revistas desta instalação. Os dicionários devem ser recalculados após grandes indexações quando usa as funcionalidades de auto-sugestões ou sugestões ortográficas. (Veja plugins/generic/lucene/README para detalhes e formas de automatizar estes processos.)</message>
+	<message key="plugins.generic.lucene.settings.indexRebuildMessages">Resultado da última reindexação:</message>
+	<message key="plugins.generic.lucene.settings.instantSearch">Pesquisa instantânea (retorna resultados de pesquisa instantâneos enquanto o utilizador digita a expressão de pesquisa - nota: usa recursos consideráveis do servidor)</message>
+	<message key="plugins.generic.lucene.settings.instIdRequired">Introduza um ID que identifique unicamente esta instalação OJS no servidor de pesquisa Solr.</message>
+	<message key="plugins.generic.lucene.settings.instIdInstructions">Se usar um servidor de pesquisa central, então terá de providenciar um ID único de instalação para cada instalação de OJS que use o mesmo serviço de pesquisa. Este identificador pode ser texto arbitrário, mas deverá ser diferente para cada servidor OJS (e.g., o endereço IP estático, se tiver uma instalação OJS em cada servidor).</message>
+	<message key="plugins.generic.lucene.settings.passwordRequired">Introduza uma senha válida para autenticar no servidor de pesquisa Solr.</message>
+	<message key="plugins.generic.lucene.settings.rankingByMetricEnabled">Ordenação por Estatística de Uso (Os seus dados estatísticos '{$metricName}' serão usados para influenciar a ordenação de resultados).</message>
+	<message key="plugins.generic.lucene.settings.rankingByMetricDisabled">Ordenação por Estatísticas de Uso (ative pelo menos um plugin de estatística/relatórios e selecione uma "métrica principal" nas configurações do website, para tivar esta opção)</message>
+	<message key="plugins.generic.lucene.settings.searchEndpoint">URL de Pesquisa (endpoint)</message>
+	<message key="plugins.generic.lucene.settings.searchEndpointInstructions"><![CDATA[O URL de pesquisa <em>endpoint</em> consiste no URL do servidor e de um manipulador de pesquisas. Veja o exemplo pré-definido. Só precisa de o alterar se estiver a usar um servidor centralizado de pesquisa.]]></message>
+	<message key="plugins.generic.lucene.settings.searchEndpointRequired"><![CDATA[Introduza um URL válido que represente o <em>endpoint</em> de pesquisa (servidor de pesquisa Solr e manipulador de pesquisa) ao qual se pretende ligar.]]></message>
+	<message key="plugins.generic.lucene.settings.serverNotAvailable"><![CDATA[Neste momento não é possível administrar o servidor Solr a partir da interface web.<br/>
+		<br/>
+		Possíveis razões são:
+		<ul>
+			<li>Pode não ter um servidor embebido instalado nesta instância de OJS  (veja 'plugins/generic/lucene/README' para detalhes).</li>
+			<li>A instalação do seu servidor embebido pode estar incompleta. Verifique que as pastas 'plugins/generic/lucene/lib/solr' e 'plugins/generic/lucene/lib/jetty' realmente contêm (ou apontam para) os ficheiros de instalação solr/jetty.</li>
+			<li>Os ficheiros de administração do servidor 'start.sh', 'stop.sh' e 'check.sh' na pasta 'plugins/generic/lucene/embedded/bin' podem não ser executáveis. Valide as permissões destes ficheiros.</li>
+			<li>Os ficheiros em 'files/lucene/' não têm permissões de escrita pelo utilizador do seu servidor web. Valide as permissões destes ficheiros.</li>
+			<li>Um processo embebido Solr pode já estar a ser executado com um utilizador diferente, o que quererá dizer que não poderá manipular o processo a partir do PHP.</li>
+			<li>A sua configuração de  PHP pode não permitir a execução de programas. Verifique as opções  'safe_mode' e 'disabled_function'  no seu  php.ini. Se não tiver acesso ao seu php.ini, então terá de executar manualmente estes programas para iniciar ou parar o servidor.</li>
+		</ul>]]></message>
+	<message key="plugins.generic.lucene.settings.simdocs">Mais-Como-Este (apresenta uma ligação de "documentos similares" para cada resultado de pesquisa)</message>
+	<message key="plugins.generic.lucene.settings.sortingByMetricEnabled">Ordenação por Estatística de Uso (Os seus dados estatísticos '{$metricName}' serão usados para ordenar por popularidade)</message>
+	<message key="plugins.generic.lucene.settings.sortingByMetricDisabled">Ordenação por Estatística de Uso (ative pelo menos um plugin de estatística ou de relatório e selecione uma "métrica principal" nas configurações do website para ativar esta opção)</message>
+	<message key="plugins.generic.lucene.settings.updateBoostFile">Atualizar Dados de Ordenação</message>
+	<message key="plugins.generic.lucene.settings.updateBoostFileDescription">As estatísticas de uso devem ser copiadas, regularmente, para o servidor Solr (diariamente ou mensalmente, de acordo com quão frequentemente atualiza as suas estatísticas). Para isso, use o botão em cima. Também poderá automatizar esta tarefa (veja 'plugins/generic/lucene/README' para mais informação);</message>
+	<message key="plugins.generic.lucene.settings.updateBoostFileDisabled"><![CDATA[As estatísticas de uso devem ser copiadas regularmente para o servidor Solr.  Neste momento não é possível atualizar as estatísticas a partir da interface web..<br/>
+		<br/>
+		Possíveis razões são:
+		<ul>
+			<li>Se estiver a usar <em>pull indexing</em>, o processo agendado via cron no servidor remoto  ("pull.sh") irá atualizar automaticamente as estatísticas sempre que for executado  (veja 'plugins/generic/lucene/README' para mais informação).</li>
+			<li>O seu servidor web pode não ter permissões de escrita na pasta  'files/lucene/data'. Garanta que ambos, o servidor web e o servidor solr, têm acesso a esta pasta, e recarregue esta página.</li>
+		</ul>]]></message>
+	<message key="plugins.generic.lucene.settings.useProxySettings">Configurações de proxy</message>
+	<message key="plugins.generic.lucene.settings.useProxySettingsInstructions">Use configurações de proxy do ficheiro config.inc.php para os pedidos ao serviço web Solr.</message>
+	<message key="plugins.generic.lucene.sectionForm.rankingBoostInstructions">O plugin Lucene/Solr permite-lhe ajustar o peso relativo dos artigos na lista de resultados para uma pesquisa específica. Aumentar ou diminuir o peso não coloca diretamente um artigo mais acima (ou abaixo) de todos os restantes artigos. No entanto, irá ordená-los melhor (ou pior) do que o que o faria sem estas configurações. Colocar esta opção em "nunca mostrar" irá  completamente excluir os artigos desta secção nos resultados de pesquisa.</message>
+	<message key="plugins.generic.lucene.sectionForm.rankingBoostInvalid">Selecione um peso personalizado válido.</message>
+</locale>
diff --git a/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml b/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
new file mode 100644
index 00000000000..eeec89f4f90
--- /dev/null
+++ b/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="plugins.generic.recommendBySimilarity.displayName">Recomenda Artigos Similares</message>
+	<message key="plugins.generic.recommendBySimilarity.description">Este plugin adicionar uma lista de artigos similares à página de resumo de cada artigo.</message>
+	<message key="plugins.generic.recommendBySimilarity.heading">Artigos Similares</message>
+	<message key="plugins.generic.recommendBySimilarity.advancedSearchIntro">Também poderá usar  {$advancedSearchLink}  para este artigo.</message>
+	<message key="plugins.generic.recommendBySimilarity.advancedSearch">iniciar uma pesquisa avançada de similaridade</message>
+</locale>
diff --git a/plugins/generic/usageStats/locale/pt_PT/locale.xml b/plugins/generic/usageStats/locale/pt_PT/locale.xml
index 639c8567ffd..d25d970e0c9 100644
--- a/plugins/generic/usageStats/locale/pt_PT/locale.xml
+++ b/plugins/generic/usageStats/locale/pt_PT/locale.xml
@@ -12,18 +12,18 @@
   -->
 
 <locale name="pt_PT" full_name="Português (Portugal)">
-	<message key="plugins.generic.usageStats.settings.logging">Opções de registos de acesso</message>
-	<message key="plugins.generic.usageStats.settings.createLogFiles">Gerar ficheiros de registos</message>
-	<message key="plugins.generic.usageStats.settings.createLogFiles.description">A activação desta opção fará com que o plugin crie ficheiros de registo de acesso dentro da pastas de ficheiros. Estes ficheiros devem ser usados para extrair os dados de estatísticas de uso. Se não quiser criar mais ficheiros de registo de acesso, pode deixar esta opção desactivada e usar os seus próprios ficheiros de registo do acesso do servidor.</message>
-	<message key="plugins.generic.usageStats.settings.logParseRegex">Parse log files regex</message>
-	<message key="plugins.generic.usageStats.settings.logParseRegex.description">O regex padrão usado pode analisar ficheiros de registo de acesso apache em formato combinado e também os ficheiros de registo do plugin. Se os seus ficheiros de registo de acesso estiverem num formato diferente, terá que inserir um regex capaz de analisá-los e devolver os valores esperados. Consulte UsageStatsLoader :: _ getDataFromLogEntry () para obter mais informações.</message>
-	<message key="plugins.generic.usageStats.settings.saved">Guardadas as configurações de plugins de estatísticas de uso.</message>
-	<message key="plugins.generic.usageStats.openFileFailed">O ficheiro {$file} não pôde ser aberto e foi recusado.</message>
-	<message key="plugins.generic.usageStats.invalidLogEntry">O número da linha {$lineNumber} do ficheiro {$file} não é uma entrada de registo válida e o ficheiro foi recusado.</message>
-	<message key="plugins.generic.usageStats.displayName">Estatísticas Uso</message>
-	<message key="plugins.generic.usageStats.description">Estatísticas de uso de publicações actuais. Pode usar ficheiros de registo de acesso ao servidor para extrair estatísticas.</message>
-	<message key="plugins.reports.usageStats.report.displayName">Relatório de estatísticas de uso OJS</message>
-	<message key="plugins.reports.usageStats.report.description">Relatório de estatísticas de uso padrão OJS (COUNTER ready)</message>
-	<message key="plugins.reports.usageStats.metricType">OJS/COUNTER</message>
-	<message key="plugins.reports.usageStats.metricType.full">Estatísticas Open Journal Systems (COUNTER ready)</message>
+	<message key="plugins.generic.usageStats.settings.statsDisplayOptions.siteWide">Cada revista pode configurar este plugin a partir da página de plugins da revista.</message>
+	<message key="plugins.generic.usageStats.optout.description"><![CDATA[<h3>Informação Geral de Privacidade</h3>
+		<p>Por favor consulte a nossa <a href="{$privacyStatementUrl}">declaração de privacidade</a>.</p>
+		<h3>Estatísticas de Uso</h3>
+		<p>De modo a ser possível analisar o uso e o impacto da nossa revista e dos seus artigos publicados, colecionamos e registamos os acessos às páginas da revista, aos vários números, artigos e ficheiros suplementares. Neste processo os dados são anonimizados. Nenhuma informação pessoal é guardada. Os endereços IP são anonimizados usando um algoritmo de hash (<em>SHA 256</em>) em combinação com um valor de aleatoriedade (<em>salt</em>) de 64 carateres que é gerado automaticamente todos os dias. Assim, os IP não podes ser recalculados.</p>
+		<p>Juntamente com esse IP anonimizado, são colecionados:</p>
+		<ul>
+		<li>Tipo de acesso (i.e. administrativo)</li>
+	<li>Data e hora do pedido</li>
+		<li>URL</li>
+		<li>Resultado HTTP</li>
+		<li>Navegador</li>
+		</ul>
+		<p>Esta informação é usada apenas para fins de avaliação. Nenhum IP é mapeado ao utilizador. É tecnicamente impossível associar um conjunto de dados a um endereço IP específico.</p>]]></message>
 </locale>
diff --git a/plugins/importexport/native/locale/pt_PT/locale.xml b/plugins/importexport/native/locale/pt_PT/locale.xml
index 23d6eb495c0..98032e494c9 100644
--- a/plugins/importexport/native/locale/pt_PT/locale.xml
+++ b/plugins/importexport/native/locale/pt_PT/locale.xml
@@ -51,4 +51,7 @@ The following formats are accepted:
 	<message key="plugins.importexport.native.import.error.sectionAbbrevMatch">A abreviatura da secção "{$sectionAbbrev}" no número "{$issueTitle}" corresponde a uma secção existente da revista, mas uma outra abreviatura desta secção não corresponde a outra abreviatura da secção existente da revista.</message>
 	<message key="plugins.importexport.native.import.error.issueIdentificationMatch">Nenhum ou mais do que um número corresponde à identificação do problema identificado"{$issueIdentification}".</message>
 	<message key="plugins.importexport.native.import.error.issueIdentificationMissing">O elemento de identificação do número está em falta para o artigo "{$articleTitle}".</message>
+	<message key="plugins.importexport.native.exportSubmissionsSelect">Selecione artigos a exportar</message>
+	<message key="plugins.importexport.native.import.error.issueIdentificationDuplicate">O número existem com id {$issueId} corresponde à identificação de revista indicada "{$issueIdentification}". Este número não será modificado, mas os artigos serão adicionados.</message>
+	<message key="plugins.importexport.native.import.error.publishedDateMissing">O artigo  "{$articleTitle}" faz parte de um número, mas não tem data de publicação.</message>
 </locale>
diff --git a/plugins/paymethod/paypal/locale/pt_PT/locale.xml b/plugins/paymethod/paypal/locale/pt_PT/locale.xml
index d535870afe9..1446456dcef 100644
--- a/plugins/paymethod/paypal/locale/pt_PT/locale.xml
+++ b/plugins/paymethod/paypal/locale/pt_PT/locale.xml
@@ -17,4 +17,10 @@
 	<message key="plugins.paymethod.paypal.settings">Configurações do PayPal</message>
 
 	<message key="plugins.paymethod.paypal">Pagamento via PayPal</message>
+	<message key="plugins.paymethod.paypal.description">Pagamentos processados através do serviço PayPal.</message>
+	<message key="plugins.paymethod.paypal.settings.testMode">Modo de Teste</message>
+	<message key="plugins.paymethod.paypal.settings.accountName">Nome da Conta</message>
+	<message key="plugins.paymethod.paypal.settings.clientId">ID do Cliente</message>
+	<message key="plugins.paymethod.paypal.settings.secret">Senha</message>
+	<message key="plugins.paymethod.paypal.error">Ocorreu um erro de transação. Contacte o gestor da revista para detalhes.</message>
 </locale>
diff --git a/plugins/pubIds/doi/locale/pt_PT/locale.xml b/plugins/pubIds/doi/locale/pt_PT/locale.xml
index dd42417491e..8bfa1052986 100644
--- a/plugins/pubIds/doi/locale/pt_PT/locale.xml
+++ b/plugins/pubIds/doi/locale/pt_PT/locale.xml
@@ -20,7 +20,6 @@
 	<message key="plugins.pubIds.doi.manager.settings.doiObjects">Conteúdo da Revista</message>
 	<message key="plugins.pubIds.doi.manager.settings.doiObjectsRequired">Escolha a que publicações os DOI devem ser associados.</message>
 	<message key="plugins.pubIds.doi.manager.settings.explainDois">Escolha as publicações que terão DOI's associados:</message>
-	<message key="plugins.pubIds.doi.manager.settings.explainCrossRefDois"><![CDATA[<strong>NOTA:</strong> Se utilizar o DOI através da <a href="http://www.crossref.org" target="_new">CrossRef</a>, escolha artigos. O Artigo é visto como um trabalho (work), ou seja, uma entidade com conteúdo intelectual e/ou artístico. O artigo é o objeto usado no DOI da CrossRef para exportação e registo.]]></message>
 	<message key="plugins.pubIds.doi.manager.settings.enableIssueDoi">Números</message>
 	<message key="plugins.pubIds.doi.manager.settings.enableSubmissionDoi">Artigos</message>
 	<message key="plugins.pubIds.doi.manager.settings.enableRepresentationDoi">Composições</message>
@@ -48,22 +47,14 @@
 
 	<!-- metadata form -->
 	<message key="plugins.pubIds.doi.editor.doi">DOI</message>
-	<message key="plugins.pubIds.doi.editor.doi.issueObjects">Objetos DOI da Edição</message>
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeIssue">edição/número</message>
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeSubmission">artigo</message>
-	<message key="plugins.pubIds.doi.editor.doiObjectTypeGalley">número completo</message>
 	<message key="plugins.pubIds.doi.editor.doiSuffixCustomIdentifierNotUnique">O sufixo DOI fornecido já está a ser utilizado por outra publicação. Insira um sufixo DOI único para cada publicação.</message>
-	<message key="plugins.pubIds.doi.editor.excludePubObject">Excluir este tipo {$pubObjectType} da atribuição do DOI.</message>
-	<message key="plugins.pubIds.doi.editor.doiReassign">Reatribuir DOIs</message>
-	<message key="plugins.pubIds.doi.editor.doiReassign.description">Selecione esta caixa para limpar os DOIs atribuídos a {$pubObjectType}.</message>
-	<message key="plugins.pubIds.doi.editor.excludeIssueObjectsDoi">Excluir Objetos da Edição</message>
-	<message key="plugins.pubIds.doi.editor.excludeIssueObjectsDoi.description">Use este botão para excluir objetos (artigos e números completos) atualmente agendados para que lhes seja atribuído um DOI. Os objetos que estão agendados posteriormetne não serão afetados. Poderá ainda usar a possibilidade de excluir individualmente os objectos da atribuição do DOI.</message>
 	<message key="plugins.pubIds.doi.editor.clearIssueObjectsDoi">Limpar DOI da Edição</message>
 	<message key="plugins.pubIds.doi.editor.clearIssueObjectsDoi.description">Use este botão para remover todos os DOIs associados a todas as publicações (artigos, números completos, e ficheiros suplementares) actualmetne agendados para esta edição/número.</message>
 	<message key="plugins.pubIds.doi.description">Este plugin permite a atribuição do DOI a números, artigos e composições no OJS.</message>
 	<message key="plugins.pubIds.doi.readerDisplayName">DOI</message>
 	<message key="plugins.pubIds.doi.manager.settings.doiSuffixCustomIdentifier">Insira um sufixo DOI individual para cada publicação. Encontrará um campo de entrada DOI adicional na página de metadados de cada publicação.</message>
-	<message key="plugins.pubIds.doi.editor.assignDoi.assigned">Foi atribuído o DOI {$pubId}.</message>
 	<message key="plugins.pubIds.doi.manager.settings.doiReassign.description">Se alterar a configuração DOI, os DOIs atribuídos não serão afectados. Uma vez guardada a configuração do DOI, use este botão para limpar todos os DOI existentes para que as novas configurações tenham efeito com as publicações existentes.</message>
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeRepresentation">composição</message>
 	<message key="plugins.pubIds.doi.editor.customSuffixMissing">O DOI não pode ser atribuído porque o sufixo personalizado está em falta.</message>
@@ -76,4 +67,8 @@
 	<message key="plugins.pubIds.doi.editor.assignDoi">Atribuir DOI {$pubId} a esta {$pubObjectType}</message>
 	<message key="plugins.pubIds.doi.editor.assignDoi.emptySuffix">O DOI não pode ser atribuído porque o sufixo personalizado está em falta.</message>
 	<message key="plugins.pubIds.doi.editor.assignDoi.pattern">O DOI {$pubId} não pode ser atribuído porque contém um padrão em conflito.</message>
+	<message key="plugins.pubIds.doi.manager.settings.doiAssignJournalWide">Atribuir DOI</message>
+	<message key="plugins.pubIds.doi.manager.settings.doiAssignJournalWide.description">Atribuir DOI a todas as revistas publicadas aos quais ainda não tenham sido atribuídos DOI. Esta ação não pode ser usada com a configuração individual de sufixos. Se mudou a configuração de DOI acima, por favor guarde as suas alterações antes de iniciar esta ação. A atribuição de DOI pode demorar bastante tempo, dependendo do número de objetos publicados neste jornal.</message>
+	<message key="plugins.pubIds.doi.manager.settings.doiAssignJournalWide.confirm">Tem a certeza que quer atribuir DOI a todos os objetos publicados e aos quais não tenham sido atribuídos DOI?</message>
+	<message key="plugins.pubIds.doi.editor.assignDoi.assigned">O DOI {$pubId} foi atribuído.</message>
 </locale>
diff --git a/plugins/reports/subscriptions/locale/pt_PT/locale.xml b/plugins/reports/subscriptions/locale/pt_PT/locale.xml
new file mode 100644
index 00000000000..b2e66198df5
--- /dev/null
+++ b/plugins/reports/subscriptions/locale/pt_PT/locale.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * locale/pt_PT/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localization strings.
+  -->
+
+<locale name="pt_PT" full_name="Português (Portugal)">
+	<message key="plugins.reports.subscriptions.displayName">Relatório de Subscrições</message>
+	<message key="plugins.reports.subscriptions.description">Este plugin implementa a exportação de relatórios CSV com a lista de subscrições e a sua informação.</message>
+	<message key="plugins.reports.subscriptions.institutionMailingAddress">Endereço de Correio Institucional</message>
+	<message key="plugins.reports.subscriptions.ipRanges">Intervalo de IP</message>
+</locale>

From be286faff5508ecc15a257ae168bf179ad11fc57 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Fri, 13 Apr 2018 18:41:29 +0100
Subject: [PATCH 081/100] Fixed DTD paths

---
 locale/pt_PT/api.xml                                          | 2 +-
 plugins/generic/browse/locale/pt_PT/locale.xml                | 2 +-
 plugins/generic/lucene/locale/pt_PT/locale.xml                | 2 +-
 plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml | 2 +-
 plugins/reports/subscriptions/locale/pt_PT/locale.xml         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/pt_PT/api.xml b/locale/pt_PT/api.xml
index 2e2cf37bb27..a1088a0fb78 100644
--- a/locale/pt_PT/api.xml
+++ b/locale/pt_PT/api.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml
diff --git a/plugins/generic/browse/locale/pt_PT/locale.xml b/plugins/generic/browse/locale/pt_PT/locale.xml
index 6711dbb299a..4be19ac4348 100644
--- a/plugins/generic/browse/locale/pt_PT/locale.xml
+++ b/plugins/generic/browse/locale/pt_PT/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml
diff --git a/plugins/generic/lucene/locale/pt_PT/locale.xml b/plugins/generic/lucene/locale/pt_PT/locale.xml
index 3f63de4caef..f0292a74a37 100644
--- a/plugins/generic/lucene/locale/pt_PT/locale.xml
+++ b/plugins/generic/lucene/locale/pt_PT/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml
diff --git a/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml b/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
index eeec89f4f90..8ca91994947 100644
--- a/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
+++ b/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml
diff --git a/plugins/reports/subscriptions/locale/pt_PT/locale.xml b/plugins/reports/subscriptions/locale/pt_PT/locale.xml
index b2e66198df5..5615fb19a9b 100644
--- a/plugins/reports/subscriptions/locale/pt_PT/locale.xml
+++ b/plugins/reports/subscriptions/locale/pt_PT/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml

From 8fc63e4b8706809145afa504ba9849e8e7f321aa Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Fri, 13 Apr 2018 19:05:53 +0100
Subject: [PATCH 082/100] fixed the last? dtd

---
 plugins/generic/backup/locale/pt_PT/locale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/backup/locale/pt_PT/locale.xml b/plugins/generic/backup/locale/pt_PT/locale.xml
index 27736e6f174..f88702c26da 100644
--- a/plugins/generic/backup/locale/pt_PT/locale.xml
+++ b/plugins/generic/backup/locale/pt_PT/locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE locale SYSTEM "../../../../lib/pkp/dtd/locale.dtd">
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
 
 <!--
   * locale/pt_PT/locale.xml

From fcfdc6bb5e51632c9cdec82568dda6e8d1ef9a9c Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Fri, 13 Apr 2018 20:27:10 +0100
Subject: [PATCH 083/100] one template

---
 locale/pt_PT/emailTemplates.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/locale/pt_PT/emailTemplates.xml b/locale/pt_PT/emailTemplates.xml
index 2b935139b49..d1e7653ed7f 100644
--- a/locale/pt_PT/emailTemplates.xml
+++ b/locale/pt_PT/emailTemplates.xml
@@ -1169,4 +1169,15 @@ Se tiver questões, por favor contacte-me. Obrigado por considerar esta revisão
 {$editorialContactSignature}]]></body>
 		<description>Este e-mail, quando activado, é enviado automaticamente para os outros autores que não são utilizadores do Portal especificados durante o processo de envio.</description>
 	</email_text>
+	<email_text key="EDITOR_DECISION_INITIAL_DECLINE">
+		<subject>Decisão Editorial</subject>
+		<body><![CDATA[{$authorName}:<br />
+<br />
+Em relação à sua submissão à revista {$contextName}, &quot;{$submissionTitle}&quot; foi tomada uma decisão.<br />
+<br />
+A nossa decisão é:: Rejeitar a Submissão<br />
+<br />
+{$editorialContactSignature}<br />]]></body>
+		<description>Ete e-mail é enviado ao autor se o editor decidir rejeitar a submissão à priori, antes do processo de revisão.</description>
+	</email_text>
 </email_texts>

From b179ae0fb080e42ee97a572e674533866d4458bd Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Sat, 14 Apr 2018 17:42:32 +0100
Subject: [PATCH 084/100] PT translation

---
 locale/pt_PT/emailTemplates.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/locale/pt_PT/emailTemplates.xml b/locale/pt_PT/emailTemplates.xml
index d1e7653ed7f..a6f6f6b1546 100644
--- a/locale/pt_PT/emailTemplates.xml
+++ b/locale/pt_PT/emailTemplates.xml
@@ -1180,4 +1180,13 @@ A nossa decisão é:: Rejeitar a Submissão<br />
 {$editorialContactSignature}<br />]]></body>
 		<description>Ete e-mail é enviado ao autor se o editor decidir rejeitar a submissão à priori, antes do processo de revisão.</description>
 	</email_text>
+	<email_text key="EDITOR_RECOMMENDATION">
+		<subject>Recomenda;ção Editorial</subject>
+		<body><![CDATA[{$editors}:<br />
+<br />
+A recomendação relativamente à submissão para  {$contextName}, &quot;{$submissionTitle}&quot; é: {$recommendation}<br />
+<br />
+{$editorialContactSignature}<br />]]></body>
+		<description>Este e-mail é enviado pelo Editor de Secção ou Editor Acessor para o Editor de Secção ou Editor Priincipal, a notificar da recomendação final relativa à submissão.</description>
+	</email_text>
 </email_texts>

From 667b0219b95be6c055e9f6618d34a3758362d5b8 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Sun, 15 Apr 2018 14:20:56 +0100
Subject: [PATCH 085/100] Mail templates for Lucene plugin

---
 .../lucene/locale/pt_PT/emailTemplates.xml    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 plugins/generic/lucene/locale/pt_PT/emailTemplates.xml

diff --git a/plugins/generic/lucene/locale/pt_PT/emailTemplates.xml b/plugins/generic/lucene/locale/pt_PT/emailTemplates.xml
new file mode 100644
index 00000000000..bfabbedcb2f
--- /dev/null
+++ b/plugins/generic/lucene/locale/pt_PT/emailTemplates.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE email_texts SYSTEM "../../../../../lib/pkp/dtd/emailTemplateData.dtd">
+<!--
+  * emailTemplateData.xml
+  *
+  * Copyright (c) 2003-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  *
+  * Localized email templates XML file.
+  -->
+<email_texts locale="pt_PT">
+	<email_text key="LUCENE_ARTICLE_INDEXING_ERROR_NOTIFICATION">
+		<subject>Erro de Indexação de Artigo</subject>
+		<body><![CDATA[Ocorreu um erro de indexação ao atualizar o índice de artigos.<br />
+<br />
+A mensagem de erro (se) gerada pelo serviço web: &quot;{$error}&quot;<br />
+<br />
+Este e-mail foi gerado automaticamente pelo plugin de pesquisa Lucene do Open Journal Systems.]]></body>
+		<description>Este e-mail é usado para notificar o contacto técnico de uma revista de que ocorreu um erro ao indexar um artigo.</description>
+	</email_text>
+	<email_text key="LUCENE_JOURNAL_INDEXING_ERROR_NOTIFICATION">
+		<subject>Erro de Indexação de Revista</subject>
+		<body><![CDATA[Ocorreu um erro ao indexar a revista &quot;{$contextName}&quot;.<br />
+<br />
+A mensagem de erro (se) gerada pelo serviço web: &quot;{$error}&quot;<br />
+<br />
+Este e-mail foi gerado automaticamente pelo plugin de pesquisa Lucene do Open Journal Systems.]]></body>
+		<description>Este e-mail é enviado para notificar o contacto técnico de uma revista de que ocorreu um erro ao inedexar uma revista.</description>
+	</email_text>
+	<email_text key="LUCENE_SEARCH_SERVICE_ERROR_NOTIFICATION">
+		<subject>Erro no Serviço de Pesquisa de Revista</subject>
+		<body><![CDATA[Ocorreu um  erro quando alguém tentou realizar uma pesquisa na instalação &quot;{$siteName}&quot;.<br />
+<br />
+A mensagem de erro (se) gerada pelo servidor web: &quot;{$error}&quot;<br />
+<br />
+Este e-mail foi gerado pelo plugin de pesquisa Lucene do Open Journal Systems.]]></body>
+		<description>Este e-mail é usado para notificar o contacto técnico de uma revista de que ocorreu um erro ao tentar aceder ao serviço de pesquisa Solr.</description>
+	</email_text>
+</email_texts>

From 85d935c9a2eedb5a64bf45bf074926dee32a43d4 Mon Sep 17 00:00:00 2001
From: Alberto Simoes <ambs@cpan.org>
Date: Sun, 15 Apr 2018 14:22:36 +0100
Subject: [PATCH 086/100] Fix typo/translation

---
 locale/pt_PT/emailTemplates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/pt_PT/emailTemplates.xml b/locale/pt_PT/emailTemplates.xml
index a6f6f6b1546..6adc6875e5c 100644
--- a/locale/pt_PT/emailTemplates.xml
+++ b/locale/pt_PT/emailTemplates.xml
@@ -1175,7 +1175,7 @@ Se tiver questões, por favor contacte-me. Obrigado por considerar esta revisão
 <br />
 Em relação à sua submissão à revista {$contextName}, &quot;{$submissionTitle}&quot; foi tomada uma decisão.<br />
 <br />
-A nossa decisão é:: Rejeitar a Submissão<br />
+A decisão é: Rejeitar a Submissão<br />
 <br />
 {$editorialContactSignature}<br />]]></body>
 		<description>Ete e-mail é enviado ao autor se o editor decidir rejeitar a submissão à priori, antes do processo de revisão.</description>

From 43bbd2f62ef0ca7c32f473c999e1d4145bd1919c Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 16 Apr 2018 17:48:19 +0200
Subject: [PATCH 087/100] pkp/pkp-lib#3593 fix issue galley locale validation

---
 controllers/grid/issues/form/IssueGalleyForm.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/grid/issues/form/IssueGalleyForm.inc.php b/controllers/grid/issues/form/IssueGalleyForm.inc.php
index 94c9cc73d5e..506e489104c 100644
--- a/controllers/grid/issues/form/IssueGalleyForm.inc.php
+++ b/controllers/grid/issues/form/IssueGalleyForm.inc.php
@@ -44,7 +44,7 @@ function __construct($request, $issue, $issueGalley = null) {
 		$this->addCheck(new FormValidatorCustom(
 			$this, 'galleyLocale', 'required', 'editor.issues.galleyLocaleRequired',
 			function($galleyLocale) use ($journal) {
-				return in_array($galleyLocale, $journal->getSupportedLocaleNames());
+				return in_array($galleyLocale, $journal->getSupportedLocales());
 			}
 		));
 

From 70503a1ce51ffe3ffc3443913457afc7e760b9bb Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Fri, 13 Apr 2018 16:33:16 +0100
Subject: [PATCH 088/100] pkp/pkp-lib#3565 Restore editor.article.coverImage
 locale string that was removed in error

---
 locale/ar_IQ/editor.xml          | 1 +
 locale/ca_ES/editor.xml          | 1 +
 locale/cs_CZ/editor.xml          | 1 +
 locale/da_DK/editor.xml          | 1 +
 locale/de_DE/editor.xml          | 1 +
 locale/en_US/editor.xml          | 1 +
 locale/es_ES/editor.xml          | 1 +
 locale/eu_ES/editor.xml          | 1 +
 locale/fa_IR/editor.xml          | 1 +
 locale/fi_FI/editor.xml          | 1 +
 locale/fr_CA/editor.xml          | 1 +
 locale/fr_FR/editor.xml          | 1 +
 locale/hr_HR/editor.xml          | 1 +
 locale/id_ID/editor.xml          | 1 +
 locale/it_IT/editor.xml          | 1 +
 locale/nb_NO/editor.xml          | 1 +
 locale/nl_NL/editor.xml          | 1 +
 locale/pl_PL/editor.xml          | 1 +
 locale/pt_BR/editor.xml          | 5 +++--
 locale/pt_PT/editor.xml          | 1 +
 locale/ru_RU/editor.xml          | 1 +
 locale/sr_RS@cyrillic/editor.xml | 1 +
 locale/sr_RS@latin/editor.xml    | 1 +
 locale/sv_SE/editor.xml          | 1 +
 locale/tr_TR/editor.xml          | 1 +
 locale/uk_UA/editor.xml          | 1 +
 locale/zh_CN/editor.xml          | 1 +
 27 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/locale/ar_IQ/editor.xml b/locale/ar_IQ/editor.xml
index 7586e932074..d0f43a81db3 100644
--- a/locale/ar_IQ/editor.xml
+++ b/locale/ar_IQ/editor.xml
@@ -136,6 +136,7 @@
 	<message key="editor.article.scheduleForPublication">جدوله للنشر في</message>
 	<message key="editor.article.scheduleForPublication.toBeAssigned">ليتم تعيينه</message>
 	<message key="editor.article.payment.publicationFeeNotPaid">لم يتم دفع رسم النشر. لجدولة الفقرة لغرض النشر، أشعر المؤلف بدفع الرسم أو أخصمه له</message>
+	<message key="editor.article.coverImage">صورة الغلاف</message>
 	<message key="editor.article.removeCoverImageFileNotFound">تعذر العثور على صورة الغلاف التي تريد حذفها. قد تكون محذوفة سلفاً. حاول إعادة تحميل الصفحة.</message>
 	<message key="grid.action.removeArticle">إزالة المقالة من هذا العدد</message>
 	<message key="editor.article.remove">أزلها</message>
diff --git a/locale/ca_ES/editor.xml b/locale/ca_ES/editor.xml
index 98533196425..5cb7d464fe4 100644
--- a/locale/ca_ES/editor.xml
+++ b/locale/ca_ES/editor.xml
@@ -157,4 +157,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[El corrector transforma els borradors finals d'aquesta llista en versions revisades i les carrega a continuació a <span class="pkp_help_title">Correcció d'originals</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Qualsevol arxiu ja carregat  a una fase de la tramesa pot afegir-se a la llista de correcció de proves marcant la casella inferior "Incloure" i fent clic a "Cercar". D'aquesta manera es llistaran tots els arxius disponibles i es podran escollir per incloure'ls.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">L'identificador públic '{$publicIdentifier}' ja existeix per a un altre objecte del mateix tipus. Esculli identificadors únics per als objectes del mateix tipus dins la seva revista.</message>
+	<message key="editor.article.coverImage">Imatge per a la portada</message>
 </locale>
diff --git a/locale/cs_CZ/editor.xml b/locale/cs_CZ/editor.xml
index 647885b3c1b..ba1cfcf9995 100644
--- a/locale/cs_CZ/editor.xml
+++ b/locale/cs_CZ/editor.xml
@@ -144,4 +144,5 @@
 	<message key="editor.submission.selectGalleyFiles">Vyberte soubory sazebnice</message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Konečné návrhy souborů v tomto seznamu jsou převedeny redaktorem do redakčních verzí, nahrany níže pod <span class = "pkp_help_title">Redakce</ span>.¨]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Jakékoli soubory, které již byly nahrány do libovolné etapy podání článku, mohou být přidány do seznamu Korektury zaškrtnutím políčka Zahrnout a klepnutím na tlačítko Hledat: budou uvedeny všechny dostupné soubory a mohou být vybrány k zařazení.</message>
+	<message key="editor.article.coverImage">Titulní obrázek</message>
 </locale>
diff --git a/locale/da_DK/editor.xml b/locale/da_DK/editor.xml
index 58bbfeaeb4e..5820f01a567 100644
--- a/locale/da_DK/editor.xml
+++ b/locale/da_DK/editor.xml
@@ -160,4 +160,5 @@
 	<message key="editor.issues.confirmSetCurrentIssue">Er du sikker på at du vil registrere dette nummer som det nyeste?</message>
 	<message key="grid.action.setCurrentIssue">Sæt nyeste nummer</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Identifikatoren (publicid) '{$publicIdentifier}' eksisterer allerede i forbindelse med et andet objekt af samme type. Vælg unikke identifikatorer for objekter af samme type i dit tidsskrift.</message>
+	<message key="editor.article.coverImage">Forsidebillede</message>
 </locale>
diff --git a/locale/de_DE/editor.xml b/locale/de_DE/editor.xml
index 43eae2742af..91c8ce434b3 100644
--- a/locale/de_DE/editor.xml
+++ b/locale/de_DE/editor.xml
@@ -147,4 +147,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Endgültige Entwurfsdateien in dieser Liste werden durch eine/n Lektor/in in lektorierte Versionen umgewandelt und unter <span class="pkp_help_title">Lektorat</span> hochgeladen.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Alle Dateien, die bisher zu irgendeiner Phase der Einreichung hochgeladen worden sind, können zur Korrekturliste hinzugefügt werden, indem die Auswahlbox unten angeklickt wird und auf Suchen geklickt wird: Alle verfügbaren Dateien werden aufgelistet und können ausgewählt werden.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Die öffentliche Kennung '{$publicIdentifier}' wird bereits für ein Objekt des selben Typs verwendet. Bitte wählen Sie innerhalb Ihrer Zeitschrift eindeutige Kennungen für Objekte gleichen Typs.</message>
+	<message key="editor.article.coverImage">Titelbild</message>
 </locale>
diff --git a/locale/en_US/editor.xml b/locale/en_US/editor.xml
index 055368dfb54..17958b8ed71 100644
--- a/locale/en_US/editor.xml
+++ b/locale/en_US/editor.xml
@@ -147,4 +147,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Final draft files in this list are transformed by a Copyeditor into copyedited versions, uploaded below under <span class="pkp_help_title">Copyediting</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Any files that have already been uploaded to any submission stage can be added to the Proofreading listing by checking the Include checkbox below and clicking Search: all available files will be listed and can be chosen for inclusion.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">The public identifier '{$publicIdentifier}' already exists for another object of the same type. Please choose unique identifiers for the objects of the same type within your journal.</message>
+	<message key="editor.article.coverImage">Cover Image</message>
 </locale>
diff --git a/locale/es_ES/editor.xml b/locale/es_ES/editor.xml
index efda58639f5..1946f7c73fa 100644
--- a/locale/es_ES/editor.xml
+++ b/locale/es_ES/editor.xml
@@ -154,4 +154,5 @@
 	<message key="grid.action.setCurrentIssue">Establecer número actual</message>
 	<message key="editor.article.schedulePublication">Programar para publicación</message>
 	<message key="editor.article.removeCoverImageFileNotFound">La imagen de portada que deseaba eliminar no se ha podido encontrar, puede que ya haya sido eliminada. Inténtelo recargando la página.</message>
+	<message key="editor.article.coverImage">Imagen de portada</message>
 </locale>
diff --git a/locale/eu_ES/editor.xml b/locale/eu_ES/editor.xml
index 05fc861ea5a..cbbc90a7772 100644
--- a/locale/eu_ES/editor.xml
+++ b/locale/eu_ES/editor.xml
@@ -132,4 +132,5 @@
 	<message key="editor.issues.galleyPublicIdentificationExists">Jadanik bada ale publikoaren galera probaren identifikazioa.</message>
 	<message key="editor.issues.backToIssueGalleys">Atzera alearen galera probetara</message>
 	<message key="editor.issues.confirmDeleteGalley">Ziur al zaude alearen galera proba hau ezabatu nahi duzula?</message>
+	<message key="editor.article.coverImage">Azaleko irudia</message>
 </locale>
diff --git a/locale/fa_IR/editor.xml b/locale/fa_IR/editor.xml
index 421b0969282..9faff7101cb 100644
--- a/locale/fa_IR/editor.xml
+++ b/locale/fa_IR/editor.xml
@@ -145,4 +145,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[آخرین نسخه از فایل توسط ویراستیار به عنوان نسخه <span class="pkp_help_title">ویراستیاری شده</span> در سیستم آپلود شده است.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">هر فایلی که در مراحل ارسال مقاله در سامانه آپلود شده است را می‌توان با انتخاب گزینه زیر به لیست بازبینی نهایی اضافه کرد.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">شناسه عمومی «{$publicIdentifier}» برای موجودیت دیگری از همین نوع تعریف شده است. لطفاً برای تمامی موجودیت‌های داخل مجله یک شناسه عمومی منحصربه‌فرد انتخاب کنید.</message>
+	<message key="editor.article.coverImage">تصویر جلد</message>
 </locale>
diff --git a/locale/fi_FI/editor.xml b/locale/fi_FI/editor.xml
index 7822f115032..44899633e30 100644
--- a/locale/fi_FI/editor.xml
+++ b/locale/fi_FI/editor.xml
@@ -148,4 +148,5 @@
 	<message key="editor.issues.confirmSetCurrentIssue">Oletko varma, että haluat asettaa tämän numeron uusimmaksi?</message>
 	<message key="grid.action.setCurrentIssue">Aseta uusin numero</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Julkinen tunniste '{$publicIdentifier}' on jo käytössä. Valitse uniikki tunniste.</message>
+	<message key="editor.article.coverImage">Kansikuva</message>
 </locale>
diff --git a/locale/fr_CA/editor.xml b/locale/fr_CA/editor.xml
index 6e313cd49c6..45f6101a942 100644
--- a/locale/fr_CA/editor.xml
+++ b/locale/fr_CA/editor.xml
@@ -152,4 +152,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Les versions finales sur cette liste sont transformées par un Réviseur en versions révisées, téléversées dans <span class = "pkp_help_title">Révision</ span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Tous les fichiers qui ont déjà été téléversés à n'importe quelle étape de soumission peuvent être ajoutés à la liste de vérification des épreuves en cochant la case "Inclure" ci-dessous et en cliquant sur "Rechercher". Tous les fichiers disponibles seront répertoriés et pourront être sélectionnés pour inclusion.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Le public identifié comme '{$publicIdentifier}' existe déjà pour un autre objet de même type. Veuillez indiquer un public unique pour l'objet de même type à l'intérieur de votre revue.</message>
+	<message key="editor.article.coverImage">Image de la page couverture</message>
 </locale>
diff --git a/locale/fr_FR/editor.xml b/locale/fr_FR/editor.xml
index 504d874d619..3b5c2637926 100644
--- a/locale/fr_FR/editor.xml
+++ b/locale/fr_FR/editor.xml
@@ -156,4 +156,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Les versions finales sur cette liste sont transformées par un Réviseur en versions révisées, téléversées dans <span class = "pkp_help_title">Révision</ span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Tous les fichiers qui ont déjà été téléversés à n'importe quelle étape de soumission peuvent être ajoutés à la liste de vérification des épreuves en cochant la case "Inclure" ci-dessous et en cliquant sur "Rechercher". Tous les fichiers disponibles seront répertoriés et pourront être sélectionnés pour inclusion.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Le public identifié comme '{$publicIdentifier}' existe déjà pour un autre objet de même type. Veuillez indiquer un public unique pour l'objet de même type à l'intérieur de votre revue.</message>
+	<message key="editor.article.coverImage">Image de la page couverture</message>
 </locale>
diff --git a/locale/hr_HR/editor.xml b/locale/hr_HR/editor.xml
index 0731d0b59c0..263ba33517a 100644
--- a/locale/hr_HR/editor.xml
+++ b/locale/hr_HR/editor.xml
@@ -131,4 +131,5 @@
 	<message key="editor.issues.backToIssueGalleys">Povratak na korekturne kopije izdanja</message>
 	<message key="editor.issues.confirmDeleteGalley">Da li ste sigurni da želite obrisati ove korekturne kpije izdanja?</message>
 	<message key="editor.reassign">Ponovo dodijeli</message>
+	<message key="editor.article.coverImage">Slika naslovne stranice</message>
 </locale>
diff --git a/locale/id_ID/editor.xml b/locale/id_ID/editor.xml
index acf402508df..f5bbecbbb9b 100644
--- a/locale/id_ID/editor.xml
+++ b/locale/id_ID/editor.xml
@@ -144,4 +144,5 @@
 	<message key="editor.submission.selectGalleyFiles">Pilih File Galley</message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[File draft final di daftar ini telah diubah oleh Copyeditor menjadi versi pasca-copyedit, telah diunggah berikut ini di bawah <span class="pkp_help_title">Copyediting</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Semua file yang telah diunggah di tiap tahap penyerahan dapat ditambahkan ke daftar Proofreading dengan menandai check box Include berikut dan klik Cari: semua file yang ada akan ditampilkan dan dapat dipilih untuk diikutsertakan.</message>
+	<message key="editor.article.coverImage">Gambar sampul</message>
 </locale>
diff --git a/locale/it_IT/editor.xml b/locale/it_IT/editor.xml
index f18e006fdc6..748a0af6fb2 100644
--- a/locale/it_IT/editor.xml
+++ b/locale/it_IT/editor.xml
@@ -124,4 +124,5 @@
 	<message key="editor.issues.galleyPublicIdentificationExists">Esiste già un identificatore della gabbia del fascicolo</message>
 	<message key="editor.issues.backToIssueGalleys">Torna alle gabbie del fascicolo</message>
 	<message key="editor.issues.confirmDeleteGalley">Sei sicuro di cancellare questa gabbia del fascicolo?</message>
+	<message key="editor.article.coverImage">Immagine di copertina</message>
 </locale>
diff --git a/locale/nb_NO/editor.xml b/locale/nb_NO/editor.xml
index b7956ec9912..789dbd90f0f 100644
--- a/locale/nb_NO/editor.xml
+++ b/locale/nb_NO/editor.xml
@@ -124,4 +124,5 @@
 	<message key="editor.notifyUsers.allAuthors">Alle publiserte forfattere ({$count} users)</message>
 	<message key="editor.notifyUsers.allIndividualSubscribers">Alle personlige abonnenter ({$count} users)</message>
 	<message key="editor.notifyUsers.allInstitutionalSubscribers">Alle institusjonelle abonnenter  ({$count} users)</message>
+	<message key="editor.article.coverImage">Omslagsbilde</message>
 </locale>
diff --git a/locale/nl_NL/editor.xml b/locale/nl_NL/editor.xml
index bb88b14e7f5..3462ada8b00 100644
--- a/locale/nl_NL/editor.xml
+++ b/locale/nl_NL/editor.xml
@@ -131,4 +131,5 @@
 	<message key="editor.issues.galleyLocaleRequired">Een nummer-proef taalkode is verplicht.</message>
 	<message key="editor.issues.galleyPublicIdentificationExists">Publieke identificatie van de nummer-proef bestaat al</message>
 	<message key="editor.publicIdentificationExists">De publieke identificatie '{$publicIdentifier}' bestaat al voor een ander object (nummer, artikel, proef of aanvullend bestand). Kies een unieke identificatie.</message>
+	<message key="editor.article.coverImage">Omslagafbeelding</message>
 </locale>
diff --git a/locale/pl_PL/editor.xml b/locale/pl_PL/editor.xml
index e61ab552c70..a399226f8e9 100644
--- a/locale/pl_PL/editor.xml
+++ b/locale/pl_PL/editor.xml
@@ -148,4 +148,5 @@
 	<message key="editor.submission.selectGalleyFiles">Wybierz pliki do publikacji.</message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Pliki znajdujące się na tej liście są pobierane przez korektora. Po korekcie poprawione pliki powinny zostać przesłane poniżej, w sekcji <span class="pkp_help_title">Korekta</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Wszystkie pliki przesłane do dowolnego etapu mogą zostać dodane do listy korekty końcowej przez oznaczenie pola Uwzględnij poniżej i kliknięciu Szukaj: Wszystkie możliwe do dodania pliki będą widoczne w liście i dostępne do wybrania.</message>
+	<message key="editor.article.coverImage">Obraz okładki</message>
 </locale>
diff --git a/locale/pt_BR/editor.xml b/locale/pt_BR/editor.xml
index e1b3c40b0db..8a48456975d 100644
--- a/locale/pt_BR/editor.xml
+++ b/locale/pt_BR/editor.xml
@@ -151,6 +151,7 @@
 	<message key="editor.article.schedulePublication">Agendar para Publicação</message>
 	<message key="editor.article.removeCoverImageFileNotFound">Não foi possível encontrar a imagem da capa que você solicitou para excluir. Ele já pode ter sido excluída. Tente recarregar a página.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">O identificador público '{$publicIdentifier}' já existe para outro objeto do mesmo tipo. Por favor, escolha identificadores únicos para os objetos do mesmo tipo dentro de sua revista.</message>
-  	<message key="editor.issues.confirmSetCurrentIssue">Tem certeza que deseja definir este número como o atual?</message>
-  	<message key="grid.action.setCurrentIssue">Definir Número Atual</message>
+	<message key="editor.issues.confirmSetCurrentIssue">Tem certeza que deseja definir este número como o atual?</message>
+	<message key="grid.action.setCurrentIssue">Definir Número Atual</message>
+	<message key="editor.article.coverImage">Imagem de Capa</message>
 </locale>
diff --git a/locale/pt_PT/editor.xml b/locale/pt_PT/editor.xml
index c466033dfd5..5f487266998 100644
--- a/locale/pt_PT/editor.xml
+++ b/locale/pt_PT/editor.xml
@@ -147,4 +147,5 @@
 	<message key="editor.issues.confirmSetCurrentIssue">Deseja realmente definir esta edição como a atual?</message>
 	<message key="grid.action.setCurrentIssue">Definir como Edição Atual</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">O identificador público '{$publicIdentifier}' já existe para outro objeto do mesmo tipo. Por favor escolha identificadores únicos para os objetos do mesmo tipo da sua revista.</message>
+	<message key="editor.article.coverImage">Imagem de capa</message>
 </locale>
diff --git a/locale/ru_RU/editor.xml b/locale/ru_RU/editor.xml
index 026c02136ce..7965c82b2d4 100644
--- a/locale/ru_RU/editor.xml
+++ b/locale/ru_RU/editor.xml
@@ -147,4 +147,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Итоговые файлы черновиков в этом списке преобразованы литературным редактором в версии, прошедши литературное редактирование, загруженные ниже в раздел  <span class="pkp_help_title">«Литературное редактирование»</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Все файлы, которые уже были загружены на любом этапе отправки материала, могут быть добавлены в список «Корректура», для этого нужно поставить галочку «Включить» ниже и щелкнуть на кнопке «Поиск»: все доступные файлы будут показаны в списке и могут быть выбраны для включения.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Открытый идентификатор «{$publicIdentifier}» уже существует для другого объекта этого же типа. Пожалуйста, выбирайте уникальные идентификаторы для объектов одного типа в вашем журнале.</message>
+	<message key="editor.article.coverImage">Изображение обложки</message>
 </locale>
diff --git a/locale/sr_RS@cyrillic/editor.xml b/locale/sr_RS@cyrillic/editor.xml
index 2d4aff116c4..e3846aa2b56 100644
--- a/locale/sr_RS@cyrillic/editor.xml
+++ b/locale/sr_RS@cyrillic/editor.xml
@@ -156,4 +156,5 @@
 	<message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[Графички уредник ће припремити ове фајлове за сваку завршну копију и поставити их на сервер у одговарајуће <span class="pkp_help_title">Одобрене копије</span> за коначну проверу.]]></message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Финални пробни фајлови на овој листи су претворени од стране коректора у кориговане верзије и постављене на сервер у <span class="pkp_help_title">Коректура</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Било који фајл који је већ био постављен на сервер у било којој фази пријаве чланка може бити додат на лситу за Коректуру означавањем Укључи кутије испод и кликом на Претрага: сви доступни фајлови ће бити излистани и одабрани за укључење.</message>
+	<message key="editor.article.coverImage">Слика насловне стране</message>
 </locale>
diff --git a/locale/sr_RS@latin/editor.xml b/locale/sr_RS@latin/editor.xml
index 3ee3ed6f6f9..f40ccac7927 100644
--- a/locale/sr_RS@latin/editor.xml
+++ b/locale/sr_RS@latin/editor.xml
@@ -156,4 +156,5 @@
 	<message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[Grafički urednik će pripremiti ove fajlove za svaku završnu kopiju i postaviti ih na server u odgovarajuće <span class="pkp_help_title">Odobrene kopije</span> za konačnu proveru.]]></message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Finalni probni fajlovi na ovoj listi su pretvoreni od strane korektora u korigovane verzije i postavljene na server u <span class="pkp_help_title">Korektura</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Bilo koji fajl koji je već bio postavljen na server u bilo kojoj fazi prijave članka može biti dodat na lsitu za Korekturu označavanjem Uključi kutije ispod i klikom na Pretraga: svi dostupni fajlovi će biti izlistani i odabrani za uključenje.</message>
+	<message key="editor.article.coverImage">Slika naslovne strane</message>
 </locale>
diff --git a/locale/sv_SE/editor.xml b/locale/sv_SE/editor.xml
index f993970415f..cf510412b6c 100644
--- a/locale/sv_SE/editor.xml
+++ b/locale/sv_SE/editor.xml
@@ -147,4 +147,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Slutgiltiga utkastfiler i den här listan görs om till manusredigerade versioner av en manusredaktör och laddas upp nedan under <span class="pkp_help_title">Manusredigering</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Alla filer som redan laddats upp i något av processens steg kan läggas till i listan för Korrekturläsning genom att kryssa i rutan "Inkludera" nedan och klicka på Sök: alla tillgängliga filer listas och kan väljas för inkludering.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Den publika identifikatorn '{$publicIdentifier}' existerar redan för ett annat objekt av samma typ. already exists for another object of the same type. Vänligen välj unika identifikatorer inom tidskriften.</message>
+  <message key="editor.article.cover">Omslag</message>
 </locale>
diff --git a/locale/tr_TR/editor.xml b/locale/tr_TR/editor.xml
index bf613854103..c33e7ace3dc 100644
--- a/locale/tr_TR/editor.xml
+++ b/locale/tr_TR/editor.xml
@@ -192,4 +192,5 @@
 	<message key="editor.publicIdentificationExists">Diğer objeler (sayı, makale, dizgi veya ek dosya) için '{$publicIdentifier}' adlı genel belirleyici zaten var. Lütfen derginizdeki tekil belirleyicileri seçiniz.</message>
 	<message key="editor.article.remove">Kaldır</message>
     <message key="editor.review.notInitiated">İnceleme süreci henüz başlatılmadı.</message>
+		<message key="editor.article.coverImage">Kapak resmi</message>
 </locale>
diff --git a/locale/uk_UA/editor.xml b/locale/uk_UA/editor.xml
index 5f57067d24b..a13e7ef0a66 100644
--- a/locale/uk_UA/editor.xml
+++ b/locale/uk_UA/editor.xml
@@ -145,4 +145,5 @@
 	<message key="editor.submission.selectGalleyFiles">Вибрати файли гранок</message>
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Готові файли чернеток з цього списку, пройшовши літературне редагування, завантажені літературним редактором в розділ <span class="pkp_help_title">«Літературне редагування»</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Всі файли, які були завантажені на будь-якому етапі подання рукопису, можуть бути додані в список «Коректура», для цього потрібно поставити галочку «Включити» нижче і клацнути на кнопці «Пошук»: всі доступні файли будуть показані в списку і можуть бути обрані для включення.</message>
+	<message key="editor.article.coverImage">Зображення обкладинки</message>
 </locale>
diff --git a/locale/zh_CN/editor.xml b/locale/zh_CN/editor.xml
index 255d676ce40..378447e9f5f 100644
--- a/locale/zh_CN/editor.xml
+++ b/locale/zh_CN/editor.xml
@@ -133,4 +133,5 @@
 	<message key="editor.issues.galleyPublicIdentificationExists">公共期目校样确认已经存在。</message>
 	<message key="editor.issues.backToIssueGalleys">返回期目校样。</message>
 	<message key="editor.issues.confirmDeleteGalley">您确定要删除该期目校样吗？</message>
+	<message key="editor.article.coverImage">封面图片</message>
 </locale>

From b41b8829199ac56c58ee4426061b7a8fc4beff80 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Fri, 13 Apr 2018 16:33:56 +0100
Subject: [PATCH 089/100] pkp/pkp-lib#3565 Fix indentation in locale file

---
 locale/tr_TR/editor.xml | 140 ++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/locale/tr_TR/editor.xml b/locale/tr_TR/editor.xml
index c33e7ace3dc..5eaa8df9b61 100644
--- a/locale/tr_TR/editor.xml
+++ b/locale/tr_TR/editor.xml
@@ -14,53 +14,53 @@
 
 <locale name="tr_TR" full_name="Türkçe">
 	<message key="editor.home">Editör Ana Sayfa</message>
-    <message key="editor.reassign">Yeniden Ata</message>
+	<message key="editor.reassign">Yeniden Ata</message>
 	<message key="editor.submissionsAndPublishing">Gönderiler ve Yayımlama</message>
 	<message key="editor.submissionQueue">Gönderi Kuyruğu</message>
-    <message key="editor.submission.newRound">Yeni Tur</message>
-    <message key="editor.submissionLibrary">Gönderi Kütüphanesi</message>
-    <message key="editor.submission.addReviewer">Hakem Ekle</message>
-    <message key="editor.submission.uploadSelectFiles">Dosya Ekle</message>
-    <message key="editor.submission.roundStatus.reviewsReady">Hakem raporları ulaştı.</message>
+	<message key="editor.submission.newRound">Yeni Tur</message>
+	<message key="editor.submissionLibrary">Gönderi Kütüphanesi</message>
+	<message key="editor.submission.addReviewer">Hakem Ekle</message>
+	<message key="editor.submission.uploadSelectFiles">Dosya Ekle</message>
+	<message key="editor.submission.roundStatus.reviewsReady">Hakem raporları ulaştı.</message>
 
-    <message key="editor.submission.decision.requestRevisions">Karar: Düzeltme</message>
-    <message key="editor.submission.decision.resubmit">Karar: Tekrar Gönderme</message>
-    <message key="editor.submission.roundStatus.pendingReviewers">Hakem Bekleniyor</message>
-    <message key="editor.submissionReview.uploadAttachment">Dosya Yükle</message>
-    <message key="editor.submission.decision.decline">Karar: Red</message>
-    <message key="editor.submission.decision.sendToProduction">Basıma Gönder</message>
-    <message key="editor.submission.production.productionReadyFiles">Basıma Hazır Dosyalar</message>
-    <message key="editor.submission.findAndSelectReviewer">Hakem Atama İşlemi</message>
-     <message key="editor.submissionReview.restrictFiles">Dosyalar</message>
-     <message key="editor.submissionReview.restrictFiles.hide">Dosyaları Gizle</message>
-     <message key="editor.submissionReview.reviewType">Hakemleme Türü</message>
-         <message key="editor.submissionReview.doubleBlind">İki Kör Hakemleme</message>
-             <message key="editor.submissionReview.blind">Kör Hakemleme</message>
-                 <message key="editor.submissionReview.open">Açık Hakemleme </message>
-     <message key="editor.review.requestSent">İstek Gönderildi </message>
-     <message key="editor.review.reviewDetails">Detaylar </message>
-     <message key="editor.review.emailReviewer">E-Mail Gönder</message>
+	<message key="editor.submission.decision.requestRevisions">Karar: Düzeltme</message>
+	<message key="editor.submission.decision.resubmit">Karar: Tekrar Gönderme</message>
+	<message key="editor.submission.roundStatus.pendingReviewers">Hakem Bekleniyor</message>
+	<message key="editor.submissionReview.uploadAttachment">Dosya Yükle</message>
+	<message key="editor.submission.decision.decline">Karar: Red</message>
+	<message key="editor.submission.decision.sendToProduction">Basıma Gönder</message>
+	<message key="editor.submission.production.productionReadyFiles">Basıma Hazır Dosyalar</message>
+	<message key="editor.submission.findAndSelectReviewer">Hakem Atama İşlemi</message>
+	<message key="editor.submissionReview.restrictFiles">Dosyalar</message>
+	<message key="editor.submissionReview.restrictFiles.hide">Dosyaları Gizle</message>
+	<message key="editor.submissionReview.reviewType">Hakemleme Türü</message>
+	<message key="editor.submissionReview.doubleBlind">İki Kör Hakemleme</message>
+	<message key="editor.submissionReview.blind">Kör Hakemleme</message>
+	<message key="editor.submissionReview.open">Açık Hakemleme </message>
+	<message key="editor.review.requestSent">İstek Gönderildi </message>
+	<message key="editor.review.reviewDetails">Detaylar </message>
+	<message key="editor.review.emailReviewer">E-Mail Gönder</message>
 
 
-    <message key="editor.submission.revisions">Düzeltmeler</message>
-    <message key="editor.submission.selectReviewer">Hakem Ata</message>
-    <message key="editor.review.skipEmail">Mail Gönderme</message>
-    <message key="editor.review.createReviewer">Yeni Hakem Oluştur</message>
-    <message key="editor.review.personalMessageToReviewer">Hakeme Gönderilecek Mesaj</message>
-    <message key="editor.review.importantDates">Önemli Tarihler</message>
-    <message key="editor.review.reviewDueDate">Hakemleme Son Tarihi</message>
-    <message key="editor.review.enrollReviewer.short">Yeni Hakem Kaydet</message>
-    <message key="editor.review.reviewSubmitted">Tamamlandı</message>
-    <message key="editor.review.readReview">Değerlendirmeyi Gör</message>
+	<message key="editor.submission.revisions">Düzeltmeler</message>
+	<message key="editor.submission.selectReviewer">Hakem Ata</message>
+	<message key="editor.review.skipEmail">Mail Gönderme</message>
+	<message key="editor.review.createReviewer">Yeni Hakem Oluştur</message>
+	<message key="editor.review.personalMessageToReviewer">Hakeme Gönderilecek Mesaj</message>
+	<message key="editor.review.importantDates">Önemli Tarihler</message>
+	<message key="editor.review.reviewDueDate">Hakemleme Son Tarihi</message>
+	<message key="editor.review.enrollReviewer.short">Yeni Hakem Kaydet</message>
+	<message key="editor.review.reviewSubmitted">Tamamlandı</message>
+	<message key="editor.review.readReview">Değerlendirmeyi Gör</message>
 	<message key="editor.submissionArchive">Gönderi Arşivi</message>
 	<message key="editor.publishing">Yayımlama</message>
 	<message key="editor.publishedIssues">Yayımlanmış Sayılar</message>
 	<message key="editor.allSections">Tüm Bölümler</message>
 	<message key="editor.allEditors">Tüm Editörler</message>
 	<message key="editor.me">Ben</message>
-    <message key="editor.publicIdentificationExists">Bu tanımlama '{$publicIdentifier}' zaten başka bir nesneye (konu, makale, kadırga ya da dosyası) için mevcuttur. dergi içinde benzersiz tanımlamalar seçiniz.</message>
+	<message key="editor.publicIdentificationExists">Bu tanımlama '{$publicIdentifier}' zaten başka bir nesneye (konu, makale, kadırga ya da dosyası) için mevcuttur. dergi içinde benzersiz tanımlamalar seçiniz.</message>
 	<message key="editor.submissionArchive.noSubmissions">Arşivde kayıtlı gönderi yok</message>
-    <message key="editor.submission.stageParticipants">Katılımcılar</message>
+	<message key="editor.submission.stageParticipants">Katılımcılar</message>
 	<message key="editor.submissionArchive.saveChanges">Arşivlenmiş gönderilerdeki değişiklikleri kaydet. Silinmek üzere işaretli kayıtlı yazılar sistemden tamamen silinecektir.</message>
 	<message key="editor.submissionArchive.confirmDelete">Bu kaydı tamamen silmek istediğinizden emin misiniz?</message>
 	<message key="editor.submissionReview.confirmDecision">Bu kararı kaydetmek istediğinizden emin misiniz?</message>
@@ -77,7 +77,7 @@
 	<message key="editor.notifyUsers.includeToc">Bu sayının içindekiler listesini ekle:</message>
 	<message key="editor.editorAdministration">Editör Yönetimi</message>
 	<message key="editor.issues.createIssue">Sayı Oluştur</message>
-    <message key="editor.issues.editIssue">Sayı Yönetimi: {$issueIdentification}</message>
+	<message key="editor.issues.editIssue">Sayı Yönetimi: {$issueIdentification}</message>
 	<message key="editor.issues.backIssues">Eski Sayılar</message>
 	<message key="editor.issues.futureIssues">Gelecek Sayılar</message>
 	<message key="editor.issues.currentIssue">Şimdiki Sayı</message>
@@ -86,7 +86,7 @@
 	<message key="editor.issues.confirmDelete">Bu sayıyı kalıcı olarak silmek istediğinizden emin misiniz?</message>
 	<message key="editor.issues.published">Yayımlanmış</message>
 	<message key="editor.issues.unpublished">Yayımlanmamış</message>
-    <message key="editor.issues.datePublished">Yayımlanma Tarihi</message>
+	<message key="editor.issues.datePublished">Yayımlanma Tarihi</message>
 	<message key="editor.issues.volumeRequired">Cilt gerekli. Pozitif, numerik değer olmalıdır.</message>
 	<message key="editor.issues.numberRequired">Sayı gerekli.  Pozitif, numerik değer olmalıdır.</message>
 	<message key="editor.issues.yearRequired">Yıl gerekli.  Pozitif, numerik değer olmalıdır.</message>
@@ -104,8 +104,8 @@
 	<message key="editor.issues.remove">Kaldır</message>
 	<message key="editor.issues.proofed">Düzeltilmiş</message>
 	<message key="editor.issues.removeCoverPage">Kapak sayfası görselini kaldır?</message>
-    <message key="editor.issues.removeCoverImageFileNameMismatch">Silmek istediğiniz kapak resmi ile eşleşme sağlanamadı. Lütfen sayfayı yenileyin ve tekrar deneyin.</message>
-    <message key="editor.issues.removeCoverImageFileNotFound">Silmek istediğiniz kapak resmi bulunamadı. Silinmiş olabilir. Sayfayı yenilemeyi deneyin.</message>
+	<message key="editor.issues.removeCoverImageFileNameMismatch">Silmek istediğiniz kapak resmi ile eşleşme sağlanamadı. Lütfen sayfayı yenileyin ve tekrar deneyin.</message>
+	<message key="editor.issues.removeCoverImageFileNotFound">Silmek istediğiniz kapak resmi bulunamadı. Silinmiş olabilir. Sayfayı yenilemeyi deneyin.</message>
 	<message key="editor.issues.invalidCoverPageFormat">Geçersiz kapak sayfası görsel biçimi. Uygun dosya biçimleri: .gif, .jpg veya .png.</message>
 	<message key="editor.issues.styleFile">Sayfa Sitili</message>
 	<message key="editor.issues.invalidStyleFormat">Uygunsuz sayfa sitil dosyası. Gönderdiğiniz dosyanın geçerli bir biçimlendirme dosyası olduğundan emin olunuz (CSS). (Note: Başlangıcında yorumlar olan biçimlendirme dosyaları reddedilebilir.)</message>
@@ -138,27 +138,27 @@
 	<message key="editor.issues.noLiveIssues">Yayınlanan Sayı Yok</message>
 	<message key="editor.issues.open">Aç</message>
 	<message key="editor.issues.pages">Sayfalar</message>
-    <message key="editor.issues.galleys">Sayı Dizgileri</message>
-    <message key="editor.issues.galley">Sayı Dizgisi</message>
-    <message key="editor.issues.viewingGalley">Sayı Dizgisi Gösterimi</message>
-    <message key="editor.issues.issueGalleysDescription">Tüm konu içeriği ile dizgileri yayınla.</message>
-    <message key="editor.issues.noneIssueGalleys">Hiçbir sayı dizgisi yayınlanmamıştır.</message>
-    <message key="editor.issues.galleyLabelRequired">Sayı dizgi etiketi gerekli.</message>
-    <message key="editor.issues.galleyLocaleRequired">Sayı dizgi dili gerekli.</message>
-    <message key="editor.issues.galleyPublicIdentificationExists">Genel sayı dizgi kimliği zaten var.</message>
-    <message key="editor.issues.backToIssueGalleys">Sayı dizgilerine geri dön</message>
-    <message key="editor.issues.viewingGalley">Sayı Dizgisine Bakış</message>
-    <message key="editor.issues.confirmDeleteGalley">Bu sayı dizgisini silmek istediğinizden emin misiniz?</message>
-    <message key="editor.issues.identifiers">Tanımlayıcılar</message>
+	<message key="editor.issues.galleys">Sayı Dizgileri</message>
+	<message key="editor.issues.galley">Sayı Dizgisi</message>
+	<message key="editor.issues.viewingGalley">Sayı Dizgisi Gösterimi</message>
+	<message key="editor.issues.issueGalleysDescription">Tüm konu içeriği ile dizgileri yayınla.</message>
+	<message key="editor.issues.noneIssueGalleys">Hiçbir sayı dizgisi yayınlanmamıştır.</message>
+	<message key="editor.issues.galleyLabelRequired">Sayı dizgi etiketi gerekli.</message>
+	<message key="editor.issues.galleyLocaleRequired">Sayı dizgi dili gerekli.</message>
+	<message key="editor.issues.galleyPublicIdentificationExists">Genel sayı dizgi kimliği zaten var.</message>
+	<message key="editor.issues.backToIssueGalleys">Sayı dizgilerine geri dön</message>
+	<message key="editor.issues.viewingGalley">Sayı Dizgisine Bakış</message>
+	<message key="editor.issues.confirmDeleteGalley">Bu sayı dizgisini silmek istediğinizden emin misiniz?</message>
+	<message key="editor.issues.identifiers">Tanımlayıcılar</message>
 	<message key="editor.navigation.issues">Sayılar</message>
-    <message key="editor.navigation.futureIssues">Gelecek Sayılar</message>
-    <message key="grid.action.addGalley">Dizgiye Ekle</message>
-    <message key="grid.action.publish">Sayıyı Yayınla</message>
-    <message key="grid.action.addIssue">Yeni Sayı Yarat</message>
-    <message key="grid.action.viewIssue">Bakış</message>
-    <message key="grid.action.previewIssue">Önizleme</message>
-    <message key="grid.action.addIssueGalley">Sayı Dizgisi Yarat</message>
-    <message key="editor.navigation.issueArchive">Önceki Sayılar</message>
+	<message key="editor.navigation.futureIssues">Gelecek Sayılar</message>
+	<message key="grid.action.addGalley">Dizgiye Ekle</message>
+	<message key="grid.action.publish">Sayıyı Yayınla</message>
+	<message key="grid.action.addIssue">Yeni Sayı Yarat</message>
+	<message key="grid.action.viewIssue">Bakış</message>
+	<message key="grid.action.previewIssue">Önizleme</message>
+	<message key="grid.action.addIssueGalley">Sayı Dizgisi Yarat</message>
+	<message key="editor.navigation.issueArchive">Önceki Sayılar</message>
 	<message key="editor.article.designateReviewVersion">Orjinal dosyayı Değerlendirme Sürümü olarak belirle</message>
 	<message key="editor.article.decision">Karar</message>
 	<message key="editor.submissions.showBy">Göster</message>
@@ -172,7 +172,7 @@
 	<message key="editor.submissions.lastCompleted">Son Tamamlanan</message>
 	<message key="editor.submissions.assignedTo">Atanan</message>
 	<message key="editor.submissions.inSection">Bölümde</message>
-    <message key="editor.article.schedulePublication">Yayınlanacağı Sayı:</message>
+	<message key="editor.article.schedulePublication">Yayınlanacağı Sayı:</message>
 	<message key="editor.article.scheduleForPublication">Yayınlanmak üzere planlandığı sayı:</message>
 	<message key="editor.article.scheduleForPublication.toBeAssigned">Yayın Planı Yapılacak</message>
 	<message key="editor.article.payment.publicationFeeNotPaid">Yayın ücreti ödenmedi. Öğenin yayın planına alınabilmesi için yazara ödeme veya feragat bilgilendirmesi yap.</message>
@@ -180,17 +180,17 @@
 	<message key="editor.article.hideCoverPageToc">İçindekiler sayfasında küçük kapak görseli görüntüleme.</message>
 	<message key="editor.article.hideCoverPageAbstract">Makale abstraktını görüntülerken kapak görseli görüntüleme.</message>
 
-    <message key="grid.action.removeArticle">Makale Sayıdan Silinsin</message>
-    <message key="editor.article.remove">Sil</message>
-    <message key="editor.article.remove.confirm">Makaleyi bu sayıdan silmek istediğinizden emin misiniz ? Bu makale bir başka sayı içinde yayınlanabilir.</message>
+	<message key="grid.action.removeArticle">Makale Sayıdan Silinsin</message>
+	<message key="editor.article.remove">Sil</message>
+	<message key="editor.article.remove.confirm">Makaleyi bu sayıdan silmek istediğinizden emin misiniz ? Bu makale bir başka sayı içinde yayınlanabilir.</message>
 	<message key="editor.issues.invalidAccessDate">Giriş tarihi geçerli değil.</message>
-    <message key="editor.issues.editIssueGalley">Sayı Dizgisini Düzenle</message>
-    <message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[Mizanpaj editörü bu dosyaları her dizgi için hazırlar ve sağlama <span class="pkp_help_title">Sağlama</span> için yükler.]]></message>
-    <message key="editor.submission.selectGalleyFiles">Dizgi dosyalarını seç</message>
-    <message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Bu listedeki nihai taslak dosyalar altında aşağıda yüklendi copyedited sürümleri, bir sayfa düzenleyici tarafından dönüştürülür.<span class="pkp_help_title">Copyediting</span>.]]></message>
-    <message key="editor.submission.proof.manageProofFilesDescription">Zaten herhangi bir başvuru aşamasında yüklenmiş olan tüm dosyalar için aşağıdaki onay kutusunu ve tıklayarak Dahil kontrol ederek Redaksiyon liste eklenebilir. Arama: Tüm mevcut dosyalar listelenir ve dahil edilmesi için seçilebilir.</message>
+	<message key="editor.issues.editIssueGalley">Sayı Dizgisini Düzenle</message>
+	<message key="editor.submission.production.productionReadyFilesDescription"><![CDATA[Mizanpaj editörü bu dosyaları her dizgi için hazırlar ve sağlama <span class="pkp_help_title">Sağlama</span> için yükler.]]></message>
+	<message key="editor.submission.selectGalleyFiles">Dizgi dosyalarını seç</message>
+	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Bu listedeki nihai taslak dosyalar altında aşağıda yüklendi copyedited sürümleri, bir sayfa düzenleyici tarafından dönüştürülür.<span class="pkp_help_title">Copyediting</span>.]]></message>
+	<message key="editor.submission.proof.manageProofFilesDescription">Zaten herhangi bir başvuru aşamasında yüklenmiş olan tüm dosyalar için aşağıdaki onay kutusunu ve tıklayarak Dahil kontrol ederek Redaksiyon liste eklenebilir. Arama: Tüm mevcut dosyalar listelenir ve dahil edilmesi için seçilebilir.</message>
 	<message key="editor.publicIdentificationExists">Diğer objeler (sayı, makale, dizgi veya ek dosya) için '{$publicIdentifier}' adlı genel belirleyici zaten var. Lütfen derginizdeki tekil belirleyicileri seçiniz.</message>
 	<message key="editor.article.remove">Kaldır</message>
-    <message key="editor.review.notInitiated">İnceleme süreci henüz başlatılmadı.</message>
-		<message key="editor.article.coverImage">Kapak resmi</message>
+	<message key="editor.review.notInitiated">İnceleme süreci henüz başlatılmadı.</message>
+	<message key="editor.article.coverImage">Kapak resmi</message>
 </locale>

From f9c0e38f11de338ed9e585894e4c11123450d437 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Mon, 16 Apr 2018 17:43:39 +0100
Subject: [PATCH 090/100] pkp/pkp-lib#3565 Fix wrong locale string in
 sv_SE/editor.xml

---
 locale/sv_SE/editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sv_SE/editor.xml b/locale/sv_SE/editor.xml
index cf510412b6c..f745b8d1db3 100644
--- a/locale/sv_SE/editor.xml
+++ b/locale/sv_SE/editor.xml
@@ -147,5 +147,5 @@
 	<message key="editor.submission.editorial.finalDraftDescription"><![CDATA[Slutgiltiga utkastfiler i den här listan görs om till manusredigerade versioner av en manusredaktör och laddas upp nedan under <span class="pkp_help_title">Manusredigering</span>.]]></message>
 	<message key="editor.submission.proof.manageProofFilesDescription">Alla filer som redan laddats upp i något av processens steg kan läggas till i listan för Korrekturläsning genom att kryssa i rutan "Inkludera" nedan och klicka på Sök: alla tillgängliga filer listas och kan väljas för inkludering.</message>
 	<message key="editor.publicIdentificationExistsForTheSameType">Den publika identifikatorn '{$publicIdentifier}' existerar redan för ett annat objekt av samma typ. already exists for another object of the same type. Vänligen välj unika identifikatorer inom tidskriften.</message>
-  <message key="editor.article.cover">Omslag</message>
+  <message key="editor.article.coverImage">Omslagsbild</message>
 </locale>

From 2cf59fb9a69554ba978a7851520d55f3691e551d Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 16 Apr 2018 20:13:05 +0200
Subject: [PATCH 091/100] pkp/pkp-lib#3580 submodule update ##bozana/3580##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 7a9d7eb70a9..9fa53e47e11 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 7a9d7eb70a97b5478b6f1a215b9bcad4f4224e7c
+Subproject commit 9fa53e47e118767ed379c485c48290964ef7694e

From 4ef36258d56fca2bd5c275b319910cfb2b45ffa7 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Tue, 17 Apr 2018 14:53:03 +0200
Subject: [PATCH 092/100] pkp/pkp-lib#3597 remove double SQL for metrics supp
 file migration

---
 dbscripts/xml/upgrade/3.0.0_postupgrade_metrics.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/dbscripts/xml/upgrade/3.0.0_postupgrade_metrics.xml b/dbscripts/xml/upgrade/3.0.0_postupgrade_metrics.xml
index 6dc49b1cda7..efc70bb7c0d 100644
--- a/dbscripts/xml/upgrade/3.0.0_postupgrade_metrics.xml
+++ b/dbscripts/xml/upgrade/3.0.0_postupgrade_metrics.xml
@@ -19,13 +19,6 @@
 		<query>UPDATE metrics SET assoc_type = 531 WHERE assoc_type = 262</query>
 	</sql>
 
-	<!-- update the supp file ids to the new file ids, ASSOC_TYPE_SUBMISSION_FILE_COUNTER_OTHER = 531 -->
-	<sql>
-		<query driver="mysql">UPDATE metrics m, submission_file_settings sfs SET m.assoc_id = sfs.file_id WHERE m.assoc_type = 531 AND sfs.setting_name = 'old-supp-id' AND sfs.setting_value = m.assoc_id</query>
-		<query driver="mysqli">UPDATE metrics m, submission_file_settings sfs SET m.assoc_id = sfs.file_id WHERE m.assoc_type = 531 AND sfs.setting_name = 'old-supp-id' AND sfs.setting_value = m.assoc_id</query>
-		<query driver="postgres7">UPDATE metrics SET assoc_id = sfs.file_id FROM submission_file_settings sfs WHERE metrics.assoc_type = 531 AND sfs.setting_name = 'old-supp-id' AND CAST(nullif(sfs.setting_value, '') AS integer) = metrics.assoc_id</query>
-	</sql>
-
 	<!-- fill the new metrics columns (assoc_object_type, assoc_object_id, pkp_section_id and representation_id) appropriately: -->
 	<!-- insert section id for articles, article galleys and files - they all have submission_id in the table -->
 	<sql>

From 21e3c209e8a248ac809ef2466ec1a7af44ecabf5 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Wed, 18 Apr 2018 09:48:28 +0100
Subject: [PATCH 093/100] Submodule update ##NateWr/i3547_cyrillic##

---
 plugins/generic/citationStyleLanguage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
index 42f64d28428..5a32965f232 160000
--- a/plugins/generic/citationStyleLanguage
+++ b/plugins/generic/citationStyleLanguage
@@ -1 +1 @@
-Subproject commit 42f64d284280941e8c50283aa6094e8fd0bb9f58
+Subproject commit 5a32965f2320ac36df077ed04768a4e723c44b7b

From 907f60e8c1856bd670ac413a317c4bf7aba15327 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Fri, 20 Apr 2018 10:09:39 +0200
Subject: [PATCH 094/100] pkp/pkp-lib#3609 submodule update ##bozana/3609##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index 9fa53e47e11..b6e0de6a22b 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 9fa53e47e118767ed379c485c48290964ef7694e
+Subproject commit b6e0de6a22bac44543295317e13730d98ce646e7

From 51948b99df5ab136730619032b9e72f3f490bb5b Mon Sep 17 00:00:00 2001
From: Carlos Zamora-Manzur <carzamora@gmail.com>
Date: Fri, 20 Apr 2018 19:26:02 -0300
Subject: [PATCH 095/100] added es_ES translation

just for expand Spanish support
---
 .../locale/es_ES/locale.xml                   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/generic/recommendBySimilarity/locale/es_ES/locale.xml

diff --git a/plugins/generic/recommendBySimilarity/locale/es_ES/locale.xml b/plugins/generic/recommendBySimilarity/locale/es_ES/locale.xml
new file mode 100644
index 00000000000..b7e7ec52a0e
--- /dev/null
+++ b/plugins/generic/recommendBySimilarity/locale/es_ES/locale.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * plugins/generic/recommendBySimilarity/locale/es_ES/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  * Localization strings.
+  -->
+
+<locale name="es_ES" full_name="Español (España)">
+	<message key="plugins.generic.recommendBySimilarity.displayName">Recomendar artículos similares</message>
+	<message key="plugins.generic.recommendBySimilarity.description">Este módulo agrega una lista de artículos similares a la página de resumen del artículo.</message>
+	<message key="plugins.generic.recommendBySimilarity.heading">Artículos similares</message>
+	<message key="plugins.generic.recommendBySimilarity.advancedSearchIntro">También puede {advancedSearchLink} para este artículo.</message>
+	<message key="plugins.generic.recommendBySimilarity.advancedSearch">iniciar una búsqueda de similitud avanzada</message>
+</locale>

From 5ccd7ba6865805fa615b1bb2ce698d5b619fd056 Mon Sep 17 00:00:00 2001
From: Carlos Zamora-Manzur <carzamora@gmail.com>
Date: Fri, 20 Apr 2018 19:38:14 -0300
Subject: [PATCH 096/100] added es_ES locale for subscriptions plugins

---
 .../subscriptions/locale/es_ES/locale.xml      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/reports/subscriptions/locale/es_ES/locale.xml

diff --git a/plugins/reports/subscriptions/locale/es_ES/locale.xml b/plugins/reports/subscriptions/locale/es_ES/locale.xml
new file mode 100644
index 00000000000..6d559c2bcb5
--- /dev/null
+++ b/plugins/reports/subscriptions/locale/es_ES/locale.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "../../../../../lib/pkp/dtd/locale.dtd">
+
+<!--
+  * plugins/reports/subscriptions/locale/es_ES/locale.xml
+  *
+  * Copyright (c) 2014-2018 Simon Fraser University
+  * Copyright (c) 2003-2018 John Willinsky
+  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+  * Localization strings.
+  -->
+
+<locale name="es_ES" full_name="Español (España)">
+	<message key="plugins.reports.subscriptions.displayName">Informe de Suscripciones</message>
+	<message key="plugins.reports.subscriptions.description">Este módulo implementa un informe CSV que contiene una lista de suscripciones y su información.</message>
+	<message key="plugins.reports.subscriptions.institutionMailingAddress">Dirección postal de la institución</message>
+	<message key="plugins.reports.subscriptions.ipRanges">Rangos de IP</message>
+</locale>

From 753ac9108e9fa9f534cd5af262b2515d7a0f8782 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 23 Apr 2018 14:15:25 +0200
Subject: [PATCH 097/100] pkp/pkp-lib#3609 submodule update ##bozana/3609##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index b6e0de6a22b..bff622e5fba 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit b6e0de6a22bac44543295317e13730d98ce646e7
+Subproject commit bff622e5fbac0d21053c0f16b07b624a3d5ffd3e

From da9d998254fabb6e73057a4a8aa055da10bd02fd Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 25 Apr 2018 16:31:33 +0200
Subject: [PATCH 098/100] pkp/pkp-lib#3619 submodule update ##bozana/3619##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index bff622e5fba..d94828471aa 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit bff622e5fbac0d21053c0f16b07b624a3d5ffd3e
+Subproject commit d94828471aadca003dc5884183cde2b29e598e96

From f6bc65918890c34f5e001f9f7c7709f71c87adc8 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 25 Apr 2018 17:35:35 +0200
Subject: [PATCH 099/100] pkp/pkp-lib#3640 submodule update ##bozana/3640##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index d94828471aa..7cb4bb997a0 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit d94828471aadca003dc5884183cde2b29e598e96
+Subproject commit 7cb4bb997a08610d468a5f92f28853426acbffc5

From 95ddced21fa8945037fa0e639017f38d2149564d Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Wed, 25 Apr 2018 22:24:57 +0300
Subject: [PATCH 100/100] pkp/pkp-lib#3536 do not show review from selection in
 section settings if no custom forms exist

---
 .../grid/settings/sections/form/sectionForm.tpl           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/controllers/grid/settings/sections/form/sectionForm.tpl b/templates/controllers/grid/settings/sections/form/sectionForm.tpl
index 0e0e0eb7827..5aede8bca9c 100644
--- a/templates/controllers/grid/settings/sections/form/sectionForm.tpl
+++ b/templates/controllers/grid/settings/sections/form/sectionForm.tpl
@@ -41,9 +41,11 @@
 			{fbvElement type="text" id="wordCount" value=$wordCount maxlength="80" label="manager.sections.wordCountInstructions"}
 		{/fbvFormSection}
 
-		{fbvFormSection title="submission.reviewForm" for="reviewFormId" inline=true size=$fbvStyles.size.MEDIUM}
-			{fbvElement type="select" id="reviewFormId" defaultLabel="manager.reviewForms.noneChosen"|translate defaultValue="" from=$reviewFormOptions selected=$reviewFormId translate=false size=$fbvStyles.size.MEDIUM inline=true}
-		{/fbvFormSection}
+		{if count($reviewFormOptions)>0}
+			{fbvFormSection title="submission.reviewForm" for="reviewFormId" inline=true size=$fbvStyles.size.MEDIUM}
+				{fbvElement type="select" id="reviewFormId" defaultLabel="manager.reviewForms.noneChosen"|translate defaultValue="" from=$reviewFormOptions selected=$reviewFormId translate=false size=$fbvStyles.size.MEDIUM inline=true}
+			{/fbvFormSection}
+		{/if}
 
 		{call_hook name="Templates::Manager::Sections::SectionForm::AdditionalMetadata" sectionId=$sectionId}
 	{/fbvFormArea}