diff --git a/.gitignore b/.gitignore
index a32b173075..eb1711f662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /modules/
 /themes/
 /application/test/config/database.ini
+/application/asset/css/font-awesome/
 /vendor/
 /node_modules/
 .sass-cache
diff --git a/.travis.yml b/.travis.yml
index dc5aa54c84..2f1799a51c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
 language: php
 
+dist: bionic
+
 php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 services:
   - mysql
diff --git a/application/Module.php b/application/Module.php
index 5c1e61830e..17574fd2e1 100644
--- a/application/Module.php
+++ b/application/Module.php
@@ -3,8 +3,8 @@
 
 use Omeka\Api\Adapter\FulltextSearchableInterface;
 use Omeka\Module\AbstractModule;
-use Zend\EventManager\Event as ZendEvent;
-use Zend\EventManager\SharedEventManagerInterface;
+use Laminas\EventManager\Event as ZendEvent;
+use Laminas\EventManager\SharedEventManagerInterface;
 
 /**
  * The Omeka module.
@@ -14,7 +14,7 @@ class Module extends AbstractModule
     /**
      * This Omeka version.
      */
-    const VERSION = '2.0.2';
+    const VERSION = '2.9.3-alpha';
 
     /**
      * The vocabulary IRI used to define Omeka application data.
@@ -38,7 +38,7 @@ public function getConfig()
     public function attachListeners(SharedEventManagerInterface $sharedEventManager)
     {
         $sharedEventManager->attach(
-            'Zend\View\Helper\Navigation\AbstractHelper',
+            'Laminas\View\Helper\Navigation\AbstractHelper',
             'isAllowed',
             [$this, 'navigationPageIsAllowed']
         );
diff --git a/application/asset/css/page-blocks.css b/application/asset/css/page-blocks.css
new file mode 100644
index 0000000000..b148da4fba
--- /dev/null
+++ b/application/asset/css/page-blocks.css
@@ -0,0 +1 @@
+.item-showcase{margin:1rem 0;border-top:1px solid #dfdfdf;border-bottom:1px solid #dfdfdf;padding:calc(1rem - 1px) 0 0;overflow:hidden;text-align:center;clear:both;display:flex;flex-wrap:wrap;justify-content:center}.item.resource .caption{font-size:.875rem;line-height:1.5rem}.item.resource .caption *{margin:0 0 1rem 0}.item.resource .caption>*:last-child{margin-bottom:0}.item-showcase .resource.item{vertical-align:top;margin-bottom:1rem}.item-showcase .resource.item img{margin-right:.5rem;max-width:100%}.item-showcase .resource.item:only-child img{margin:0 auto}.item-showcase .resource.item:not(:only-child){width:25%;clear:none;padding:0 .5rem}.item-showcase .resource.item:not(:only-child) h3{clear:left;font-size:1rem;line-height:1.5rem;margin:.5rem 0 0}.item-showcase .resource.item:not(:only-child) img{max-height:7rem;width:auto;float:none;margin-right:0;vertical-align:top}.right,.left{overflow:hidden;max-width:33.33%}.left .item.resource,.right .item.resource{margin:0 0 1rem 0}.left .item.resource:first-of-type,.right .item.resource:first-of-type{padding-top:calc(1rem - 1px);margin-top:0}.left .item.resource:last-of-type,.right .item.resource:last-of-type{padding-bottom:-1px}.left .item.resource .media-render a,.right .item.resource .media-render a{display:block}.left .item.resource audio,.left .item.resource canvas,.left .item.resource video,.left .item.resource progress,.left .item.resource img,.right .item.resource audio,.right .item.resource canvas,.right .item.resource video,.right .item.resource progress,.right .item.resource img{max-width:100%;vertical-align:bottom;margin-bottom:.5rem}.file{border-top:1px solid #dfdfdf;border-bottom:1px solid #dfdfdf;margin-top:1rem;margin-bottom:1rem}.left.file{float:left;clear:left;margin:0 1rem 1rem 0}.right.file{float:right;clear:right;margin:0 0 1rem 1rem}.center.file{display:flex;justify-content:center;flex-wrap:wrap;text-align:center}.center.file .item{width:100%}.left .item.resource>a:first-child,.right .item.resource>a:first-child{vertical-align:top}.medium .item.resource>h3,.square .item.resource>h3{font-size:16px;line-height:1.5rem}.left .item.resource>h3,.right .item.resource>h3{margin:0}.left .item.resource+p,.right .item.resource+p{margin-top:0}.break{width:100%;clear:both;border-bottom:1px solid #dfdfdf;padding-bottom:-1px;margin:1rem 0}.break.transparent{border-color:transparent}.break.opaque{border-color:#dfdfdf}.preview-block{margin:1rem 0;overflow:hidden;width:100%;clear:both}.toc-block>ul{margin:1rem 0;list-style-type:none;border-left:5px solid #dfdfdf}.toc-block>ul>li{margin-bottom:.5rem}.toc-block>ul>li>a{font-weight:bold}.toc-block ul ul{list-style-type:none;padding-left:0}.toc-block ul ul ul{padding-left:1.25em}.toc-block ul ul li:before{content:"\2014";color:#dfdfdf}.item-with-metadata{width:100%;overflow:hidden;margin:1rem 0}.item-with-metadata .show.resource{margin:2rem 0}.list-of-sites .site-list .site{margin-bottom:.5rem}.list-of-sites .site-list .site-link{display:inline-block;font-size:1.25rem;margin-bottom:.25rem}.list-of-sites .site-list .site-summary{margin:0 0 0 .5rem;line-height:20px}
diff --git a/application/asset/css/style.css b/application/asset/css/style.css
index e512173e48..cf320bac5a 100644
--- a/application/asset/css/style.css
+++ b/application/asset/css/style.css
@@ -1 +1 @@
-/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}@media screen{*{box-sizing:border-box}em,i{font-style:italic}strong,b{font-weight:bold}a{text-decoration:none}a:link,a:visited{color:#A91919}a:active,a:hover{color:#e34545}h1,h2,h3,h4,h5,h6{margin:0}h3,h4,h5,h6{font-weight:bold}h1{font-size:32px;line-height:48px;margin-bottom:24px}h2{font-size:30px;line-height:36px;margin-bottom:24px}h3{font-size:24px;margin-bottom:24px}h5{font-size:14px}p{margin:24px 0}ul{padding-left:24px;list-style:disc}pre{max-width:100%;overflow-x:auto}html,body{height:100%}body{font-family:"Lato", sans-serif;font-size:16px;line-height:24px;color:#676767;overflow-x:hidden}table{width:100%;border-spacing:0;table-layout:fixed}th,table.tablesaw th{font-weight:bold;text-align:left;padding:6px 0.5em}table,table.tablesaw{margin-bottom:12px;border:1px solid #dfdfdf;border-radius:3px;border-collapse:separate}.tablesaw tr:not(:last-child) td{border-bottom:1px solid #dfdfdf}tr.delete{background-color:#fcc}td,table.tablesaw td{padding:6px 0.5em 5px;position:relative;vertical-align:middle}table.tablesaw td:first-child a{word-wrap:break-word}table.tablesaw thead tr:first-child th{padding-top:6px;padding-bottom:5px;border-bottom:1px solid #dfdfdf}legend{font-size:20px;padding:12px 0;font-weight:bold}[contenteditable="true"],textarea{clear:both;padding:6px;border:1px solid rgba(0,0,0,0.15);display:block;background-color:#fff;min-height:72px;overflow-y:auto}[contenteditable="true"] p{margin:12px 0}.cke_dialog_body textarea{max-height:none}input,[contenteditable="true"],textarea,button,select{font-family:"Lato", sans-serif;font-size:16px;line-height:24px;margin:0;color:#676767}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="number"],input[type="date"],input[type="datetime-local"]{-webkit-appearance:none;-moz-appearance:none;appearance:none;border-radius:0;height:36px;border:1px solid rgba(0,0,0,0.15);padding:6px;margin:0}:disabled{background-color:rgba(0,0,0,0.04);box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;color:#a7a7a7;cursor:default}:disabled:hover{box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset !important}:-ms-input-placeholder{font-style:italic}::-ms-input-placeholder{font-style:italic}::placeholder{font-style:italic}[contenteditable="true"]>*:first-child{margin-top:0}[contenteditable="true"]>*:last-child{margin-bottom:0}input[type="submit"],button,a.button,.button{min-height:36px;background-color:rgba(0,0,0,0.08);color:#676767;border-radius:3px;border:0;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;padding:6px 10px;display:inline-block;text-align:center;cursor:pointer;margin:0 0 12px 0}input[type="submit"]:hover:not(.inactive),button:hover:not(.inactive),a.button:hover:not(.inactive),.button:hover:not(.inactive){box-shadow:0 0 0 1px rgba(0,0,0,0.3) inset}input[type="submit"].inactive,button.inactive,a.button.inactive,.button.inactive{box-shadow:none;background-color:#d2d2d2;cursor:default;border:0}.red.button{background-color:#FDEFEF;box-shadow:0 0 0 1px #E0C3C3 inset;color:#A91919}.red.button:hover{box-shadow:0 0 0 1px #DA8B8B inset}.green.button{background-color:#cdffcd;color:green;box-shadow:0 0 0 1px #addead inset}.green.button:hover{box-shadow:0 0 0 1px #63c363 inset}.required .field-meta{position:relative;padding-right:36px}.required .field-meta:after{font-family:"Font Awesome 5 Free";content:"\f069";font-size:12px;position:absolute;right:12px;color:#A91919;top:6px}label input[type="checkbox"]{display:inline-block;width:auto}label.required:after{font-family:"Font Awesome 5 Free";font-weight:900;content:"\f069";font-size:12px;color:#A91919;float:right;padding-right:12px}.touched:invalid{box-shadow:0 0 2px 2px #A91919}.field{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px;display:flex;flex-wrap:wrap}.field:first-child{border-color:transparent}.media-field-wrapper{width:100%;padding:12px 6px;margin-bottom:6px;background-color:rgba(0,0,0,0.04);position:relative}.media-field-wrapper .field{width:100%;margin:0 0 6px;padding:0;background-color:transparent}.media-field-wrapper .field:last-of-type{margin-bottom:0}.media-field-wrapper .field:last-of-type .field-meta,.media-field-wrapper .field:last-of-type .inputs{margin-bottom:-6px}.media-field-wrapper .actions{font-size:16px;padding:6px 0}select{background:#fff url("../img/select-arrow.svg") no-repeat;background-position:right 6px center;background-size:8px;border:1px solid #dfdfdf;height:36px;line-height:36px;font-size:16px;margin:0;padding:0 24px 0 6px;border-radius:3px;vertical-align:top;-webkit-appearance:none;-moz-appearance:none;appearance:none}select::-ms-expand{display:none}label input{margin-right:.5em}fieldset{margin:0 0 24px;border:0;padding:0;min-width:100%}.selector input[type="text"],.selector>ul{width:100%}.selector>ul{margin:0}.chosen-container-single .chosen-single,.chosen-container-multi .chosen-choices{background-image:none;background-color:#fff;box-shadow:none;font-size:16px;line-height:24px;padding:6px;height:auto;border-radius:3px;border-collapse:#dfdfdf;color:#676767;border-color:#dfdfdf}.chosen-container-multi.chosen-container-active .chosen-choices{border-color:#aaa;border-radius:3px 3px 0 0}.chosen-container-multi.chosen-container.chosen-drop-up .chosen-choices{border-radius:0 0 3px 3px}.chosen-container-multi.chosen-container .chosen-drop{top:calc(100% - 1px);border-top:1px solid #aaa}.chosen-container-multi.chosen-container.chosen-drop-up .chosen-drop{bottom:calc(100% - 1px)}.chosen-container-multi .chosen-choices{padding:3px}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{font-family:"Lato", sans-serif;margin:0}.chosen-container-multi .chosen-choices li.search-choice{background:#f0f0f0;font-size:14px;line-height:24px;border:0;padding:0 27px 0 0}.chosen-container-multi .chosen-choices li.search-choice span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:block}.chosen-container .search-choice .group-name{color:#676767;position:relative;background-color:rgba(0,0,0,0.04);margin-right:6px;padding:0 6px;display:inline-block;vertical-align:top}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{top:50%;right:6px;transform:translateY(-50%)}.chosen-container .search-choice .group-name:after{content:""}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{min-height:0;margin:3px;height:auto;line-height:24px}.chosen-container-active.chosen-with-drop .chosen-single{background-image:none}.chosen-container-single .chosen-single abbr{top:12px}.chosen-container-single .chosen-single div b{background:none !important}.chosen-container-single .chosen-single div b:after{font-family:"Font Awesome 5 Free";content:"\f0d7";line-height:24px;padding:6px 0;display:inline-block}.chosen-container-active.chosen-with-drop .chosen-single div b:after{content:"\f0d8"}.chosen-container-single .chosen-search input[type="text"]{background:none !important}.chosen-search{position:relative}.chosen-search:after{font-family:"Font Awesome 5 Free";content:"\f002";line-height:24px;padding:6px 0;display:block;position:absolute;top:3px;right:12px}.chosen-container .chosen-results li.highlighted{background-color:#676767;background-image:none}.chosen-container.chosen-drop-up .chosen-drop{top:auto;bottom:100%;border-radius:3px 3px 0 0;box-shadow:0 -1px 2px rgba(0,0,0,0.15);border-top:1px solid #aaa}.chosen-container-active.chosen-drop-up.chosen-with-drop .chosen-single{border-radius:0 0 3px 3px}.flex{display:flex}.mobile-only{display:none}div[role="main"]>.messages{margin-bottom:12px}div[role="main"]>.messages li{margin:0 0 6px}div[role="main"]>.messages .error{background-color:#f4b4b4}div[role="main"]>.messages .success{background-color:#cdffcd}div[role="main"]>.messages .warning{background-color:#fff6e6}div[role="main"]>.messages a{text-decoration:underline}.messages{padding:0;margin:0;clear:both}.messages li{background-color:rgba(255,255,255,0.5);border-radius:3px;padding:6px 10px;margin-top:6px;display:block;width:100%}.field .messages{width:70%;color:#A91919;margin-left:auto}.field .messages li{box-shadow:0 0 0 1px inset}.error,.error a{color:#A91919}.success,.success a{color:green}.warning,.warning a{color:orange}.version-notification{background-color:#cdffcd;color:green;border-radius:3px;padding:6px 10px;margin-top:6px;display:block;width:100%}.version-notification a{color:green;text-decoration:underline}table .icon-sortable{opacity:.4;font-size:12px;line-height:100%}.row{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px}.sortable-handle:before{cursor:move;content:"\f0c9";font-family:"Font Awesome 5 Free";font-weight:900;opacity:.35;font-size:20px;line-height:24px;margin-right:12px}.o-description{margin-bottom:0}a.expand,a.collapse{color:#676767}.expand:after{content:"\f0da";font-family:"Font Awesome 5 Free";font-weight:900;margin-left:3px}.collapse:after{content:"\f0d7";font-family:"Font Awesome 5 Free";font-weight:900;margin-left:3px}header{background-color:#404E61;width:18.75%;min-height:100vh;text-align:left;padding:0 1.04167% 24px;color:#bdcde3}.skip{position:absolute;left:-9999px}.skip:focus{position:absolute;top:0;left:45%;width:10%;z-index:1002;text-align:center;background-color:#fff;border-radius:0 0 3px 3px;border:1px solid #dfdfdf;padding:5px}.logo a,#user a{color:#bdcde3}#user{color:#fff;padding-top:12px;margin-bottom:-6px}#user p{margin:0;display:inline-block;vertical-align:top}#user .user-id{text-transform:uppercase;font-size:12px;width:75%;margin-bottom:6px;margin-right:-4px}#user .user-id a{display:block;font-size:16px;text-transform:none;margin-top:-6px}#user .logout{font-size:12px;padding:0 6px;background-color:#222933;border-radius:3px;display:inline-block;min-width:25%;text-align:center}.logo{padding:6px 6.25%;margin:0 -6.25%;background-color:#222933}#search{width:100%;display:inline-block;vertical-align:top;margin:24px 0}#search input[type="text"]{width:calc(100% - 72px);float:left}#search button{width:36px;text-indent:-9999px;background-color:#222933;color:#bdcde3;border:0;float:left;margin:0;border-radius:0;position:relative;height:36px;box-shadow:none}#search button:last-of-type{border-left:1px solid rgba(255,255,255,0.2);border-radius:0 3px 3px 0}#search button:last-of-type:after{content:"\f002"}#search button:after{content:"\f141";font-family:"Font Awesome 5 Free";font-weight:900;text-indent:0;position:absolute;top:0;left:0;width:36px;line-height:36px;text-align:center}#advanced-options{display:none}div[role="main"]>h1:first-of-type{background-color:#fff;font-size:24px;position:fixed;padding:3px 30% 3px 1.04167%;z-index:3;top:0;right:0;width:81.25%;height:48px;border-bottom:1px solid #dfdfdf;overflow:hidden;line-height:36px}div[role="main"]>h1:first-of-type .title{text-overflow:ellipsis;white-space:nowrap;max-width:65%;display:inline-block;overflow:hidden;vertical-align:middle}.subhead{text-transform:uppercase;font-size:14px;padding:0 6px;background-color:#eee;line-height:36px;vertical-align:middle;margin:0 12px 0 0;font-weight:normal;display:inline-block}.subhead:before{font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin-right:6px;font-size:16px;vertical-align:top}.action{display:inline-block;vertical-align:middle}.action:before{content:"\00b7";margin:0 12px}.sidebar-open footer{margin-right:25%}footer{font-size:12px;position:relative;margin-top:-27px;margin-left:18.75%;padding-right:1.04167%;text-align:right}footer .site-version{margin:0;display:inline-block}footer .version-number{display:inline-block;margin:0 12px;line-height:1}body.transitions-enabled footer{transition:margin-right .5s}footer>a:not(:last-child){margin-right:12px}nav ul{padding:0;list-style:none;margin:0}nav.pagination{margin-bottom:12px;overflow:hidden}nav.pagination form,nav.pagination .button,nav.pagination .row-count{float:left}nav.pagination form{margin-right:12px}nav.pagination form *{display:inline-block;padding:0;text-align:center}nav.pagination .button{border-radius:0;margin:0;padding:0 10px}nav.pagination .button,nav.pagination input[type="text"],.sorting button,.sorting select{font-size:13.08px;min-height:0;height:24px;line-height:24px;vertical-align:top;background-size:6.5408px}nav.pagination .button{box-shadow:0 0 0 1px #C8C8C8 inset;position:relative}nav.pagination .button:hover{z-index:1}nav.pagination .button:before{vertical-align:top;line-height:24px}nav.pagination .previous.button{border-radius:3px 0 0 3px}nav.pagination .next.button{border-radius:0 3px 3px 0;margin-left:-1px}nav.pagination form input[type="text"]{margin-right:.25em;width:48px;border:1px solid #dfdfdf;padding:5px}nav.pagination+*:not(.sorting){clear:left}#mobile-nav{display:none}.mobile-container{position:relative}header nav h4{padding-bottom:5px;border-bottom:1px solid #364252;margin-bottom:6px}header nav h4:not(:first-of-type){margin-top:24px}header nav ul.navigation>li:not(:first-of-type){margin-top:6px}header nav ul.navigation>li:not(:last-of-type){border-color:#dfdfdf}header nav ul.navigation li li{display:none}header nav ul.navigation li.active li{display:block;margin-left:24px}header nav ul.navigation li.active>a{color:#fff}header nav a:link,header nav a:visited{color:#bdcde3}header nav li>a:before{content:"\f0fe";font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;width:24px}header nav .items:before,.items .subhead:before{content:"\f1b2"}header nav .media:before,.media .subhead:before{content:"\f03e"}header nav .item-sets:before,.item-sets .subhead:before{content:"\f1b3"}header nav .vocabularies:before,.vocabularies .subhead:before{content:"\f02d"}header nav .resource-templates:before,.resource-templates .subhead:before{content:"\f14b"}header nav .users:before,.users .subhead:before{content:"\f007"}header nav .modules:before,.modules .subhead:before{content:"\f0fe"}header nav .jobs:before,.jobs .subhead:before{content:"\f0ae"}header nav .sites:before,.sites .subhead:before{content:"\f109"}header nav .settings:before,.settings .subhead:before{content:"\f085"}header nav li li a:before{content:"\f0da"}header ul.navigation{margin-bottom:6px}#menu{position:relative}#menu h5{text-transform:uppercase;border-top:1px solid #364252;padding-top:5px;margin-bottom:0}#menu .expand,#menu .collapse{width:100%;z-index:1;padding-bottom:6px;margin-bottom:6px}#site-nav{background-color:#364252;padding:6px;margin-bottom:12px;border-radius:3px}#site-nav h5{border-top:0;border-bottom:1px solid #2c3542;padding:0 24px 5px 0;margin-bottom:6px}header nav#site-nav h5 a:before{content:"\f109";font-family:"Font Awesome 5 Free";width:24px;display:inline-block;font-weight:normal;font-size:16px}#menu .pages:before,.site-pages .subhead:before{content:"\f15b"}#menu a.navigation:before{content:"\f0e8"}#menu a.public{float:right;text-align:right;font-size:16px;line-height:30px;margin-top:-39px}#menu a.resources:before{content:"\f1b3"}#menu a.site-info:before{content:"\f085"}#menu a.theme:before,.theme-settings .subhead:before{content:"\f1fc"}div[role="main"]{width:81.25%;padding:60px 1.04167% 36px;background-color:#fff;min-height:100%;overflow:hidden}body.transitions-enabled div[role="main"]{transition:width .5s}#dashboard>p{width:100%;margin-top:12px}#manage-resources .add.button:before{content:"\f067";font-family:"Font Awesome 5 Free"}.panel{width:48.95833%;float:left;padding-left:1.04167%;padding-right:1.04167%;border:1px solid #dfdfdf;padding:5px;margin:0 1.04167% 0 0;float:left;overflow:hidden}.panel .row{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px}.panel>.row:last-child{margin-bottom:0}.panel .button{float:right;margin:0}.panel .row a.button{box-shadow:none;padding:0;color:#A91919;background-color:transparent}.panel h2{font-size:18px;line-height:24px;margin-bottom:6px}.browse .add.button,.browse .batch-edit.button{float:left;margin-right:.25em}.browse td:first-child,.browse th:first-child{width:50%}.browse td,.browse th{padding:12px 6px;overflow:hidden}.browse .browse-controls{display:flex;justify-content:space-between;flex-wrap:wrap;font-size:13.08px}.browse .browse-controls .advanced-search:before{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;font-family:"Font Awesome 5 Free";content:"\f002";padding:.25em}.browse-controls select,.browse-controls input,.browse-controls button,.browse-controls .button{font-size:13.08px;min-height:0;height:24px;line-height:24px;vertical-align:top;background-size:6.5408px}.browse-controls .sorting:not(:last-child){margin-left:auto}.browse-controls button,.browse-controls .button{padding:0 10px}.browse-controls .filtering{margin-left:24px}.browse .select-all{width:12px;margin-right:12px}.browse .tablesaw-cell-content,#properties .tablesaw-cell-content{display:flex;align-items:center;justify-content:flex-start;word-wrap:break-word}.browse .tablesaw-cell-content>.actions,#properties .tablesaw-cell-content>.actions{white-space:nowrap}.browse .batch-edit .tablesaw-cell-content>input[type="checkbox"]{margin-right:12px;flex-shrink:0}.browse .tablesaw-cell-content>span.indent{display:inline-block;vertical-align:top;flex:0;min-width:1em}.actions{margin:0 0 0 auto;display:flex;padding:0}.actions li{list-style-type:none}.actions a,.actions a:before,.actions button,.actions button:before{width:24px;height:24px;line-height:24px;vertical-align:top;border:0;box-shadow:none}.actions a,.actions button{opacity:.5}.actions a:before,.actions button:before{text-align:right}.actions a:hover,.actions a:active,.actions button:hover{opacity:1}.actions button{background-color:transparent;color:#A91919;margin:0;text-indent:-9999px;position:relative;padding:0;min-height:0}.actions button:before{text-indent:0;position:absolute;top:0;left:0}.row-count{margin:0 6px}.no-resources{text-align:center;position:relative;margin-top:96px}.no-resources:before{font-family:"Font Awesome 5 Free";font-weight:900;font-size:96px;position:absolute;top:0;left:0;width:100%;opacity:.08}.no-resources p{font-size:24px;line-height:48px;margin-top:48px}td .o-icon-private,td .o-icon-user-inactive{display:inline-block;vertical-align:bottom;margin-left:.5em;opacity:.5}.items .no-resources:before{content:"\f1b2"}.item-sets .no-resources:before{content:"\f1b3"}.media .no-resources:before,#media-list .no-resources:before{content:"\f03e"}.modules .no-resources:before{content:"\f0fe"}.vocabs .no-resources:before{content:"\f02d"}.resource-templates .no-resources:before,.resources-templates{content:"\f14b"}.users .no-resources:before{content:"\f0c0"}.jobs .no-resources:before{content:"\f0ae"}.sites .no-resources:before{content:"\f109"}#batch-form{border:1px solid #dfdfdf;border-bottom:0;border-radius:3px;margin-bottom:12px}#batch-form table.tablesaw{border-width:1px 0;border-radius:0 0 3px 3px;margin-bottom:0}#batch-form .batch-actions{display:inline-block}#batch-form .batch-inputs{display:flex;align-items:center;padding:6px;background-color:rgba(0,0,0,0.04)}#batch-form .batch-actions>a.button,#batch-form .batch-actions>button,#batch-form .batch-actions>input[type="submit"]{display:none;margin:0 12px 0 0;font-size:14px;line-height:24px;min-height:0;padding:0 6px}#batch-form .batch-actions>a.button.active,#batch-form .batch-actions>button.active,#batch-form .batch-actions>input[type="submit"].active{display:inline-block}#batch-form select{font-size:14px;min-height:0;height:auto;line-height:24px;padding:0 24px 0 6px;margin-right:6px;border:0;box-shadow:0 0 0 1px #dfdfdf inset}.batch-selected{padding-left:0;list-style:none}.batch-selected li{padding:12px 0 11px;border-bottom:1px solid #dfdfdf}.batch-selected li:first-child{padding-top:0}.batch-selected li:last-child{border-color:transparent}.multi-value.field .remove-value{background-color:transparent;color:#A91919;display:inline-block;text-indent:-9999px;position:relative;width:36px;text-align:center}.multi-value.field .remove-value:before{position:absolute;top:0;left:0;width:36px;line-height:36px;text-indent:0}.multi-value.field .remove-value:hover{color:#A91919}#advanced-options{background-color:#fff;padding:6px 12px calc(6px - 1px);clear:both;border:1px solid rgba(0,0,0,0.15);border-top:0;color:#676767}#advanced-options legend{float:left;width:calc(100% + 24px);font-weight:bold;padding:6px 12px;margin:-6px -12px 12px;background-color:rgba(0,0,0,0.04);max-width:none}#advanced-options input{float:left;clear:left;margin-right:.5em;height:24px;margin-bottom:6px}#advanced-options label{float:left;margin-bottom:6px}.search-filters{margin-bottom:6px;display:inline-block}.filter{display:inline-block;font-size:13.08px;margin:0 6px 6px 0;border-radius:3px;background-color:#f0f0f0;padding:0;vertical-align:top}.filter-label{display:inline-block;background-color:rgba(0,0,0,0.04);border-radius:3px 0 0 3px}.filter-label,.filter-value{padding:0 6px}.filter-value:not(:last-child):after{content:","}fieldset.section>legend{position:absolute;left:-9999px}.section-nav{border-top:1px solid #fff;height:42px;position:relative;margin-bottom:12px;clear:both}.section-nav:before{content:"";height:3px;position:absolute;bottom:1px;left:0;right:0;z-index:0;background:#fff;border:1px solid #dfdfdf;border-width:1px 0}.section-nav a{display:block;float:left;height:36px;line-height:30px;padding:3px 1em;position:relative;z-index:1;background-color:#fff;border-color:#dfdfdf;border:1px solid #dfdfdf;margin-left:.25em;color:#676767}.section-nav .active a{font-weight:bold;border-bottom-color:#fff}.section:not(a){display:none}.section.active{display:block}#page-actions{position:fixed;padding:6px 1.04167%;z-index:4;top:0;height:36px;right:0;text-align:right;margin-bottom:0}#page-actions input[type="submit"],#page-actions button,#page-actions .button{display:inline-block;height:36px;padding:6px 1em;min-height:0;vertical-align:top}#page-actions .delete.button{background-color:#FDEFEF;box-shadow:0 0 0 1px #E0C3C3 inset;color:#A91919}#page-actions .delete.button:hover{box-shadow:0 0 0 1px #DA8B8B inset}.add-property.button{margin-top:24px}.field-term{display:inline-block;font-family:"Source Code Pro", monospace;font-size:12px}.inputs .value a.value-language{margin-right:0;vertical-align:top;position:absolute;top:0;left:0;height:36px;width:36px;line-height:36px;border:1px solid #dfdfdf;overflow:hidden;text-align:center;color:#f19d9d;z-index:1}.inputs .value a.value-language.active{border-color:transparent}.inputs .value a.value-language ~ textarea{padding-left:42px}.inputs input[type="text"].value-language.active{line-height:24px;background-color:transparent;border:1px solid #dfdfdf;width:100%;min-height:0;padding:0 0 0 42px;display:block}.inputs input[type="text"].value-language.active.active ~ textarea{padding-left:6px;border-top:0}input[type="text"].value-language,.delete input[type="text"].value-language.active{display:none}.non-properties{margin-bottom:12px}.visibility{display:inline-block;padding:6px;margin-right:12px}.add .visibility:before,.edit .visibility:before{margin-right:.25em}.add .visibility [type="checkbox"],.edit .visibility [type="checkbox"]{margin-left:.5em}#add-item .remove.field{background-color:#ea7171;opacity:.6}.resource.input-option span{display:block;background-color:rgba(255,255,255,0.5);padding:6px 10px 0;width:100%;float:left}.field-meta{width:30%;padding-right:6px;position:relative}.field-meta legend,.field-meta label,.field-meta .label{max-width:80%;padding:6px 0;display:inline-block}.field-meta legend{position:static;float:left}.field-meta .error{float:left}.field-meta ul{margin:0}.field-label-text{display:block}.template{display:none}.selector ul{list-style:none;padding-left:0}.selector>ul{margin-top:6px}.selector li{position:relative}.selector li.total-count-heading{background-color:#404E61;color:#fff;border-radius:3px;text-transform:uppercase;font-size:12px;padding:6px 10px}.selector li.total-count-heading>ul{margin:6px -10px -6px;border-radius:0 0 3px 3px}.selector li.show>ul{position:relative;top:0;left:0;overflow:visible}.selector .selectable-list{background-color:#fff;color:#676767;overflow:visible;border-radius:3px;font-weight:bold;position:relative;border:1px solid #dfdfdf;margin:6px 0 0;text-transform:uppercase;font-size:12px}.selector .selectable-list li{padding:6px 12px}.selector .selectable-list .selector-parent{cursor:pointer;padding-right:24px;margin-bottom:0}.selector .selectable-list .selector-parent:after{content:"\f0da";font-family:"Font Awesome 5 Free";position:absolute;right:0;top:6px;width:18px}.selector .selectable-list .selector-parent.show:after{content:"\f0d7"}.selector .selectable-list .selector-parent:hover:before{content:"";position:absolute;top:0;bottom:0;left:0;width:5px;background-color:#dfdfdf}.selector .selectable-list .selector-parent:not(:last-of-type){border-bottom:1px solid #dfdfdf;padding-bottom:5px;border-color:#dfdfdf}.selector-parent ul{position:absolute;top:-9999px;left:-9999px}.selector-child{border-radius:0;font-weight:normal;padding:6px 10px;margin:0 -12px;font-size:16px;text-transform:none;width:calc(100% + 36px)}.selector-child:hover{background-color:rgba(0,0,0,0.04)}.selector-child:last-of-type{margin-bottom:-6px}.selector .description{display:inline-block;vertical-align:top}.selector .description.no-comment{opacity:0}.selector .description .o-icon-info{display:inline-block;margin:0 6px 0 0;opacity:.75;width:1em}.selector .description .o-icon-info:hover+.field-comment{left:5px;right:0;top:36px;padding:3px 10px 3px 36px;line-height:18px;background-color:#fff;z-index:1;margin:0;border-bottom:1px solid #dfdfdf;font-size:12px}.selector .description .o-icon-info:hover+.field-comment:before{content:"";position:absolute;left:7px;top:-6px;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff}.selector .description .o-icon-info:hover+.field-comment.above{bottom:100%;top:auto}.selector .description .o-icon-info:hover+.field-comment.above:before{top:calc(100% - 6px);transform:rotate(180deg)}.selector .description .o-icon-info+.field-comment{position:absolute;top:-9999px;left:-9999px;width:calc(100% - 5px)}.selector .selectable{display:inline-block;width:calc(100% - 36px);word-wrap:break-word}.field-actions{width:60%;display:inline-block;margin:24px 0 0 30%}.field .field-label{display:inline-block}.field .field-description,.field .docs-link{font-size:14px;line-height:18px;position:static;text-align:left;height:auto}.field .field-description:not(:only-child){margin-bottom:6px}.field-description{display:block;margin-right:10px;line-height:36px;height:36px;position:absolute;top:0;right:0;text-align:right;left:0}.field-description .o-icon-info{margin:0;cursor:pointer}.field-description .field-comment.open{left:inherit;right:0px;top:36px;background-color:#333;color:#fff;border-radius:3px;z-index:1;max-width:100%;font-size:14px;padding:6px 5px;margin:12px 0}.field-description .field-comment.open.above{top:auto;bottom:30px}.field-description .field-comment.open:before{content:"";display:block;height:0;width:0;position:absolute;top:-6px;bottom:0;right:3px;font-size:16px;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:12px solid #333}.field-description .field-comment.open.above:before{top:auto;bottom:-12px;transform:rotate(180deg)}.field .docs-link:before{content:"\f05a";font-family:"Font Awesome 5 Free";display:inline-block;margin-right:6px;font-size:14px;line-height:18px}.field-meta .expand,.field-meta .collapse{display:inline-block !important;margin-left:.5em !important;padding:0 !important;border:0 !important;width:auto !important}.field-meta .expand:after,.field-meta .collapse:after{float:none !important;margin-right:0 !important}.collapsible{display:none}.collapse+.collapsible{display:block;clear:both;overflow:hidden}.field-description .field-comment{position:absolute;top:-9999px;left:-9999px}.resource-values .field-term{display:block;font-size:12px}.inputs{line-height:36px;width:70%}.inputs:only-child{width:100%}.inputs p:only-child{margin:0}.inputs label,.inputs select,.inputs textarea,.inputs input[type="text"],.inputs input[type="password"],.inputs input[type="email"],.inputs input[type="url"],.inputs input[type="date"],.inputs input[type="datetime-local"]{width:100%;min-height:36px;margin:6px 0}.inputs label:only-child,.inputs select:only-child,.inputs textarea:only-child,.inputs input[type="text"]:only-child,.inputs input[type="password"]:only-child,.inputs input[type="email"]:only-child,.inputs input[type="url"]:only-child,.inputs input[type="date"]:only-child,.inputs input[type="datetime-local"]:only-child{margin:0}.inputs textarea{resize:vertical;line-height:1.5;background-color:#fff;min-width:0}.inputs label{padding:6px 0;margin:0 24px 0 0}.inputs .button,.inputs button,.inputs input[type="submit"]{margin:6px 0;line-height:24px}#resource-values div.value{display:flex;align-items:flex-start}.value{margin-bottom:6px}.value:last-of-type{margin-bottom:0}.value:last-of-type .remove-value{margin-bottom:0;box-shadow:none}.value.template{display:none}.multi-value .value{display:flex}.inputs p.no-values{padding:12px;border-radius:3px;background-color:rgba(0,0,0,0.04);line-height:24px}.inputs p.no-values:not(:only-child){display:none}.add-values{margin:6px 0 -3px}.add-values *{display:inline-block;min-width:36px;height:36px;border-radius:2px;text-align:center;margin:0}.inputs .add-values a.button{margin:0 0 3px}.inputs .add-values a.button:before{margin-right:.25em}.add-values label{background-color:rgba(0,0,0,0.04);line-height:36px;margin-right:0;overflow:hidden;width:12px;vertical-align:top}.input-footer{display:flex;width:30px}.input-footer .actions{margin-left:0;flex-wrap:wrap}.input-footer .actions a:before{line-height:36px;height:36px;text-align:center;margin-left:6px}.value.delete{background-color:#fcc;overflow:hidden}.value.delete .input-footer .actions li:last-child{display:none}.value a.restore-value,.value span.restore-value,.value.delete a.tab{display:none}.value.delete .input-footer{background-color:transparent;width:100%}.value [class*="o-icon-"].label{position:absolute;top:0;left:0;height:36px;width:36px;background-color:rgba(0,0,0,0.04);text-align:center;line-height:36px;overflow:hidden}.value label,.add-values label{margin:0;min-height:0;line-height:24px}.add-values button,.add-values .button{line-height:24px}.inputs .value textarea,.inputs .value input[type="text"]{width:100%;margin:0}[data-data-type^="resource"] .default,[data-data-type^="resource"] .o-title:not(:empty){margin:0 -6px;padding:6px;border-bottom:1px solid #dfdfdf;display:flex;line-height:24px;word-wrap:break-word}[data-data-type^="resource"].delete .o-icon-undo:before{padding-right:0}.input-body{clear:both;background-color:#fff;width:calc(100% - 36px);position:relative}[data-data-type^="resource"] .input-body{border:1px solid #dfdfdf;padding:0 6px}.inputs .input-body input[type="text"]{margin:0}[data-data-type^="resource"] .button{font-size:14px;padding:0 6px;line-height:24px;min-height:0;margin-right:3px}[data-data-type^="resource"] .button:before{margin-right:6px}.value.delete span.restore-value{display:inline-block;padding:0 6px;width:calc(100% - 36px)}.value.delete>*:not(.input-footer){display:none}p.selected-resource{margin:0;position:relative}.selected-resource a{width:calc(100% - 72px)}.selected-resource img{height:24px;margin-right:6px}.selected-resource .o-title a:after{font-family:"Font Awesome 5 Free";font-weight:900;position:absolute;top:6px;right:6px}.selected-resource .items a:after{content:"\f1b2"}.selected-resource .item_sets a:after{content:"\f1b3"}.selected-resource .media a:after{content:"\f03e"}[data-data-type="uri"] .input{position:relative;clear:both}[data-data-type="uri"] .input:first-child{border-bottom:1px solid #dfdfdf}[data-data-type="uri"] .input-body{border:1px solid #dfdfdf}[data-data-type="uri"] label{padding:6px 0 6px 6px;z-index:1;font-weight:bold;color:rgba(0,0,0,0.35);width:auto;display:flex}[data-data-type="uri"] .input-body input.value,[data-data-type="uri"] textarea.value-label{margin:-6px 0 -6px 6px;height:36px;border:0;padding:6px;font-weight:normal}[data-data-type="uri"] textarea.value-label{border-top-width:0}#resource-files button{margin:24px 0 0}#add-media-field{margin-bottom:0}.media.row{padding:6px;margin-bottom:6px;display:flex;align-items:center;word-wrap:break-word}.media.row img{width:36px;height:auto;margin-right:12px}.media.row .resource-name{margin-right:12px;min-width:0}.media.row .actions{margin-left:auto}.media.value.delete span.restore-value{padding:0}.media.value.delete>*:not(.restore-value),.media.value.delete .actions a:not(.o-icon-undo){display:none}.media.value.delete>.actions{display:block;top:18px}.media-header{font-size:16px;margin:6px -6px;margin-top:-12px;background-color:rgba(0,0,0,0.04);padding:0 6px;display:flex;align-items:center}.value.delete>.actions{display:inline-block}.media-render{margin-bottom:24px}.media-render>*{max-width:100%}.media-render img{max-width:100%;height:auto}#item-media .sidebar button{width:100%;text-align:left}#item-item-sets+.no-resources{display:none}#item-item-sets.empty{display:none}#item-item-sets.empty+.no-resources{display:block;padding:0 24px}#item-item-sets.empty+.no-resources:before{content:"\f1b3"}#item-item-sets tr.delete{background-color:#fcc}#page-actions [class*="o-icon-"].button{background-color:transparent;width:auto;padding:6px 6px;box-shadow:none}.o-icon-private.button,.o-icon-public.button{margin-right:6px;box-shadow:none}.search-nav{width:100%}.search-nav .resource-search{width:100%;position:relative;margin-bottom:6px;display:flex;flex-wrap:wrap}.search-nav .chosen-container{margin-bottom:6px}.search-nav button.o-icon-search{height:36px;width:36px;line-height:24px;padding:0 10px;border-radius:0 3px 3px 0;min-height:0;position:relative;text-indent:-9999px;margin:0}.search-nav button.o-icon-search:before{text-indent:0px;position:absolute;left:0;top:6px;line-height:24px;width:100%}.search-nav .resource-search>input[type="text"]{width:calc(100% - 36px);border-right:0;margin-bottom:6px}.resource-search-filters{padding-bottom:5px;border-bottom:1px solid #dfdfdf;margin-bottom:6px;width:100%}.resource-search-filters a.expand:after,.resource-search-filters a.collapse:after{float:right}.resource-search-filters .collapsible{margin-top:6px;overflow:visible}.sidebar .pagination{font-size:13.08px;border-bottom:1px solid rgba(0,0,0,0.08);padding-bottom:11px;margin-bottom:0;overflow:hidden;width:100%}.sidebar .pagination li{float:left}.sidebar .pagination li:first-of-type{padding-right:10px}.sidebar .pagination input{width:3em;text-align:center;color:#333;margin:0 3px}.sidebar .pagination .next.button{margin-right:5px}.sidebar .pagination input[type="text"]{float:left;line-height:19.62px;height:24px;border:1px solid #dfdfdf;margin-left:0}.sidebar .pagination .page-count{float:left;margin-right:12px}.sidebar .pagination .inactive{background-color:#E6E6E6;color:#B9B9B9}#item-results+.confirm-panel,#item-results .select-resource-checkbox-wrapper{display:none}#item-results.active{padding-bottom:72px}#item-results.active+.confirm-panel{display:block}#item-results.active .select-resource-checkbox-wrapper{display:inline-flex;align-items:center}.sidebar button.quick-select-toggle{background-color:transparent;color:#676767;box-shadow:none;margin:12px;padding:0;line-height:1;min-height:0}.sidebar button.quick-select-toggle:before{font-family:"Font Awesome 5 Free";font-weight:900;content:"\f204";display:inline-block;margin-right:6px}.sidebar button.quick-select-toggle.active:before{content:"\f205"}.sidebar button.quick-select-toggle+.resource-list{border-top:1px solid #dfdfdf}.resource-link{display:inline-flex;align-items:center;max-width:100%;min-width:0}.resource-link img{height:36px;margin-right:6px}.resource-link .resource-name{flex:1;min-width:0}.resource-list{width:100%}.resource-list .resource{padding:6px 12px 5px;border-bottom:1px solid rgba(0,0,0,0.08);position:relative;width:100%;overflow:hidden;display:flex;align-items:center;word-wrap:break-word}.resource-list .resource:hover{background-color:rgba(255,255,255,0.8)}.resource-list .resource:hover .select{right:0px}.resource-list .resource .select-resource-checkbox-wrapper{height:24px;margin-right:12px}#resource-details{background-color:#fff;overflow:hidden;padding:0}#resource-details .o-description,#resource-details .property{margin-bottom:0}.confirm-main{position:absolute;top:0;bottom:60px;overflow-y:auto;left:0;right:0;padding:12px 12px 0}.confirm-panel{position:absolute;bottom:0;right:0;left:0;padding:12px;background-color:#f7f7f7;border-top:1px solid #dfdfdf}.confirm-panel button,.confirm-panel .button{width:100%;margin:0}.vocabs .field [type="file"]{margin:6px 0 0}.vocabulary ul{padding-left:0;list-style:none;overflow:hidden}.vocabulary h2{margin-bottom:0}.vocabs.update td{vertical-align:top}.vocabs.update td:first-of-type,.vocabs.update td:nth-of-type(2){width:15%;word-wrap:break-word}.vocabs.update td:nth-of-type(3),.vocabs.update td:nth-of-type(4){width:35%}.vocabs.update td:nth-of-type(3):last-child{width:auto}.vocabs.update td:nth-of-type(3):not(:last-child){background-color:#ffe6e6}.vocabs.update td:nth-of-type(4){background-color:#cdffcd}.show .property,#item-metadata .meta-group{overflow:hidden;display:flex;justify-content:flex-end;flex-wrap:wrap}.show .property h4,#item-metadata .meta-group h4{width:22.22222%;vertical-align:top;padding:6px 0}.show .property h4+.value,.show .property .values,#item-metadata .meta-group h4+.value,#item-metadata .meta-group .values{padding:6px;margin-bottom:0;word-wrap:break-word;width:77.77778%}.show .property h4+.value:not(:first-of-type),.show .property .values:not(:first-of-type),#item-metadata .meta-group h4+.value:not(:first-of-type),#item-metadata .meta-group .values:not(:first-of-type){padding-top:0}.show .property .language,#item-metadata .meta-group .language{font-size:12px;padding:0 6px;margin-right:6px;background-color:rgba(0,0,0,0.04)}.show .property .private:after,#item-metadata .meta-group .private:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;content:"\f070";font-family:"Font Awesome 5 Free";display:inline-block;margin-left:6px}#linked-filter{display:flex;align-items:center;margin-bottom:24px}#linked-filter h4{margin-right:6px}#linked-resources table{margin-bottom:24px}#linked-resources caption{background-color:rgba(0,0,0,0.04);font-family:bold;padding:6px;font-family:"Lato", sans-serif;font-weight:bold;text-align:left}#linked-resources th{border-bottom:3px solid #dfdfdf}.linked-resource{margin-bottom:12px;padding-bottom:11px;border-bottom:1px solid #dfdfdf}.property .value .resource-name:after,.property .value.uri .uri-value-link:after{font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin-left:.5em}.property .value.uri .uri-value-link:after{content:"\f35d"}.property .value.items .resource-name:after{content:"\f1b2"}.property .value.media .resource-name:after{content:"\f03e"}.property .value.item_sets .resource-name:after{content:"\f1b3"}.class-row{border-bottom:1px solid #dfdfdf;padding-bottom:11px}.class-label{font-weight:bold}.class-label:after{content:": "}.sidebar{position:fixed;top:48px;left:100%;visibility:hidden;bottom:0;background-color:#f7f7f7;z-index:3;border-left:1px solid #dfdfdf;overflow-y:auto;overflow-x:hidden;width:25%;padding:12px}body.transitions-enabled .sidebar{transition:left .5s, visibility .5s}.sidebar.active,.sidebar.always-open{left:75%;visibility:visible}.sidebar.loading{overflow:hidden}.sidebar.loading *{visibility:hidden}.sidebar.loading:after{font-family:"Font Awesome 5 Free";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;content:"\f1ce";position:absolute;top:.75em;left:calc(50% - .6em);font-size:4em;animation:fa-spin 1s infinite linear;height:0.95em;width:1.2em;text-align:center;font-weight:900}.sidebar a.o-icon-close{position:absolute;right:12px;top:12px;z-index:3;color:#666}.sidebar .vocabulary,.sidebar .meta-group{margin-bottom:0}.sidebar .value{margin-bottom:6px;border-bottom:1px solid #dfdfdf;padding-bottom:5px;vertical-align:middle}.sidebar .value *:last-child{margin-bottom:0}.sidebar .value:last-child{border-color:transparent;margin-bottom:0}.sidebar input,.sidebar textarea,.sidebar select{width:100%}.sidebar input[type="checkbox"],.sidebar input[type="radio"]{width:auto}.sidebar h2{font-size:24px;margin-bottom:12px}.sidebar h3,.sidebar label,.sidebar .label{display:block;font-size:16px;font-weight:bold;margin:0 0 12px 0;padding:0 24px 12px 0;position:relative;width:100%;word-wrap:break-word}.sidebar h3:after,.sidebar label:after,.sidebar .label:after{content:"";position:absolute;left:-12px;right:-12px;bottom:0;top:-12px;background-color:#dfdfdf;z-index:-1}.sidebar .field{background-color:transparent;padding:0;margin-bottom:24px;flex-wrap:wrap;justify-content:flex-start}.sidebar .field .option{width:100%}.sidebar .field div.option+div.option{padding-top:11px;border-top:1px solid #dfdfdf;margin-top:12px}.sidebar .button,.sidebar button{background-color:#676767;border-color:#676767;color:#fff}.sidebar button.option{width:100%;text-align:left;border-color:#dfdfdf;background-color:#fff;color:#676767}.sidebar button.option:after{content:"\f067";font-family:"Font Awesome 5 Free";float:right;color:#dfdfdf}#sidebar-confirm{display:block;padding-bottom:12px;margin-bottom:12px}#sidebar-confirm input[type="submit"]{background-color:#A91919;color:#fff;box-shadow:none}body.sidebar-open #content{width:56.25%}.sidebar .meta-group{margin-bottom:12px}.sidebar .meta-group .value{width:100%;padding:6px 0;margin:0;word-wrap:break-word;display:block}.sidebar .meta-group .value:not(:last-child){border-bottom:1px solid #dfdfdf;padding-bottom:5px}.sidebar .meta-group h4{display:block;background-color:transparent;border-color:#dfdfdf;padding:6px 0;border-bottom:2px solid #dfdfdf;padding-bottom:4px;margin-bottom:0;width:100%}.sidebar .media a:first-child img,.sidebar>img:first-child{height:168px;width:auto;display:block;margin-bottom:12px}.sidebar .meta-group img{height:48px;box-shadow:0 0 0 1px #dfdfdf}.source-type{font-weight:bold}.resource-templates #properties{list-style:none;padding-left:0;margin-left:0}.resource-templates table{width:100%}.resource-templates th,.resource-templates td{padding:6px;vertical-align:top}.resource-templates .property.row{display:flex}.resource-templates .property.row.delete{background-color:#fcc}.resource-templates .property.row.delete .actions li:not(:last-child){display:none}.resource-templates .property.row:not(.delete) .sortable-handle{display:inline-flex}.resource-templates #properties{margin:24px 0 0;clear:both;padding:0}.resource-templates #edit-sidebar{padding-bottom:48px}.resource-templates #edit-sidebar .field h4,.resource-templates #edit-sidebar .field h4+span{width:100%}.resource-templates #edit-sidebar .field h4+span{margin-bottom:12px}.resource-templates #edit-sidebar .field label:not(:first-child),.resource-templates #edit-sidebar .field .option label{margin:0;padding-bottom:6px}.resource-templates #edit-sidebar .field label:not(:first-child):only-child,.resource-templates #edit-sidebar .field .option label:only-child{padding-bottom:0}.resource-templates #edit-sidebar .field label:not(:first-child):after,.resource-templates #edit-sidebar .field .option label:after{padding:0;margin:0;background:transparent}.alternate-label-cell:not(:empty){background-color:#dfdfdf;display:inline-block;padding:0 6px;margin:0 6px;position:relative}.alternate-label-cell:not(:empty):after{content:"";border-top:12px solid transparent;border-bottom:12px solid transparent;border-left:6px solid #dfdfdf;width:0;height:0;position:absolute;left:100%;top:0}.title-property-cell,.description-property-cell{text-transform:uppercase;font-size:12px;font-weight:bold;margin-left:auto;margin-right:12px}.title-property-cell:after,.description-property-cell:after{content:"\f00c";font-family:"Font Awesome 5 Free";display:inline-block;margin-left:6px}.title-property-cell ~ .actions,.description-property-cell ~ .actions{margin-left:0}.title-property-cell ~ .description-property-cell,.description-property-cell ~ .title-property-cell{margin-left:12px}#modules.installed tbody tr:not(.installed),#modules.uninstalled tbody tr:not(.uninstalled),#modules.needs-upgrade tbody tr:not(.needs-upgrade),#modules.active tbody tr:not(.active),#modules.deactivated tbody tr:not(.deactivated){display:none}.state-filter select{margin-bottom:12px}.module-name{font-weight:bold}.module-author{display:block}#modules .module{border-bottom:1px solid #dfdfdf;padding-bottom:11px;margin-bottom:12px;overflow:hidden}#modules .module-meta{float:left;max-width:50%}#modules .module-actions{float:right;max-width:50%;text-align:right}#modules .module form{display:inline-block}#modules button,#modules .button{display:inline-block;margin-left:6px;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset}#modules button:hover,#modules .button:hover{box-shadow:0 0 0 1px rgba(0,0,0,0.3) inset}#modules button:before,#modules .button:before{margin-right:6px}#modules .o-icon-install{box-shadow:0 0 0 1px #addead inset}#modules .o-icon-install:hover{box-shadow:0 0 0 1px #63c363 inset}#modules .o-icon-uninstall{margin-left:24px;box-shadow:0 0 0 1px #E0C3C3 inset}#modules .o-icon-uninstall:hover{box-shadow:0 0 0 1px #DA8B8B inset}#edit-keys td{word-wrap:break-word}.api-delete{width:10%}.api-label{width:25%}#system-info-table .label-col{width:25%}#system-info-table th,#system-info-table td{font-size:0.875em;padding:0;line-height:1.75;border:none}#system-info-table th[scope="rowgroup"]{font-size:1em;border-bottom:1px solid #dfdfdf}#system-info-table th[scope="row"]{padding-left:1.5em}.breadcrumbs{border-bottom:1px solid #dfdfdf;padding-bottom:11px;margin-bottom:24px}.breadcrumbs+.field{margin-top:24px}.breadcrumbs a:before{margin-right:6px}.breadcrumbs>*:not(:last-child):after{content:"\f0da";font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin:0 calc(12px - 3px) 0 12px;color:#000;cursor:default}tr.value.delete>td:not(.input-footer){display:table-cell}#site-user-permissions+.no-resources,#site-user-permissions.empty,tr.value:not(.delete) .o-icon-undo,tr.value.delete .user-name,tr.value.delete select,tr.value.delete .o-icon-delete{display:none}td.user-meta{width:50%}#site-user-permissions.empty+.no-resources{display:block;padding:0 24px}#site-user-permissions.empty+.no-resources:before{content:"\f0c0"}#site-user-permissions .actions{justify-content:flex-end;padding:6px 0}.indent:before{content:"\2014";margin-right:-1px}.block{margin-bottom:6px}.block .block-header{position:relative;display:flex;align-items:center;background-color:rgba(0,0,0,0.12);padding:6px;font-weight:bold}.block .block-content input[type="hidden"]+*{padding-top:0;margin-top:0}.block.html>div{border:1px solid #dfdfdf}.block .field{padding:0;border-color:transparent;background-color:transparent;margin-top:6px}.block .field:last-child{margin-bottom:0}.block.delete>.block-header{font-weight:normal;display:flex;background:transparent}.block.delete>*:not(.block-header){display:none}.block.delete span.restore-value{padding:0 3px;text-transform:lowercase;width:auto}.block.delete a.restore-value:before{padding:0}.delete .sortable-handle{display:none}.delete .block-type,.block .delete div.item-title{margin-left:30px}.delete .block-type{font-weight:bold}.block div.item-title{margin:6px 0;display:flex;align-items:center}.block .item-title img{height:36px;width:auto;display:inline-block;margin-right:6px;vertical-align:top}.block .delete.attachment{background-color:#fcc}.block .delete.attachment .actions .undo{display:inline-block}.block .delete.attachment .actions .delete{display:none}.block .attachments-form{margin-bottom:12px}.block .attachments-form a h4{display:inline-block}.block .attachment .actions{margin-left:auto}.block .attachment .actions .button{background-color:transparent;color:#A91919;padding:0;min-height:0}.block .attachment .actions .button:hover{color:#A91919}.block .attachment .actions .undo{display:none}.block .block-content{clear:both;background-color:rgba(0,0,0,0.04);padding:6px}.block.sortable-ghost .block-content{display:none}.block .attachment{display:flex;align-items:center;position:relative;padding:0 6px}.block .attachment:not(:last-child){border-bottom:1px solid #dfdfdf;padding-bottom:-1px}.block .attachment .button{margin-bottom:0}.block .attachment-add{margin:6px 0 0}.block .expand,.block .collapse{width:100%;display:flex;padding:0 6px 0 0;justify-content:space-between}.block .field-meta .collapse+.collapsible{width:auto;border:0}.block .expand h4,.block .collapse h4{display:inline-block;padding:0}.block .collapse+.collapsible{border-top:1px solid #dfdfdf;padding:-1px 0 0 24px;margin-top:6px}.block[data-block-layout="html"] [contenteditable="true"]{resize:vertical;min-height:72px;max-height:288px}#attachment-options .option{position:relative;margin-bottom:12px}#attachment-options .expand,#attachment-options .collapse{position:absolute;right:0;top:0}#attachment-options h3{overflow:visible;white-space:normal}#attachment-item-select{display:block;margin:12px 0 0}#attachment-options .selected-attachment{margin-bottom:12px;margin-top:-12px;box-sizing:content-box;margin-right:-12px;margin-left:-12px;padding-right:12px;padding-left:12px;padding-top:12px;padding-bottom:12px;overflow:hidden}#attachment-options .selected-attachment img{height:96px;width:auto;float:right;margin:0 0 0 12px}#attachment-options .selected-attachment p:first-child{margin:0}#attachment-options h3.item-title{text-align:left}#attachment-options .item-thumbnail ~ h3.item-title{width:100%}#attachment-options .media-title{font-size:12px;display:block;width:calc(100% - 108px);float:left;word-wrap:break-word;text-align:left;clear:left}#attachment-options .item-thumbnail ~ #attachment-item-select{font-size:12px;display:inline-block;width:calc(100% - 108px);word-wrap:break-word}#attachment-options h3{word-wrap:break-word}#attachment-options .media-list{list-style:none;padding:0;margin:0 0 12px}#attachment-options .media-list li.media{position:relative;height:48px;width:48px;cursor:pointer;display:inline-block;padding:3px;border:1px solid #dfdfdf}#attachment-options .media-list li.media.attached,#attachment-options .media-list li.media:hover{background-color:rgba(0,0,0,0.04)}#attachment-options .media-list img{width:100%;height:auto}input[type="text"].page-selector-filter{width:100%;margin-bottom:12px}#nav-page-links{width:100%}.selectable-themes,.current-theme{display:flex;flex-wrap:wrap}.selectable-themes img,.current-theme img{max-width:100%;height:auto;vertical-align:bottom;position:relative;z-index:1}.selectable-themes .error,.current-theme .error{background-color:#f4b4b4;border-radius:3px;padding:6px 10px;margin:6px 0;display:block;width:100%;order:2}.theme-thumbnail{align-self:flex-start}.current-theme .error+ul{font-family:monospace;padding:11px;border:1px solid #dfdfdf;list-style-type:none}.invalid .theme-thumbnail img{opacity:.5}.selectable-themes .theme{width:calc(33.33% - 24px);margin:0 24px 24px 0;padding:11px;border:1px solid #dfdfdf;background-color:#fff;display:flex;flex-wrap:wrap}.selectable-themes .theme:hover{border:3px solid #9f9f9f;padding:9px}.selectable-themes .invalid.theme:hover{border:1px solid #dfdfdf;padding:11px}.selectable-themes .theme-thumbnail{width:100%;margin-bottom:12px;border:1px solid #dfdfdf}.selectable-themes .active.theme{background-color:#e7e7e7;position:relative;overflow:hidden;border-width:3px;padding:9px}.selectable-themes .active.theme:after{content:"\f00c";font-family:"Font Awesome 5 Free";position:absolute;bottom:0;right:0;opacity:.15;font-size:96px;line-height:96px}.current-theme{padding-bottom:23px;border-bottom:1px solid #dfdfdf;margin-bottom:24px;flex-wrap:nowrap}.current-theme .theme-thumbnail{width:50%;margin:0 24px 0 0;border:1px solid #dfdfdf}.current-theme .current-theme-info{width:calc(50% - 24px)}.current-theme-label{font-size:16px;text-transform:uppercase;display:block;margin-bottom:6px}.theme-meta{display:flex;flex-direction:column;width:100%}.jobs.browse th:first-child,.jobs.browse td:first-child{width:10%}body.minimal{padding:0;margin:48px 0;width:93.75%;max-width:100%;margin-left:auto;margin-right:auto;height:auto;background-color:#404E61}body.minimal:after{content:" ";display:block;clear:both}body.minimal div[role="main"]>h1:first-of-type{position:static;padding:0;width:100%;height:auto;display:inline-block;margin:0 0 24px 0}body.minimal h2{font-size:20px;margin-bottom:12px}body.minimal fieldset legend{font-weight:bold;font-size:20px;margin-bottom:12px}body.minimal .logo{position:static;width:auto;float:none;padding:0;text-align:center;font-size:32px;line-height:48px}body.minimal div[role="main"]{width:100%;min-height:0;margin:0;padding:48px 6.25%;overflow:hidden}body.minimal .inputs{width:70%}body.minimal .inputs input{width:calc(66.66% - 6px);vertical-align:top}body.minimal .inputs *:only-child{width:100%}body.minimal [type="submit"]{width:100%;display:block;margin:auto;clear:both}body.minimal .field:last-child{margin-bottom:0}body.minimal .site-list .site{margin-bottom:12px}body.minimal .site-list .site-link{display:inline-block;font-size:20px;margin-bottom:6px}body.minimal .site-list .site-summary{margin:0 0 0 12px;line-height:20px}body.minimal .site-list-heading{font-size:16px;margin-top:-31.992px}.forgot-password{margin:6px 0}.asset-form-element{line-height:36px}.asset-form-element.empty .asset-form-clear{display:none}.asset-form-element:not(.empty) .no-selected-asset{display:none}.select-asset img{width:25%}.selected-asset,.no-selected-asset{display:block}.selected-asset-image{max-width:100%}.asset-upload{overflow:hidden;margin-bottom:24px}.asset-upload button{margin:6px 0 0;display:none}.asset-upload button.active{display:inline-block}.asset-upload ul.errors{color:#A91919;margin-top:0}.asset-upload ul.errors:empty{display:none}.asset-upload ul.errors a{border-bottom:1px solid #A91919}.asset-filters{margin-bottom:6px}.asset-list .asset{padding-bottom:5px;border-bottom:1px solid #dfdfdf;margin-bottom:6px}.asset-list .asset:last-child{border-bottom-color:transparent}.asset-list .select-asset{display:flex;align-items:center;word-wrap:break-word}.asset-list .select-asset img{margin-right:6px}.asset-list .select-asset .asset-name{min-width:0}#asset-sidebar input[type="file"]{width:100%}.color-picker{display:flex}.color-picker input[type="text"]{margin:0}.color-picker .color-picker-sample{border:1px solid #dfdfdf;width:30%;margin-left:6px}}@media screen and (max-width: 640px){script{display:none !important}body{padding:0}.mobile-only{display:block}button.mobile-only{width:100%}header{width:100%;float:none;text-align:center;position:fixed;top:0;left:0;padding:0;right:0;z-index:1000;min-height:0}header .button{border-radius:0px;position:absolute;top:0;z-index:1001;color:#fff;background-color:#222933;box-shadow:none}header .o-icon-menu.button{left:0;border-right:1px solid rgba(0,0,0,0.08);width:36px}header .o-icon-search.button{left:36px}header .o-icon-user.button{right:0}header nav ul.navigation>li:not(:first-of-type){margin-top:0}.logo{line-height:36px;padding:0 16.66667%;width:100%;text-align:center;display:block;background-color:#404E61}#user,#search,header nav{position:fixed;top:-9999px;left:-9999px;z-index:1000}header nav#site-nav{position:static;background-color:#fff;padding:0;margin-bottom:0}header nav#site-nav h5{border-top:1px solid #dfdfdf;padding-top:6px -1px;margin-bottom:0}header nav#site-nav h5 a{padding:0;border-bottom:0}#menu.active,#user.active,#search.active{top:36px;left:0;bottom:0;right:0;background-color:#fff;margin:0}footer{margin:0;padding:0;position:static;width:100%;text-align:center}footer:after{position:static;background:transparent}.browse td:first-child,.browse th:first-child{width:100%}td .o-icon-private,td .o-icon-user-inactive{vertical-align:top;margin:0}div[role="main"]{margin:36px 0 0 0;width:100%;min-height:calc(100% - 72px);position:relative;padding-top:48px}div[role="main"]>h1:first-of-type{width:auto;position:static;padding:12px 1.04167%;height:auto;margin:0 -1.04167% 12px;white-space:normal;line-height:36px}#menu{text-align:left;background-color:#fff;position:fixed;overflow:scroll}#menu ul{margin-bottom:0;border-bottom:0;padding-bottom:0}#menu a{display:block;padding:6px 12px 5px;color:#676767;border-bottom:1px solid #dfdfdf}#menu li:last-child a{border-bottom:0;padding-bottom:6px}#menu h5 a{padding:0;border-bottom:0}#menu h5{height:36px;color:#676767;background-color:rgba(0,0,0,0.04);padding:6px 12px 5px;border:1px solid #dfdfdf;border-width:1px 0}#menu h4{background-color:rgba(0,0,0,0.12);margin-bottom:0}#menu h4:not(:first-of-type){margin-top:0}#menu a.public,#menu a.expand,#menu a.collapse{height:36px;margin:-36px 0 0;padding:0 12px 0 0}#menu a.public:before,#menu a.public:after,#menu a.expand:before,#menu a.expand:after,#menu a.collapse:before,#menu a.collapse:after{height:36px;line-height:36px}#mobile-nav{display:block}#mobile-nav a.active{background-color:#500c0c}#user{text-align:center}#user .user-id{color:#676767;width:100%;margin:0 6px 24px}#user .user-id a{color:#A91919}#user .logout{display:block;margin:12px 6px;font-size:16px;color:#676767;border-radius:3px;width:calc(100% - 12px);min-height:36px;background-color:rgba(0,0,0,0.08);border-radius:3px;border:0;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;padding:6px 10px;display:inline-block;text-align:center;cursor:pointer;margin:0 6px}#user .logout:last-of-type:before{content:""}#user .logout a{color:#676767}#page-actions{top:36px;background-color:#fff;width:100%;border-bottom:1px solid rgba(0,0,0,0.08);height:48px;padding-bottom:5px}#sidebar{position:fixed;top:36px;z-index:100;width:100%}#sidebar #content.sidebar-open{left:0}body.sidebar-open #content{width:100%}.sidebar{width:100%;top:36px;z-index:1000}.sidebar.always-open{left:100%}.sidebar.active,.confirm-panel{left:0;width:100%}fieldset.section>.always.active{content:"";bottom:0;left:0;right:0;height:48px;background-color:#fff;position:fixed;border-top:1px solid rgba(0,0,0,0.04)}fieldset.section>.always.active button{width:100%;margin:6px}#modules .module-meta,#modules .module-actions{width:100%;max-width:100%}#modules .module-meta{margin-bottom:12px}#modules .module-actions{text-align:left}#modules button,#modules .button{margin:0 6px 0 0}.vocabs.update td{width:100% !important}#search-form{margin:48px 4.16667%}.batch-edit.button{margin:0;border-radius:0px;position:relative;z-index:1}.browse table{position:relative}.browse .sorting{float:left}.browse .pagination{margin-right:48px}.jobs.browse th:first-child,.jobs.browse td:first-child{width:100%}fieldset.section,fieldset.section{margin-bottom:0;position:relative}fieldset.section>legend:first-child{position:relative;left:auto;display:block;width:100%;font-size:20px;padding:6px 9px 6px 0;color:#A91919;cursor:pointer;border-bottom:3px solid rgba(0,0,0,0.08);padding-bottom:-3px;margin-bottom:12px}fieldset.section>legend:after{content:"\f0da";font-family:"Font Awesome 5 Free";position:absolute;right:9px;top:12px}fieldset.section.mobile-active>legend:after{content:"\f0d7"}.add .active.section>.button,.edit .active.section>.button{display:inline-block}.field-meta,.inputs{width:100%}.field-actions{position:absolute;top:9px;right:1.66667%;z-index:1;width:50%}.field-actions a{float:right;display:block}.field-actions a.button{margin-left:.5em !important}.field-meta label,.field-description p{line-height:24px;margin-bottom:6px}.field-meta label{font-weight:bold}.unset .field-meta{width:100%}.show .sidebar.active{position:static;border:1px solid #dfdfdf;padding:11px;margin-top:24px}.show .section .property,.show .section .meta-group{margin-bottom:6px;box-shadow:0 0 0 1px #dfdfdf;border-radius:2px}.show .section .meta-group h4,.show .section .property h4{padding-bottom:6px;border-bottom:1px solid #dfdfdf;background-color:rgba(0,0,0,0.04)}.show .section .meta-group h4,.show .section .meta-group .value,.show .section .property h4,.show .section .property .values{width:100% !important;padding:6px !important}.show .section .meta-group .value:not(:first-of-type),.show .section .property .value:not(:first-of-type){border-top:1px solid #dfdfdf;padding-top:6px -1px;margin-top:6px}.show .sidebar .meta-group .value:not(:first-of-type),.show .sidebar .property .value:not(:first-of-type){padding-top:6px}body.minimal{width:100%;margin:0}body.minimal .logo{background-color:transparent}body.minimal div[role="main"]{padding:24px 6.25%}body.minimal div[role="main"]>.messages{margin-top:24px}body.minimal .inputs{width:100%;margin-left:0}body.minimal footer{color:white}.tablesaw tr{overflow:hidden;margin-bottom:0}.tablesaw tr:first-of-type{border-top:1px solid #dfdfdf}.browse td:not(:first-of-type) .tablesaw-cell-content,#properties td:not(:first-of-type) .tablesaw-cell-content{display:inline-block}.tablesaw td:first-of-type{background-color:rgba(0,0,0,0.04)}.tablesaw td:first-of-type .tablesaw-cell-label{width:0;height:0;overflow:hidden;padding:0;display:block}.tablesaw td:first-of-type .tablesaw-cell-content{width:100%;max-width:100%}.batch-edit.tablesaw td:first-of-type{width:100%;background:rgba(0,0,0,0.04)}.batch-edit.tablesaw td:first-of-type img{margin-bottom:0}.batch-edit.tablesaw td:first-of-type .tablesaw-cell-label{width:0;overflow:hidden;padding:0}.batch-edit .tablesaw-cell-content{display:inline-flex}.tablesaw-cell-content{width:70%;max-width:70%}.tablesaw-cell-content img{margin:0 6px 0 0}.tablesaw tr:last-of-type td,.tablesaw tr:last-of-type th,.tablesaw th,.tablesaw td{padding-top:6px;padding-bottom:6px;vertical-align:top}.tablesaw th:not(:last-of-type),.tablesaw td:not(:last-of-type){border-bottom:1px solid #dfdfdf}.tablesaw tr.delete{border:0}.tablesaw tr.delete td{border:0}.tablesaw tr.delete td:not(:first-of-type){display:none}.resource-template th:first-of-type,.resource-template td:first-of-type{width:100%}#site-user-permissions tr.user.value{position:relative}#site-user-permissions td:nth-child(3){position:absolute;top:0;right:0;padding:0 6px 0 0}#site-user-permissions td:nth-child(3) .tablesaw-cell-label{display:none}#site-user-permissions td:nth-child(3) .tablesaw-cell-content{width:100%;max-width:100%}#site-user-permissions.tablesaw-stack tbody tr{border-bottom:0}}
+/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}template,[hidden]{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-0.25em}sup{top:-0.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:bold}button,input{overflow:visible}button,select{text-transform:none}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{box-sizing:border-box;color:inherit;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:0.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}@media screen{*{box-sizing:border-box}em,i{font-style:italic}strong,b{font-weight:bold}a{text-decoration:none}a:link,a:visited{color:#A91919}a:active,a:hover{color:#e34545}h1,h2,h3,h4,h5,h6{margin:0}h3,h4,h5,h6{font-weight:bold}h1{font-size:32px;line-height:48px;margin-bottom:24px}h2{font-size:30px;line-height:36px;margin-bottom:24px}h3{font-size:24px;margin-bottom:24px}h5{font-size:14px}p{margin:24px 0}ul{padding-left:24px;list-style:disc}pre{max-width:100%;overflow-x:auto}html,body{height:100%}body{font-family:"Lato", sans-serif;font-size:16px;line-height:24px;color:#676767;overflow-x:hidden}table{width:100%;border-spacing:0;table-layout:fixed}th,table.tablesaw th{font-weight:bold;text-align:left;padding:6px 0.5em}table,table.tablesaw{margin-bottom:12px;border:1px solid #dfdfdf;border-radius:3px;border-collapse:separate}.tablesaw tr:not(:last-child) td{border-bottom:1px solid #dfdfdf}tr.delete{background-color:#fcc}td,table.tablesaw td{padding:6px 0.5em 5px;position:relative;vertical-align:middle}table.tablesaw td:first-child a{word-wrap:break-word}table.tablesaw thead tr:first-child th{padding-top:6px;padding-bottom:5px;border-bottom:1px solid #dfdfdf}legend{font-size:20px;padding:12px 0;font-weight:bold}[contenteditable="true"],textarea{clear:both;padding:6px;border:1px solid rgba(0,0,0,0.15);display:block;background-color:#fff;min-height:72px;overflow-y:auto}[contenteditable="true"] p{margin:12px 0}.cke_dialog_body textarea{max-height:none}input,[contenteditable="true"],textarea,button,select{font-family:"Lato", sans-serif;font-size:16px;line-height:24px;margin:0;color:#676767}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="number"],input[type="date"],input[type="datetime-local"]{-webkit-appearance:none;-moz-appearance:none;appearance:none;border-radius:0;height:36px;border:1px solid rgba(0,0,0,0.15);padding:6px;margin:0}:disabled{background-color:rgba(0,0,0,0.04);box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;color:#a7a7a7;cursor:default}:disabled:hover{box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset !important}:-ms-input-placeholder{font-style:italic}::-ms-input-placeholder{font-style:italic}::placeholder{font-style:italic}[contenteditable="true"]>*:first-child{margin-top:0}[contenteditable="true"]>*:last-child{margin-bottom:0}input[type="submit"],button,a.button,.button{min-height:36px;background-color:rgba(0,0,0,0.08);color:#676767;border-radius:3px;border:0;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;padding:6px 10px;display:inline-block;text-align:center;cursor:pointer;margin:0 0 12px 0}input[type="submit"]:hover:not(.inactive),button:hover:not(.inactive),a.button:hover:not(.inactive),.button:hover:not(.inactive){box-shadow:0 0 0 1px rgba(0,0,0,0.3) inset}input[type="submit"].inactive,button.inactive,a.button.inactive,.button.inactive{box-shadow:none;background-color:#d2d2d2;cursor:default;border:0}.red.button{background-color:#FDEFEF;box-shadow:0 0 0 1px #E0C3C3 inset;color:#A91919}.red.button:hover{box-shadow:0 0 0 1px #DA8B8B inset}.green.button{background-color:#cdffcd;color:green;box-shadow:0 0 0 1px #addead inset}.green.button:hover{box-shadow:0 0 0 1px #63c363 inset}.required .field-meta{position:relative;padding-right:36px}.required .field-meta:after{font-family:"Font Awesome 5 Free";content:"\f069";font-size:12px;position:absolute;right:12px;color:#A91919;top:6px}label input[type="checkbox"]{display:inline-block;width:auto}label.required:after{font-family:"Font Awesome 5 Free";font-weight:900;content:"\f069";font-size:12px;color:#A91919;float:right;padding-right:12px}.touched:invalid{box-shadow:0 0 2px 2px #A91919}.field{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px;display:flex;flex-wrap:wrap}.field:first-child{border-color:transparent}.media-field-wrapper{width:100%;padding:12px 6px;margin-bottom:6px;background-color:rgba(0,0,0,0.04);position:relative}.media-field-wrapper .field{width:100%;margin:0 0 6px;padding:0;background-color:transparent}.media-field-wrapper .field:last-of-type{margin-bottom:0}.media-field-wrapper .field:last-of-type .field-meta,.media-field-wrapper .field:last-of-type .inputs{margin-bottom:-6px}.media-field-wrapper .actions{font-size:16px;padding:6px 0}select{background:#fff url("../img/select-arrow.svg") no-repeat;background-position:right 6px center;background-size:8px;border:1px solid #dfdfdf;height:36px;line-height:36px;font-size:16px;margin:0;padding:0 24px 0 6px;border-radius:3px;vertical-align:top;-webkit-appearance:none;-moz-appearance:none;appearance:none}select::-ms-expand{display:none}label input{margin-right:.5em}fieldset{margin:0 0 24px;border:0;padding:0;min-width:100%}.selector input[type="text"],.selector>ul{width:100%}.selector>ul{margin:0}.chosen-container-single .chosen-single,.chosen-container-multi .chosen-choices{background-image:none;background-color:#fff;box-shadow:none;font-size:16px;line-height:24px;padding:6px;height:auto;border-radius:3px;border-collapse:#dfdfdf;color:#676767;border-color:#dfdfdf}.chosen-container-multi.chosen-container-active .chosen-choices{border-color:#aaa;border-radius:3px 3px 0 0}.chosen-container-multi.chosen-container.chosen-drop-up .chosen-choices{border-radius:0 0 3px 3px}.chosen-container-multi.chosen-container .chosen-drop{top:calc(100% - 1px);border-top:1px solid #aaa}.chosen-container-multi.chosen-container.chosen-drop-up .chosen-drop{bottom:calc(100% - 1px)}.chosen-container-multi .chosen-choices{padding:3px}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{font-family:"Lato", sans-serif;margin:0}.chosen-container-multi .chosen-choices li.search-choice{background:#f0f0f0;font-size:14px;line-height:24px;border:0;padding:0 27px 0 0}.chosen-container-multi .chosen-choices li.search-choice span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:block}.chosen-container .search-choice .group-name{color:#676767;position:relative;background-color:rgba(0,0,0,0.04);margin-right:6px;padding:0 6px;display:inline-block;vertical-align:top}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{top:50%;right:6px;transform:translateY(-50%)}.chosen-container .search-choice .group-name:after{content:""}.chosen-container-multi .chosen-choices li.search-field input[type="text"]{min-height:0;margin:3px;height:auto;line-height:24px}.chosen-container-active.chosen-with-drop .chosen-single{background-image:none}.chosen-container-single .chosen-single abbr{top:12px}.chosen-container-single .chosen-single div b{background:none !important}.chosen-container-single .chosen-single div b:after{font-family:"Font Awesome 5 Free";content:"\f0d7";line-height:24px;padding:6px 0;display:inline-block}.chosen-container-active.chosen-with-drop .chosen-single div b:after{content:"\f0d8"}.chosen-container-single .chosen-search input[type="text"]{background:none !important}.chosen-search{position:relative}.chosen-search:after{font-family:"Font Awesome 5 Free";content:"\f002";line-height:24px;padding:6px 0;display:block;position:absolute;top:3px;right:12px}.chosen-container .chosen-results li.highlighted{background-color:#676767;background-image:none}.chosen-container.chosen-drop-up .chosen-drop{top:auto;bottom:100%;border-radius:3px 3px 0 0;box-shadow:0 -1px 2px rgba(0,0,0,0.15);border-top:1px solid #aaa}.chosen-container-active.chosen-drop-up.chosen-with-drop .chosen-single{border-radius:0 0 3px 3px}.flex{display:flex}.mobile-only{display:none}div[role="main"]>.messages{margin-bottom:12px}div[role="main"]>.messages li{margin:0 0 6px}div[role="main"]>.messages .error{background-color:#f4b4b4}div[role="main"]>.messages .success{background-color:#cdffcd}div[role="main"]>.messages .warning{background-color:#fff6e6}div[role="main"]>.messages a{text-decoration:underline}.messages{padding:0;margin:0;clear:both}.messages li{background-color:rgba(255,255,255,0.5);border-radius:3px;padding:6px 10px;margin-top:6px;display:block;width:100%}.field .messages{width:70%;color:#A91919;margin-left:auto}.field .messages li{box-shadow:0 0 0 1px inset}.error,.error a{color:#A91919}.success,.success a{color:green}.warning,.warning a{color:orange}.version-notification{background-color:#cdffcd;color:green;border-radius:3px;padding:6px 10px;margin-top:6px;display:block;width:100%}.version-notification a{color:green;text-decoration:underline}table .icon-sortable{opacity:.4;font-size:12px;line-height:100%}.row{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px}.sortable-handle:before{cursor:move;content:"\f0c9";font-family:"Font Awesome 5 Free";font-weight:900;opacity:.35;font-size:20px;line-height:24px;margin-right:12px}.o-description{margin-bottom:0}a.expand,a.collapse{color:#676767}.expand:after{content:"\f0da";font-family:"Font Awesome 5 Free";font-weight:900;margin-left:3px}.collapse:after{content:"\f0d7";font-family:"Font Awesome 5 Free";font-weight:900;margin-left:3px}.selector-table{display:table}.selector-table.empty,.selector-table+.no-resources{display:none}.selector-table.empty+.no-resources{display:block}.selector .resources-available.empty,.selector .resources-available+.resources-unavailable{display:none}.selector .resources-available.empty+.resources-unavailable{display:block}.selector .selector-child.added{display:none}header{background-color:#404E61;width:18.75%;min-height:100vh;text-align:left;padding:0 1.04167% 24px;color:#bdcde3}.skip{position:absolute;left:-9999px}.skip:focus{position:absolute;top:0;left:45%;width:10%;z-index:1002;text-align:center;background-color:#fff;border-radius:0 0 3px 3px;border:1px solid #dfdfdf;padding:5px}.logo a,#user a{color:#bdcde3}#user{color:#fff;padding-top:12px;margin-bottom:-6px}#user p{margin:0;display:inline-block;vertical-align:top}#user .user-id{text-transform:uppercase;font-size:12px;width:75%;margin-bottom:6px;margin-right:-4px}#user .user-id a{display:block;font-size:16px;text-transform:none;margin-top:-6px}#user .logout{font-size:12px;padding:0 6px;background-color:#222933;border-radius:3px;display:inline-block;min-width:25%;text-align:center}.logo{padding:6px 6.25%;margin:0 -6.25%;background-color:#222933}#search{width:100%;display:inline-block;vertical-align:top;margin:24px 0}#search input[type="text"]{width:calc(100% - 72px);float:left}#search button{width:36px;text-indent:-9999px;background-color:#222933;color:#bdcde3;border:0;float:left;margin:0;border-radius:0;position:relative;height:36px;box-shadow:none}#search button:last-of-type{border-left:1px solid rgba(255,255,255,0.2);border-radius:0 3px 3px 0}#search button:last-of-type:after{content:"\f002"}#search button:after{content:"\f141";font-family:"Font Awesome 5 Free";font-weight:900;text-indent:0;position:absolute;top:0;left:0;width:36px;line-height:36px;text-align:center}#advanced-options{display:none}div[role="main"]>h1:first-of-type{background-color:#fff;font-size:24px;position:fixed;padding:3px 30% 3px 1.04167%;z-index:3;top:0;right:0;width:81.25%;height:48px;border-bottom:1px solid #dfdfdf;overflow:hidden;line-height:36px}div[role="main"]>h1:first-of-type .title{text-overflow:ellipsis;white-space:nowrap;max-width:65%;display:inline-block;overflow:hidden;vertical-align:middle}.subhead{text-transform:uppercase;font-size:14px;padding:0 6px;background-color:#eee;line-height:36px;vertical-align:middle;margin:0 12px 0 0;font-weight:normal;display:inline-block}.subhead:before{font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin-right:6px;font-size:16px;vertical-align:top}.action{display:inline-block;vertical-align:middle}.action:before{content:"\00b7";margin:0 12px}.sidebar-open footer{margin-right:25%}footer{font-size:12px;position:relative;margin-top:-27px;margin-left:18.75%;padding-right:1.04167%;text-align:right}footer .site-version{margin:0;display:inline-block}footer .version-number{display:inline-block;margin:0 12px;line-height:1}body.transitions-enabled footer{transition:margin-right .5s}footer>a:not(:last-child){margin-right:12px}nav ul{padding:0;list-style:none;margin:0}nav.pagination{margin-bottom:12px;overflow:hidden}nav.pagination form,nav.pagination .button,nav.pagination .row-count{float:left}nav.pagination form{margin-right:12px}nav.pagination form *{display:inline-block;padding:0;text-align:center}nav.pagination .button{border-radius:0;margin:0;padding:0 10px}nav.pagination .button,nav.pagination input[type="text"],.sorting button,.sorting select{font-size:13.08px;min-height:0;height:24px;line-height:24px;vertical-align:top;background-size:6.5408px}nav.pagination .button{box-shadow:0 0 0 1px #C8C8C8 inset;position:relative}nav.pagination .button:hover{z-index:1}nav.pagination .button:before{vertical-align:top;line-height:24px}nav.pagination .previous.button{border-radius:3px 0 0 3px}nav.pagination .next.button{border-radius:0 3px 3px 0;margin-left:-1px}nav.pagination form input[type="text"]{margin-right:.25em;width:48px;border:1px solid #dfdfdf;padding:5px}nav.pagination+*:not(.sorting){clear:left}#mobile-nav{display:none}.mobile-container{position:relative}header nav h4{padding-bottom:5px;border-bottom:1px solid #364252;margin-bottom:6px}header nav h4:not(:first-of-type){margin-top:24px}header nav ul.navigation>li:not(:first-of-type){margin-top:6px}header nav ul.navigation>li:not(:last-of-type){border-color:#dfdfdf}header nav ul.navigation li li{display:none}header nav ul.navigation li.active li{display:block;margin-left:24px}header nav ul.navigation li.active>a{color:#fff}header nav a:link,header nav a:visited{color:#bdcde3}header nav li>a:before{content:"\f0fe";font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;width:24px}header nav .items:before,.items .subhead:before{content:"\f1b2"}header nav .media:before,.media .subhead:before{content:"\f03e"}header nav .item-sets:before,.item-sets .subhead:before{content:"\f1b3"}header nav .vocabularies:before,.vocabularies .subhead:before{content:"\f02d"}header nav .resource-templates:before,.resource-templates .subhead:before{content:"\f14b"}header nav .users:before,.users .subhead:before{content:"\f007"}header nav .modules:before,.modules .subhead:before{content:"\f0fe"}header nav .jobs:before,.jobs .subhead:before{content:"\f0ae"}header nav .sites:before,.sites .subhead:before{content:"\f109"}header nav .settings:before,.settings .subhead:before{content:"\f085"}header nav li li a:before{content:"\f0da"}header ul.navigation{margin-bottom:6px}#menu{position:relative}#menu h5{text-transform:uppercase;border-top:1px solid #364252;padding-top:5px;margin-bottom:0}#menu .expand,#menu .collapse{width:100%;z-index:1;padding-bottom:6px;margin-bottom:6px}#site-nav{background-color:#364252;padding:6px;margin-bottom:12px;border-radius:3px}#site-nav h5{border-top:0;border-bottom:1px solid #2c3542;padding:0 24px 5px 0;margin-bottom:6px}header nav#site-nav h5 a:before{content:"\f109";font-family:"Font Awesome 5 Free";width:24px;display:inline-block;font-weight:normal;font-size:16px}#menu .pages:before,.site-pages .subhead:before{content:"\f15b"}#menu a.navigation:before{content:"\f0e8"}#menu a.public{float:right;text-align:right;font-size:16px;line-height:30px;margin-top:-39px}#menu a.resources:before{content:"\f1b3"}#menu a.site-info:before{content:"\f085"}#menu a.theme:before,.theme-settings .subhead:before{content:"\f1fc"}div[role="main"]{width:81.25%;padding:60px 1.04167% 36px;background-color:#fff;min-height:100%;overflow:hidden}body.transitions-enabled div[role="main"]{transition:width .5s}#dashboard>p{width:100%;margin-top:12px}#manage-resources .add.button:before{content:"\f067";font-family:"Font Awesome 5 Free"}.panel{width:48.95833%;float:left;padding-left:1.04167%;padding-right:1.04167%;border:1px solid #dfdfdf;padding:5px;margin:0 1.04167% 0 0;float:left;overflow:hidden}.panel .row{width:100%;background-color:rgba(0,0,0,0.04);padding:6px;position:relative;margin-bottom:6px}.panel>.row:last-child{margin-bottom:0}.panel .button{float:right;margin:0}.panel .row a.button{box-shadow:none;padding:0;color:#A91919;background-color:transparent}.panel h2{font-size:18px;line-height:24px;margin-bottom:6px}.browse .add.button,.browse .batch-edit.button{float:left;margin-right:.25em}.browse td:first-child,.browse th:first-child{width:50%}.browse td,.browse th{padding:12px 6px;overflow:hidden}.browse .browse-controls{display:flex;justify-content:space-between;flex-wrap:wrap;font-size:13.08px}.browse .browse-controls .advanced-search:before{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;font-family:"Font Awesome 5 Free";content:"\f002";padding:.25em}.browse-controls select,.browse-controls input,.browse-controls button,.browse-controls .button{font-size:13.08px;min-height:0;height:24px;line-height:24px;vertical-align:top;background-size:6.5408px}.browse-controls .sorting:not(:last-child){margin-left:auto}.browse-controls button,.browse-controls .button{padding:0 10px}.browse-controls .filtering{margin-left:24px}.browse .select-all{width:12px;margin-right:12px}.browse .tablesaw-cell-content,#properties .tablesaw-cell-content{display:flex;align-items:center;justify-content:flex-start;word-wrap:break-word}.browse .tablesaw-cell-content>.actions,#properties .tablesaw-cell-content>.actions{white-space:nowrap}.browse .batch-edit .tablesaw-cell-content>input[type="checkbox"]{margin-right:12px;flex-shrink:0}.browse .tablesaw-cell-content>span.indent{display:inline-block;vertical-align:top;flex:0;min-width:1em}.actions{margin:0 0 0 auto;display:flex;padding:0}.actions li{list-style-type:none}.actions a,.actions a:before,.actions button,.actions button:before{width:24px;height:24px;line-height:24px;vertical-align:top;border:0;box-shadow:none}.actions a,.actions button{opacity:.5}.actions a:before,.actions button:before{text-align:right}.actions a:hover,.actions a:active,.actions button:hover{opacity:1}.actions button{background-color:transparent;color:#A91919;margin:0;text-indent:-9999px;position:relative;padding:0;min-height:0}.actions button:before{text-indent:0;position:absolute;top:0;left:0}.row-count{margin:0 6px}.no-resources{text-align:center;position:relative;margin-top:96px}.no-resources:before{font-family:"Font Awesome 5 Free";font-weight:900;font-size:96px;position:absolute;top:0;left:0;width:100%;opacity:.08}.no-resources p{font-size:24px;line-height:48px;margin-top:48px}td .o-icon-private,td .o-icon-user-inactive{display:inline-block;vertical-align:bottom;margin-left:.5em;opacity:.5}.items .no-resources:before{content:"\f1b2"}.item-sets .no-resources:before{content:"\f1b3"}.media .no-resources:before,#media-list .no-resources:before{content:"\f03e"}.modules .no-resources:before{content:"\f0fe"}.vocabs .no-resources:before{content:"\f02d"}.resource-templates .no-resources:before,.resources-templates{content:"\f14b"}.users .no-resources:before{content:"\f0c0"}.jobs .no-resources:before{content:"\f0ae"}.sites .no-resources:before{content:"\f109"}#batch-form{border:1px solid #dfdfdf;border-bottom:0;border-radius:3px;margin-bottom:12px}#batch-form table.tablesaw{border-width:1px 0;border-radius:0 0 3px 3px;margin-bottom:0}#batch-form .batch-actions{display:inline-block}#batch-form .batch-inputs{display:flex;align-items:center;padding:6px;background-color:rgba(0,0,0,0.04)}#batch-form .batch-actions>a.button,#batch-form .batch-actions>button,#batch-form .batch-actions>input[type="submit"]{display:none;margin:0 12px 0 0;font-size:14px;line-height:24px;min-height:0;padding:0 6px}#batch-form .batch-actions>a.button.active,#batch-form .batch-actions>button.active,#batch-form .batch-actions>input[type="submit"].active{display:inline-block}#batch-form select{font-size:14px;min-height:0;height:auto;line-height:24px;padding:0 24px 0 6px;margin-right:6px;border:0;box-shadow:0 0 0 1px #dfdfdf inset}.batch-selected{padding-left:0;list-style:none}.batch-selected li{padding:12px 0 11px;border-bottom:1px solid #dfdfdf}.batch-selected li:first-child{padding-top:0}.batch-selected li:last-child{border-color:transparent}.multi-value.field .remove-value{background-color:transparent;color:#A91919;display:inline-block;text-indent:-9999px;position:relative;width:36px;text-align:center}.multi-value.field .remove-value:before{position:absolute;top:0;left:0;width:36px;line-height:36px;text-indent:0}.multi-value.field .remove-value:hover{color:#A91919}#advanced-options{background-color:#fff;padding:6px 12px calc(6px - 1px);clear:both;border:1px solid rgba(0,0,0,0.15);border-top:0;color:#676767}#advanced-options legend{float:left;width:calc(100% + 24px);font-weight:bold;padding:6px 12px;margin:-6px -12px 12px;background-color:rgba(0,0,0,0.04);max-width:none}#advanced-options input{float:left;clear:left;margin-right:.5em;height:24px;margin-bottom:6px}#advanced-options label{float:left;margin-bottom:6px}.search-filters{margin-bottom:6px;display:inline-block}.filter{display:inline-block;font-size:13.08px;margin:0 6px 6px 0;border-radius:3px;background-color:#f0f0f0;padding:0;vertical-align:top}.filter-label{display:inline-block;background-color:rgba(0,0,0,0.04);border-radius:3px 0 0 3px}.filter-label,.filter-value{padding:0 6px}.filter-value:not(:last-child):after{content:","}fieldset.section>legend{position:absolute;left:-9999px}.section-nav{border-top:1px solid #fff;height:42px;position:relative;margin-bottom:12px;clear:both}.section-nav:before{content:"";height:3px;position:absolute;bottom:1px;left:0;right:0;z-index:0;background:#fff;border:1px solid #dfdfdf;border-width:1px 0}.section-nav a{display:block;float:left;height:36px;line-height:30px;padding:3px 1em;position:relative;z-index:1;background-color:#fff;border-color:#dfdfdf;border:1px solid #dfdfdf;margin-left:.25em;color:#676767}.section-nav .active a{font-weight:bold;border-bottom-color:#fff}.section:not(a){display:none}.section.active{display:block}#page-actions{position:fixed;padding:6px 1.04167%;z-index:4;top:0;height:36px;right:0;text-align:right;margin-bottom:0}#page-actions input[type="submit"],#page-actions button,#page-actions .button{display:inline-block;height:36px;padding:6px 1em;min-height:0;vertical-align:top}#page-actions .delete.button{background-color:#FDEFEF;box-shadow:0 0 0 1px #E0C3C3 inset;color:#A91919}#page-actions .delete.button:hover{box-shadow:0 0 0 1px #DA8B8B inset}.add-property.button{margin-top:24px}.field-term{display:inline-block;font-family:"Source Code Pro", monospace;font-size:12px}.inputs .value a.value-language{margin-right:0;vertical-align:top;position:absolute;top:0;left:0;height:36px;width:36px;line-height:36px;border:1px solid #dfdfdf;overflow:hidden;text-align:center;color:#f19d9d;z-index:1}.inputs .value a.value-language.active{border-color:transparent}.inputs .value a.value-language ~ textarea{padding-left:42px}.inputs input[type="text"].value-language.active{line-height:24px;background-color:transparent;border:1px solid #dfdfdf;width:100%;min-height:0;padding:0 0 0 42px;display:block}.inputs input[type="text"].value-language.active.active ~ textarea{padding-left:6px;border-top:0}input[type="text"].value-language,.delete input[type="text"].value-language.active{display:none}.non-properties{margin-bottom:12px}.visibility{display:inline-block;padding:6px;margin-right:12px}.add .visibility:before,.edit .visibility:before{margin-right:.25em}.add .visibility [type="checkbox"],.edit .visibility [type="checkbox"]{margin-left:.5em}#add-item .remove.field{background-color:#ea7171;opacity:.6}.resource.input-option span{display:block;background-color:rgba(255,255,255,0.5);padding:6px 10px 0;width:100%;float:left}.field-meta{width:30%;padding-right:6px;position:relative}.field-meta legend,.field-meta label,.field-meta .label{max-width:80%;padding:6px 0;display:inline-block}.field-meta legend{position:static;float:left}.field-meta .error{float:left}.field-meta ul{margin:0}.field-label-text{display:block}.template{display:none}.selector ul{list-style:none;padding-left:0}.selector>ul{margin-top:6px}.selector li{position:relative}.selector li.total-count-heading{background-color:#404E61;color:#fff;border-radius:3px;text-transform:uppercase;font-size:12px;padding:6px 10px}.selector li.total-count-heading>ul{margin:6px -10px -6px;border-radius:0 0 3px 3px}.selector li.selector-parent.empty{display:none}.selector li.show>ul{position:relative;top:0;left:0;overflow:visible}.selector .selectable-list{background-color:#fff;color:#676767;overflow:visible;border-radius:3px;font-weight:bold;position:relative;border:1px solid #dfdfdf;margin:6px 0 0;text-transform:uppercase;font-size:12px}.selector .selectable-list li{padding:6px 12px}.selector .selectable-list .selector-parent{cursor:pointer;padding-right:24px;margin-bottom:0}.selector .selectable-list .selector-parent:after{content:"\f0da";font-family:"Font Awesome 5 Free";position:absolute;right:0;top:6px;width:18px}.selector .selectable-list .selector-parent.show:after{content:"\f0d7"}.selector .selectable-list .selector-parent:hover:before{content:"";position:absolute;top:0;bottom:0;left:0;width:5px;background-color:#dfdfdf}.selector .selectable-list .selector-parent:not(:last-of-type){border-bottom:1px solid #dfdfdf;padding-bottom:5px;border-color:#dfdfdf}.selector-parent ul{position:absolute;top:-9999px;left:-9999px}.selector-child{border-radius:0;font-weight:normal;padding:6px 10px;margin:0 -12px;font-size:16px;text-transform:none;width:calc(100% + 36px)}.selector-child:hover{background-color:rgba(0,0,0,0.04)}.selector-child:last-of-type{margin-bottom:-6px}.selector .description{display:inline-block;vertical-align:top}.selector .description.no-comment{opacity:0}.selector .description .o-icon-info{display:inline-block;margin:0 6px 0 0;opacity:.75;width:1em}.selector .description .o-icon-info:hover+.field-comment{left:5px;right:0;top:36px;padding:3px 10px 3px 36px;line-height:18px;background-color:#fff;z-index:1;margin:0;border-bottom:1px solid #dfdfdf;font-size:12px}.selector .description .o-icon-info:hover+.field-comment:before{content:"";position:absolute;left:7px;top:-6px;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff}.selector .description .o-icon-info:hover+.field-comment.above{bottom:100%;top:auto}.selector .description .o-icon-info:hover+.field-comment.above:before{top:calc(100% - 6px);transform:rotate(180deg)}.selector .description .o-icon-info+.field-comment{position:absolute;top:-9999px;left:-9999px;width:calc(100% - 5px)}.selector .selectable{display:inline-block;width:calc(100% - 36px);word-wrap:break-word}.field-actions{width:60%;display:inline-block;margin:24px 0 0 30%}.field .field-label{display:inline-block}.field .field-description,.field .docs-link{font-size:14px;line-height:18px;position:static;text-align:left;height:auto}.field .field-description:not(:only-child){margin-bottom:6px}.field-description{display:block;margin-right:10px;line-height:36px;height:36px;position:absolute;top:0;right:0;text-align:right;left:0}.field-description .o-icon-info{margin:0;cursor:pointer}.field-description .field-comment.open{left:inherit;right:0px;top:36px;background-color:#333;color:#fff;border-radius:3px;z-index:1;max-width:100%;font-size:14px;padding:6px 5px;margin:12px 0}.field-description .field-comment.open.above{top:auto;bottom:30px}.field-description .field-comment.open:before{content:"";display:block;height:0;width:0;position:absolute;top:-6px;bottom:0;right:3px;font-size:16px;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:12px solid #333}.field-description .field-comment.open.above:before{top:auto;bottom:-12px;transform:rotate(180deg)}.field .docs-link:before{content:"\f05a";font-family:"Font Awesome 5 Free";display:inline-block;margin-right:6px;font-size:14px;line-height:18px}.field-meta .expand,.field-meta .collapse{display:inline-block !important;margin-left:.5em !important;padding:0 !important;border:0 !important;width:auto !important}.field-meta .expand:after,.field-meta .collapse:after{float:none !important;margin-right:0 !important}.collapsible{display:none}.collapse+.collapsible{display:block;clear:both;overflow:hidden}.field-description .field-comment{position:absolute;top:-9999px;left:-9999px}.resource-values .field-term{display:block;font-size:12px}.inputs{line-height:36px;width:70%}.inputs:only-child{width:100%}.inputs p:only-child{margin:0}.inputs label,.inputs select,.inputs textarea,.inputs input[type="text"],.inputs input[type="password"],.inputs input[type="email"],.inputs input[type="url"],.inputs input[type="date"],.inputs input[type="datetime-local"]{width:100%;min-height:36px;margin:6px 0}.inputs label:only-child,.inputs select:only-child,.inputs textarea:only-child,.inputs input[type="text"]:only-child,.inputs input[type="password"]:only-child,.inputs input[type="email"]:only-child,.inputs input[type="url"]:only-child,.inputs input[type="date"]:only-child,.inputs input[type="datetime-local"]:only-child{margin:0}.inputs textarea{resize:vertical;line-height:1.5;background-color:#fff;min-width:0}.inputs label{padding:6px 0;margin:0 24px 0 0}.inputs .button,.inputs button,.inputs input[type="submit"]{margin:6px 0;line-height:24px}#resource-values div.value{display:flex;align-items:flex-start}.value{margin-bottom:6px}.value:last-of-type{margin-bottom:0}.value:last-of-type .remove-value{margin-bottom:0;box-shadow:none}.value.template{display:none}.multi-value .value{display:flex}.inputs p.no-values{padding:12px;border-radius:3px;background-color:rgba(0,0,0,0.04);line-height:24px}.inputs p.no-values:not(:only-child){display:none}.add-values{margin:6px 0 -3px}.add-values *{display:inline-block;min-width:36px;height:36px;border-radius:2px;text-align:center;margin:0}.inputs .add-values a.button{margin:0 0 3px}.inputs .add-values a.button:before{margin-right:.25em}.add-values label{background-color:rgba(0,0,0,0.04);line-height:36px;margin-right:0;overflow:hidden;width:12px;vertical-align:top}.input-footer{display:flex;width:30px}.input-footer .actions{margin-left:0;flex-wrap:wrap}.input-footer .actions a:before{line-height:36px;height:36px;text-align:center;margin-left:6px}.value.delete{background-color:#fcc;overflow:hidden}.value.delete .input-footer .actions li:last-child{display:none}.value a.restore-value,.value span.restore-value,.value.delete a.tab{display:none}.value.delete .input-footer{background-color:transparent;width:100%}.value [class*="o-icon-"].label{position:absolute;top:0;left:0;height:36px;width:36px;background-color:rgba(0,0,0,0.04);text-align:center;line-height:36px;overflow:hidden}.value label,.add-values label{margin:0;min-height:0;line-height:24px}.add-values button,.add-values .button{line-height:24px}.inputs .value textarea,.inputs .value input[type="text"]{width:100%;margin:0}[data-data-type^="resource"] .default,[data-data-type^="resource"] .o-title:not(:empty){margin:0 -6px;padding:6px;border-bottom:1px solid #dfdfdf;display:flex;line-height:24px;word-wrap:break-word}[data-data-type^="resource"].delete .o-icon-undo:before{padding-right:0}.input-body{clear:both;background-color:#fff;width:calc(100% - 36px);position:relative}[data-data-type^="resource"] .input-body{border:1px solid #dfdfdf;padding:0 6px}.inputs .input-body input[type="text"]{margin:0}[data-data-type^="resource"] .button{font-size:14px;padding:0 6px;line-height:24px;min-height:0;margin-right:3px}[data-data-type^="resource"] .button:before{margin-right:6px}.value.delete span.restore-value{display:inline-block;padding:0 6px;width:calc(100% - 36px)}.value.delete>*:not(.input-footer){display:none}p.selected-resource{margin:0;position:relative}.selected-resource a{width:calc(100% - 72px)}.selected-resource img{height:24px;margin-right:6px}.selected-resource .o-title a:after{font-family:"Font Awesome 5 Free";font-weight:900;position:absolute;top:6px;right:6px}.selected-resource .items a:after{content:"\f1b2"}.selected-resource .item_sets a:after{content:"\f1b3"}.selected-resource .media a:after{content:"\f03e"}[data-data-type="uri"] .input{position:relative;clear:both}[data-data-type="uri"] .input:first-child{border-bottom:1px solid #dfdfdf}[data-data-type="uri"] .input-body{border:1px solid #dfdfdf}[data-data-type="uri"] label{padding:6px 0 6px 6px;z-index:1;font-weight:bold;color:rgba(0,0,0,0.35);width:auto;display:flex}[data-data-type="uri"] .input-body input.value,[data-data-type="uri"] textarea.value-label{margin:-6px 0 -6px 6px;height:36px;border:0;padding:6px;font-weight:normal}[data-data-type="uri"] textarea.value-label{border-top-width:0}#resource-files button{margin:24px 0 0}#add-media-field{margin-bottom:0}.media.row{padding:6px;margin-bottom:6px;display:flex;align-items:center;word-wrap:break-word}.media.row img{width:36px;height:auto;margin-right:12px}.media.row .resource-name{margin-right:12px;min-width:0}.media.row .actions{margin-left:auto}.media.value.delete span.restore-value{padding:0}.media.value.delete>*:not(.restore-value),.media.value.delete .actions a:not(.o-icon-undo){display:none}.media.value.delete>.actions{display:block;top:18px}.media-header{font-size:16px;margin:6px -6px;margin-top:-12px;background-color:rgba(0,0,0,0.04);padding:0 6px;display:flex;align-items:center}.value.delete>.actions{display:inline-block}.media-render{margin-bottom:24px}.media-render>*{max-width:100%}.media-render img{max-width:100%;height:auto}#item-media .sidebar button{width:100%;text-align:left}#item-item-sets+.no-resources:before,#site-item-sets+.no-resources:before{content:"\f1b3"}#item-item-sets tr.delete{background-color:#fcc}#page-actions [class*="o-icon-"].button{background-color:transparent;width:auto;padding:6px 6px;box-shadow:none}.o-icon-private.button,.o-icon-public.button{margin-right:6px;box-shadow:none}#item-sites.empty+.no-resources:before{content:"\f109"}.search-nav{width:100%}.search-nav .resource-search{width:100%;position:relative;margin-bottom:6px;display:flex;flex-wrap:wrap}.search-nav .chosen-container{margin-bottom:6px}.search-nav button.o-icon-search{height:36px;width:36px;line-height:24px;padding:0 10px;border-radius:0 3px 3px 0;min-height:0;position:relative;text-indent:-9999px;margin:0}.search-nav button.o-icon-search:before{text-indent:0px;position:absolute;left:0;top:6px;line-height:24px;width:100%}.search-nav .resource-search>input[type="text"]{width:calc(100% - 36px);border-right:0;margin-bottom:6px}.resource-search-filters{padding-bottom:5px;border-bottom:1px solid #dfdfdf;margin-bottom:6px;width:100%}.resource-search-filters a.expand:after,.resource-search-filters a.collapse:after{float:right}.resource-search-filters .collapsible{margin-top:6px;overflow:visible}.sidebar .pagination{font-size:13.08px;border-bottom:1px solid rgba(0,0,0,0.08);padding-bottom:11px;margin-bottom:0;overflow:hidden;width:100%}.sidebar .pagination li{float:left}.sidebar .pagination li:first-of-type{padding-right:10px}.sidebar .pagination input{width:3em;text-align:center;color:#333;margin:0 3px}.sidebar .pagination .next.button{margin-right:5px}.sidebar .pagination input[type="text"]{float:left;line-height:19.62px;height:24px;border:1px solid #dfdfdf;margin-left:0}.sidebar .pagination .page-count{float:left;margin-right:12px}.sidebar .pagination .inactive{background-color:#E6E6E6;color:#B9B9B9}#item-results+.confirm-panel,#item-results .select-resource-checkbox-wrapper{display:none}#item-results.active{padding-bottom:72px}#item-results.active+.confirm-panel{display:block}#item-results.active .select-resource-checkbox-wrapper{display:inline-flex;align-items:center}.sidebar button.quick-select-toggle{background-color:transparent;color:#676767;box-shadow:none;margin:12px;padding:0;line-height:1;min-height:0}.sidebar button.quick-select-toggle:before{font-family:"Font Awesome 5 Free";font-weight:900;content:"\f204";display:inline-block;margin-right:6px}.sidebar button.quick-select-toggle.active:before{content:"\f205"}.sidebar button.quick-select-toggle+.resource-list{border-top:1px solid #dfdfdf}.resource-link{display:inline-flex;align-items:center;max-width:100%;min-width:0}.resource-link img{height:36px;margin-right:6px}.resource-link .resource-name{flex:1;min-width:0}.resource-list{width:100%}.resource-list .resource{padding:6px 12px 5px;border-bottom:1px solid rgba(0,0,0,0.08);position:relative;width:100%;overflow:hidden;display:flex;align-items:center;word-wrap:break-word}.resource-list .resource:hover{background-color:rgba(255,255,255,0.8)}.resource-list .resource:hover .select{right:0px}.resource-list .resource .select-resource-checkbox-wrapper{height:24px;margin-right:12px}#resource-details{background-color:#fff;overflow:hidden;padding:0}#resource-details .o-description,#resource-details .property{margin-bottom:0}.confirm-main{position:absolute;top:0;bottom:60px;overflow-y:auto;left:0;right:0;padding:12px 12px 0}.confirm-panel{position:absolute;bottom:0;right:0;left:0;padding:12px;background-color:#f7f7f7;border-top:1px solid #dfdfdf}.confirm-panel button,.confirm-panel .button{width:100%;margin:0}.vocabs .field [type="file"]{margin:6px 0 0}.vocabulary ul{padding-left:0;list-style:none;overflow:hidden}.vocabulary h2{margin-bottom:0}.vocabs.update td{vertical-align:top}.vocabs.update td:first-of-type,.vocabs.update td:nth-of-type(2){width:15%;word-wrap:break-word}.vocabs.update td:nth-of-type(3),.vocabs.update td:nth-of-type(4){width:35%}.vocabs.update td:nth-of-type(3):last-child{width:auto}.vocabs.update td:nth-of-type(3):not(:last-child){background-color:#ffe6e6}.vocabs.update td:nth-of-type(4){background-color:#cdffcd}.show .property,#item-metadata .meta-group{overflow:hidden;display:flex;justify-content:flex-end;flex-wrap:wrap}.show .property h4,#item-metadata .meta-group h4{width:22.22222%;vertical-align:top;padding:6px 0}.show .property h4+.value,.show .property .values,#item-metadata .meta-group h4+.value,#item-metadata .meta-group .values{padding:6px;margin-bottom:0;word-wrap:break-word;width:77.77778%}.show .property h4+.value:not(:first-of-type),.show .property .values:not(:first-of-type),#item-metadata .meta-group h4+.value:not(:first-of-type),#item-metadata .meta-group .values:not(:first-of-type){padding-top:0}.show .property .language,#item-metadata .meta-group .language{font-size:12px;padding:0 6px;margin-right:6px;background-color:rgba(0,0,0,0.04)}.show .property .private:after,#item-metadata .meta-group .private:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;content:"\f070";font-family:"Font Awesome 5 Free";display:inline-block;margin-left:6px}#linked-filter{display:flex;align-items:center;margin-bottom:24px}#linked-filter h4{margin-right:6px}#linked-resources table{margin-bottom:24px}#linked-resources caption{background-color:rgba(0,0,0,0.04);font-family:bold;padding:6px;font-family:"Lato", sans-serif;font-weight:bold;text-align:left}#linked-resources th{border-bottom:3px solid #dfdfdf}.linked-resource{margin-bottom:12px;padding-bottom:11px;border-bottom:1px solid #dfdfdf}.property .value .resource-name:after,.property .value.uri .uri-value-link:after{font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin-left:.5em}.property .value.uri .uri-value-link:after{content:"\f35d"}.property .value.items .resource-name:after{content:"\f1b2"}.property .value.media .resource-name:after{content:"\f03e"}.property .value.item_sets .resource-name:after{content:"\f1b3"}.class-row{border-bottom:1px solid #dfdfdf;padding-bottom:11px}.class-label{font-weight:bold}.class-label:after{content:": "}.sidebar{position:fixed;top:48px;left:100%;visibility:hidden;bottom:0;background-color:#f7f7f7;z-index:3;border-left:1px solid #dfdfdf;overflow-y:auto;overflow-x:hidden;width:25%;padding:12px}body.transitions-enabled .sidebar{transition:left .5s, visibility .5s}.sidebar.active,.sidebar.always-open{left:75%;visibility:visible}.sidebar.loading{overflow:hidden}.sidebar.loading *{visibility:hidden}.sidebar.loading:after{font-family:"Font Awesome 5 Free";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;font-style:normal;font-variant:normal;font-weight:normal;line-height:1;vertical-align:-.125em;content:"\f1ce";position:absolute;top:.75em;left:calc(50% - .6em);font-size:4em;animation:fa-spin 1s infinite linear;height:0.95em;width:1.2em;text-align:center;font-weight:900}.sidebar a.o-icon-close{position:absolute;right:12px;top:12px;z-index:3;color:#666}.sidebar .vocabulary,.sidebar .meta-group{margin-bottom:0}.sidebar .value{margin-bottom:6px;border-bottom:1px solid #dfdfdf;padding-bottom:5px;vertical-align:middle}.sidebar .value *:last-child{margin-bottom:0}.sidebar .value:last-child{border-color:transparent;margin-bottom:0}.sidebar input,.sidebar textarea,.sidebar select{width:100%}.sidebar input[type="checkbox"],.sidebar input[type="radio"]{width:auto}.sidebar h2{font-size:24px;margin-bottom:12px}.sidebar h3,.sidebar label,.sidebar .label{display:block;font-size:16px;font-weight:bold;margin:0 0 12px 0;padding:0 24px 12px 0;position:relative;width:100%;word-wrap:break-word}.sidebar h3:after,.sidebar label:after,.sidebar .label:after{content:"";position:absolute;left:-12px;right:-12px;bottom:0;top:-12px;background-color:#dfdfdf;z-index:-1}.sidebar .field{background-color:transparent;padding:0;margin-bottom:24px;flex-wrap:wrap;justify-content:flex-start}.sidebar .field .option{width:100%}.sidebar .field div.option+div.option{padding-top:11px;border-top:1px solid #dfdfdf;margin-top:12px}.sidebar .button,.sidebar button{background-color:#676767;border-color:#676767;color:#fff}.sidebar button.option{width:100%;text-align:left;border-color:#dfdfdf;background-color:#fff;color:#676767}.sidebar button.option:after{content:"\f067";font-family:"Font Awesome 5 Free";float:right;color:#dfdfdf}#sidebar-confirm{display:block;padding-bottom:12px;margin-bottom:12px}#sidebar-confirm input[type="submit"]{background-color:#A91919;color:#fff;box-shadow:none}body.sidebar-open #content{width:56.25%}.sidebar .meta-group{margin-bottom:12px}.sidebar .meta-group .value{width:100%;padding:6px 0;margin:0;word-wrap:break-word;display:block}.sidebar .meta-group .value:not(:last-child){border-bottom:1px solid #dfdfdf;padding-bottom:5px}.sidebar .meta-group h4{display:block;background-color:transparent;border-color:#dfdfdf;padding:6px 0;border-bottom:2px solid #dfdfdf;padding-bottom:4px;margin-bottom:0;width:100%}.sidebar .media a:first-child img,.sidebar>img:first-child{height:168px;width:auto;display:block;margin-bottom:12px}.sidebar .meta-group img{height:48px;box-shadow:0 0 0 1px #dfdfdf}.source-type{font-weight:bold}.resource-templates #properties{list-style:none;padding-left:0;margin-left:0}.resource-templates table{width:100%}.resource-templates th,.resource-templates td{padding:6px;vertical-align:top}.resource-templates .property.row{display:flex}.resource-templates .property.row.delete{background-color:#fcc}.resource-templates .property.row.delete .actions li:not(:last-child){display:none}.resource-templates .property.row:not(.delete) .sortable-handle{display:inline-flex}.resource-templates #properties{margin:24px 0 0;clear:both;padding:0}.resource-templates #edit-sidebar{padding-bottom:48px}.resource-templates #edit-sidebar .field h4,.resource-templates #edit-sidebar .field h4+span{width:100%}.resource-templates #edit-sidebar .field h4+span{margin-bottom:12px}.resource-templates #edit-sidebar .field label:not(:first-child),.resource-templates #edit-sidebar .field .option label{margin:0;padding-bottom:6px}.resource-templates #edit-sidebar .field label:not(:first-child):only-child,.resource-templates #edit-sidebar .field .option label:only-child{padding-bottom:0}.resource-templates #edit-sidebar .field label:not(:first-child):after,.resource-templates #edit-sidebar .field .option label:after{padding:0;margin:0;background:transparent}.alternate-label-cell:not(:empty){background-color:#dfdfdf;display:inline-block;padding:0 6px;margin:0 6px;position:relative}.alternate-label-cell:not(:empty):after{content:"";border-top:12px solid transparent;border-bottom:12px solid transparent;border-left:6px solid #dfdfdf;width:0;height:0;position:absolute;left:100%;top:0}.title-property-cell,.description-property-cell{text-transform:uppercase;font-size:12px;font-weight:bold;margin-left:auto;margin-right:12px}.title-property-cell:after,.description-property-cell:after{content:"\f00c";font-family:"Font Awesome 5 Free";display:inline-block;margin-left:6px}.title-property-cell ~ .actions,.description-property-cell ~ .actions{margin-left:0}.title-property-cell ~ .description-property-cell,.description-property-cell ~ .title-property-cell{margin-left:12px}#modules.installed tbody tr:not(.installed),#modules.uninstalled tbody tr:not(.uninstalled),#modules.needs-upgrade tbody tr:not(.needs-upgrade),#modules.active tbody tr:not(.active),#modules.deactivated tbody tr:not(.deactivated){display:none}.state-filter select{margin-bottom:12px}.module-name{font-weight:bold}.module-author{display:block}#modules .module{border-bottom:1px solid #dfdfdf;padding-bottom:11px;margin-bottom:12px;overflow:hidden}#modules .module-meta{float:left;max-width:50%}#modules .module-actions{float:right;max-width:50%;text-align:right}#modules .module form{display:inline-block}#modules button,#modules .button{display:inline-block;margin-left:6px;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset}#modules button:hover,#modules .button:hover{box-shadow:0 0 0 1px rgba(0,0,0,0.3) inset}#modules button:before,#modules .button:before{margin-right:6px}#modules .o-icon-install{box-shadow:0 0 0 1px #addead inset}#modules .o-icon-install:hover{box-shadow:0 0 0 1px #63c363 inset}#modules .o-icon-uninstall{margin-left:24px;box-shadow:0 0 0 1px #E0C3C3 inset}#modules .o-icon-uninstall:hover{box-shadow:0 0 0 1px #DA8B8B inset}#edit-keys td{word-wrap:break-word}.api-delete{width:10%}.api-label{width:25%}#system-info-table .label-col{width:25%}#system-info-table th,#system-info-table td{font-size:0.875em;padding:0;line-height:1.75;border:none}#system-info-table th[scope="rowgroup"]{font-size:1em;border-bottom:1px solid #dfdfdf}#system-info-table th[scope="row"]{padding-left:1.5em}.breadcrumbs{border-bottom:1px solid #dfdfdf;padding-bottom:11px;margin-bottom:24px}.breadcrumbs+.field{margin-top:24px}.breadcrumbs a:before{margin-right:6px}.breadcrumbs>*:not(:last-child):after{content:"\f0da";font-family:"Font Awesome 5 Free";font-weight:900;display:inline-block;margin:0 calc(12px - 3px) 0 12px;color:#000;cursor:default}#site-item-sets th:first-child,#site-item-sets th:last-child{width:36px}#site-item-sets .delete .sortable-handle:before,#site-item-sets .delete .o-icon-delete{display:none}tr.value.delete>td:not(.input-footer){display:table-cell}tr.value.delete .user-name,tr.value.delete select,tr.value.delete .o-icon-delete{display:none}td.user-meta{width:50%}#site-user-permissions.empty+.no-resources:before{content:"\f0c0"}#site-user-permissions .actions{justify-content:flex-end;padding:6px 0}.indent:before{content:"\2014";margin-right:-1px}.block{margin-bottom:6px}.block .block-header{position:relative;display:flex;align-items:center;background-color:rgba(0,0,0,0.12);padding:6px;font-weight:bold}.block .block-content input[type="hidden"]+*{padding-top:0;margin-top:0}.block.html>div{border:1px solid #dfdfdf}.block .field{padding:0;border-color:transparent;background-color:transparent;margin-top:6px}.block .field:last-child{margin-bottom:0}.block.delete>.block-header{font-weight:normal;display:flex;background:transparent}.block.delete>*:not(.block-header){display:none}.block.delete span.restore-value{padding:0 3px;text-transform:lowercase;width:auto}.block.delete a.restore-value:before{padding:0}.block.delete .sortable-handle{display:none}.delete .block-type,.block .delete div.item-title{margin-left:30px}.delete .block-type{font-weight:bold}.block div.item-title{margin:6px 0;display:flex;align-items:center}.block .item-title img{height:36px;width:auto;display:inline-block;margin-right:6px;vertical-align:top}.block .delete.attachment{background-color:#fcc}.block .delete.attachment .actions .undo{display:inline-block}.block .delete.attachment .actions .delete{display:none}.block .attachments-form{margin-bottom:12px}.block .attachments-form a h4{display:inline-block}.block .attachment .actions{margin-left:auto}.block .attachment .actions .button{background-color:transparent;color:#A91919;padding:0;min-height:0}.block .attachment .actions .button:hover{color:#A91919}.block .attachment .actions .undo{display:none}.block .block-content{clear:both;background-color:rgba(0,0,0,0.04);padding:6px}.block.sortable-ghost .block-content{display:none}.block .attachment{display:flex;align-items:center;position:relative;padding:0 6px}.block .attachment:not(:last-child){border-bottom:1px solid #dfdfdf;padding-bottom:-1px}.block .attachment .button{margin-bottom:0}.block .attachment-add{margin:6px 0 0}.block .expand,.block .collapse{width:100%;display:flex;padding:0 6px 0 0;justify-content:space-between}.block .field-meta .collapse+.collapsible{width:auto;border:0}.block .expand h4,.block .collapse h4{display:inline-block;padding:0}.block .collapse+.collapsible{border-top:1px solid #dfdfdf;padding:-1px 0 0 24px;margin-top:6px}.block[data-block-layout="html"] [contenteditable="true"]{resize:vertical;min-height:72px;max-height:288px}#attachment-options .option{position:relative;margin-bottom:12px}#attachment-options .expand,#attachment-options .collapse{position:absolute;right:0;top:0}#attachment-options h3{overflow:visible;white-space:normal}#attachment-item-select{display:block;margin:12px 0 0}#attachment-options .selected-attachment{margin-bottom:12px;margin-top:-12px;box-sizing:content-box;margin-right:-12px;margin-left:-12px;padding-right:12px;padding-left:12px;padding-top:12px;padding-bottom:12px;overflow:hidden}#attachment-options .selected-attachment img{height:96px;width:auto;float:right;margin:0 0 0 12px}#attachment-options .selected-attachment p:first-child{margin:0}#attachment-options h3.item-title{text-align:left}#attachment-options .item-thumbnail ~ h3.item-title{width:100%}#attachment-options .media-title{font-size:12px;display:block;width:calc(100% - 108px);float:left;word-wrap:break-word;text-align:left;clear:left}#attachment-options .item-thumbnail ~ #attachment-item-select{font-size:12px;display:inline-block;width:calc(100% - 108px);word-wrap:break-word}#attachment-options h3{word-wrap:break-word}#attachment-options .media-list{list-style:none;padding:0;margin:0 0 12px}#attachment-options .media-list li.media{position:relative;height:48px;width:48px;cursor:pointer;display:inline-block;padding:3px;border:1px solid #dfdfdf}#attachment-options .media-list li.media.attached,#attachment-options .media-list li.media:hover{background-color:rgba(0,0,0,0.04)}#attachment-options .media-list img{width:100%;height:auto}input[type="text"].page-selector-filter{width:100%;margin-bottom:12px}#nav-page-links{width:100%}.selectable-themes,.current-theme{display:flex;flex-wrap:wrap}.selectable-themes img,.current-theme img{max-width:100%;height:auto;vertical-align:bottom;position:relative;z-index:1}.selectable-themes .error,.current-theme .error{background-color:#f4b4b4;border-radius:3px;padding:6px 10px;margin:6px 0;display:block;width:100%;order:2}.theme-thumbnail{align-self:flex-start}.current-theme .error+ul{font-family:monospace;padding:11px;border:1px solid #dfdfdf;list-style-type:none}.invalid .theme-thumbnail img{opacity:.5}.selectable-themes .theme{width:calc(33.33% - 24px);margin:0 24px 24px 0;padding:11px;border:1px solid #dfdfdf;background-color:#fff;display:flex;flex-wrap:wrap}.selectable-themes .theme:hover{border:3px solid #9f9f9f;padding:9px}.selectable-themes .invalid.theme:hover{border:1px solid #dfdfdf;padding:11px}.selectable-themes .theme-thumbnail{width:100%;margin-bottom:12px;border:1px solid #dfdfdf}.selectable-themes .active.theme{background-color:#e7e7e7;position:relative;overflow:hidden;border-width:3px;padding:9px}.selectable-themes .active.theme:after{content:"\f00c";font-family:"Font Awesome 5 Free";position:absolute;bottom:0;right:0;opacity:.15;font-size:96px;line-height:96px}.current-theme{padding-bottom:23px;border-bottom:1px solid #dfdfdf;margin-bottom:24px;flex-wrap:nowrap}.current-theme .theme-thumbnail{width:50%;margin:0 24px 0 0;border:1px solid #dfdfdf}.current-theme .current-theme-info{width:calc(50% - 24px)}.current-theme-label{font-size:16px;text-transform:uppercase;display:block;margin-bottom:6px}.theme-meta{display:flex;flex-direction:column;width:100%}.jobs.browse th:first-child,.jobs.browse td:first-child{width:10%}body.minimal{padding:0;margin:48px 0;width:93.75%;max-width:100%;margin-left:auto;margin-right:auto;height:auto;background-color:#404E61}body.minimal:after{content:" ";display:block;clear:both}body.minimal div[role="main"]>h1:first-of-type{position:static;padding:0;width:100%;height:auto;display:inline-block;margin:0 0 24px 0}body.minimal h2{font-size:20px;margin-bottom:12px}body.minimal h3{font-size:18px;margin-bottom:12px}body.minimal fieldset legend{font-weight:bold;font-size:20px;margin-bottom:12px}body.minimal .logo{position:static;width:auto;float:none;padding:0;text-align:center;font-size:32px;line-height:48px}body.minimal div[role="main"]{width:100%;min-height:0;margin:0;padding:48px 6.25%;overflow:hidden}body.minimal .inputs{width:70%}body.minimal .inputs input{width:calc(66.66% - 6px);vertical-align:top}body.minimal .inputs *:only-child{width:100%}body.minimal [type="submit"]{width:100%;display:block;margin:auto;clear:both}body.minimal .field:last-child{margin-bottom:0}body.minimal .site-list .site{margin-bottom:12px}body.minimal .site-list .site-link{display:inline-block;font-size:20px;margin-bottom:6px}body.minimal .site-list .site-summary{margin:0 0 0 12px;line-height:20px}body.minimal .site-list-heading{font-size:16px;margin-top:-31.992px}body.minimal .site-results{margin-bottom:24px}body.minimal .site-results>ul,body.minimal .item-results>ul{padding-left:0}body.minimal .site-results>ul>li,body.minimal .item-results>ul>li{list-style-type:none}body.minimal .advanced-search{margin:-12px 0 24px;display:block}body.minimal .advanced-search-actions{margin:12px 0}body.minimal .advanced-search-actions input[type="submit"]{width:auto;display:inline-block}.forgot-password{margin:6px 0}.sitewide-search-form{display:flex;margin-bottom:24px}.sitewide-search-form input[type="text"]{width:100%;margin-right:6px}.sitewide-search-form input[type="submit"]{width:auto}.asset-form-element{line-height:36px}.asset-form-element.empty .asset-form-clear{display:none}.asset-form-element:not(.empty) .no-selected-asset{display:none}.select-asset img{width:25%}.selected-asset,.no-selected-asset{display:block}.selected-asset-image{max-width:100%}.asset-upload{overflow:hidden;margin-bottom:24px}.asset-upload button{margin:6px 0 0;display:none}.asset-upload button.active{display:inline-block}.asset-upload ul.errors{color:#A91919;margin-top:0}.asset-upload ul.errors:empty{display:none}.asset-upload ul.errors a{border-bottom:1px solid #A91919}.asset-filters{margin-bottom:6px}.asset-list .asset{padding-bottom:5px;border-bottom:1px solid #dfdfdf;margin-bottom:6px}.asset-list .asset:last-child{border-bottom-color:transparent}.asset-list .select-asset{display:flex;align-items:center;word-wrap:break-word}.asset-list .select-asset img{margin-right:6px}.asset-list .select-asset .asset-name{min-width:0}#asset-sidebar input[type="file"]{width:100%}.color-picker{display:flex}.color-picker input[type="text"]{margin:0}.color-picker .color-picker-sample{border:1px solid #dfdfdf;width:30%;margin-left:6px}}@media screen and (max-width: 640px){script{display:none !important}body{padding:0}.mobile-only{display:block}button.mobile-only{width:100%}header{width:100%;float:none;text-align:center;position:fixed;top:0;left:0;padding:0;right:0;z-index:1000;min-height:0}header .button{border-radius:0px;position:absolute;top:0;z-index:1001;color:#fff;background-color:#222933;box-shadow:none}header .o-icon-menu.button{left:0;border-right:1px solid rgba(0,0,0,0.08);width:36px}header .o-icon-search.button{left:36px}header .o-icon-user.button{right:0}header nav ul.navigation>li:not(:first-of-type){margin-top:0}.logo{line-height:36px;padding:0 16.66667%;width:100%;text-align:center;display:block;background-color:#404E61}#user,#search,header nav{position:fixed;top:-9999px;left:-9999px;z-index:1000}header nav#site-nav{position:static;background-color:#fff;padding:0;margin-bottom:0}header nav#site-nav h5{border-top:1px solid #dfdfdf;padding-top:6px -1px;margin-bottom:0}header nav#site-nav h5 a{padding:0;border-bottom:0}#menu.active,#user.active,#search.active{top:36px;left:0;bottom:0;right:0;background-color:#fff;margin:0}footer{margin:0;padding:0;position:static;width:100%;text-align:center}footer:after{position:static;background:transparent}.browse td:first-child,.browse th:first-child{width:100%}td .o-icon-private,td .o-icon-user-inactive{vertical-align:top;margin:0}div[role="main"]{margin:36px 0 0 0;width:100%;min-height:calc(100% - 72px);position:relative;padding-top:48px}div[role="main"]>h1:first-of-type{width:auto;position:static;padding:12px 1.04167%;height:auto;margin:0 -1.04167% 12px;white-space:normal;line-height:36px}#menu{text-align:left;background-color:#fff;position:fixed;overflow:scroll}#menu ul{margin-bottom:0;border-bottom:0;padding-bottom:0}#menu a{display:block;padding:6px 12px 5px;color:#676767;border-bottom:1px solid #dfdfdf}#menu li:last-child a{border-bottom:0;padding-bottom:6px}#menu h5 a{padding:0;border-bottom:0}#menu h5{height:36px;color:#676767;background-color:rgba(0,0,0,0.04);padding:6px 12px 5px;border:1px solid #dfdfdf;border-width:1px 0}#menu h4{background-color:rgba(0,0,0,0.12);margin-bottom:0}#menu h4:not(:first-of-type){margin-top:0}#menu a.public,#menu a.expand,#menu a.collapse{height:36px;margin:-36px 0 0;padding:0 12px 0 0}#menu a.public:before,#menu a.public:after,#menu a.expand:before,#menu a.expand:after,#menu a.collapse:before,#menu a.collapse:after{height:36px;line-height:36px}#mobile-nav{display:block}#mobile-nav a.active{background-color:#500c0c}#user{text-align:center}#user .user-id{color:#676767;width:100%;margin:0 6px 24px}#user .user-id a{color:#A91919}#user .logout{display:block;margin:12px 6px;font-size:16px;color:#676767;border-radius:3px;width:calc(100% - 12px);min-height:36px;background-color:rgba(0,0,0,0.08);border-radius:3px;border:0;box-shadow:0 0 0 1px rgba(0,0,0,0.15) inset;padding:6px 10px;display:inline-block;text-align:center;cursor:pointer;margin:0 6px}#user .logout:last-of-type:before{content:""}#user .logout a{color:#676767}#page-actions{top:36px;background-color:#fff;width:100%;border-bottom:1px solid rgba(0,0,0,0.08);height:48px;padding-bottom:5px}#sidebar{position:fixed;top:36px;z-index:100;width:100%}#sidebar #content.sidebar-open{left:0}body.sidebar-open #content{width:100%}.sidebar{width:100%;top:36px;z-index:1000}.sidebar.always-open{left:100%}.sidebar.active,.confirm-panel{left:0;width:100%}fieldset.section>.always.active{content:"";bottom:0;left:0;right:0;height:48px;background-color:#fff;position:fixed;border-top:1px solid rgba(0,0,0,0.04)}fieldset.section>.always.active button{width:100%;margin:6px}#modules .module-meta,#modules .module-actions{width:100%;max-width:100%}#modules .module-meta{margin-bottom:12px}#modules .module-actions{text-align:left}#modules button,#modules .button{margin:0 6px 0 0}.vocabs.update td{width:100% !important}#search-form{margin:48px 4.16667%}.batch-edit.button{margin:0;border-radius:0px;position:relative;z-index:1}.browse table{position:relative}.browse .sorting{float:left}.browse .pagination{margin-right:48px}.jobs.browse th:first-child,.jobs.browse td:first-child{width:100%}fieldset.section,fieldset.section{margin-bottom:0;position:relative}fieldset.section>legend:first-child{position:relative;left:auto;display:block;width:100%;font-size:20px;padding:6px 9px 6px 0;color:#A91919;cursor:pointer;border-bottom:3px solid rgba(0,0,0,0.08);padding-bottom:-3px;margin-bottom:12px}fieldset.section>legend:after{content:"\f0da";font-family:"Font Awesome 5 Free";position:absolute;right:9px;top:12px}fieldset.section.mobile-active>legend:after{content:"\f0d7"}.add .active.section>.button,.edit .active.section>.button{display:inline-block}.field-meta,.inputs{width:100%}.field-actions{position:absolute;top:9px;right:1.66667%;z-index:1;width:50%}.field-actions a{float:right;display:block}.field-actions a.button{margin-left:.5em !important}.field-meta label,.field-description p{line-height:24px;margin-bottom:6px}.field-meta label{font-weight:bold}.unset .field-meta{width:100%}.show .sidebar.active{position:static;border:1px solid #dfdfdf;padding:11px;margin-top:24px}.show .section .property,.show .section .meta-group{margin-bottom:6px;box-shadow:0 0 0 1px #dfdfdf;border-radius:2px}.show .section .meta-group h4,.show .section .property h4{padding-bottom:6px;border-bottom:1px solid #dfdfdf;background-color:rgba(0,0,0,0.04)}.show .section .meta-group h4,.show .section .meta-group .value,.show .section .property h4,.show .section .property .values{width:100% !important;padding:6px !important}.show .section .meta-group .value:not(:first-of-type),.show .section .property .value:not(:first-of-type){border-top:1px solid #dfdfdf;padding-top:6px -1px;margin-top:6px}.show .sidebar .meta-group .value:not(:first-of-type),.show .sidebar .property .value:not(:first-of-type){padding-top:6px}body.minimal{width:100%;margin:0}body.minimal .logo{background-color:transparent}body.minimal div[role="main"]{padding:24px 6.25%}body.minimal div[role="main"]>.messages{margin-top:24px}body.minimal .inputs{width:100%;margin-left:0}body.minimal footer{color:white}.tablesaw tr{overflow:hidden;margin-bottom:0}.tablesaw tr:first-of-type{border-top:1px solid #dfdfdf}.browse td:not(:first-of-type) .tablesaw-cell-content,#properties td:not(:first-of-type) .tablesaw-cell-content{display:inline-block}.tablesaw td:first-of-type{background-color:rgba(0,0,0,0.04)}.tablesaw td:first-of-type .tablesaw-cell-label{width:0;height:0;overflow:hidden;padding:0;display:block}.tablesaw td:first-of-type .tablesaw-cell-content{width:100%;max-width:100%}.batch-edit.tablesaw td:first-of-type{width:100%;background:rgba(0,0,0,0.04)}.batch-edit.tablesaw td:first-of-type img{margin-bottom:0}.batch-edit.tablesaw td:first-of-type .tablesaw-cell-label{width:0;overflow:hidden;padding:0}.batch-edit .tablesaw-cell-content{display:inline-flex}.tablesaw-cell-content{width:70%;max-width:70%}.tablesaw-cell-content img{margin:0 6px 0 0}.tablesaw tr:last-of-type td,.tablesaw tr:last-of-type th,.tablesaw th,.tablesaw td{padding-top:6px;padding-bottom:6px;vertical-align:top}.tablesaw th:not(:last-of-type),.tablesaw td:not(:last-of-type){border-bottom:1px solid #dfdfdf}.tablesaw tr.delete{border:0}.tablesaw tr.delete td{border:0}.tablesaw tr.delete td:not(:first-of-type){display:none}.resource-template th:first-of-type,.resource-template td:first-of-type{width:100%}#site-user-permissions tr.user.value{position:relative}#site-user-permissions td:nth-child(3){position:absolute;top:0;right:0;padding:0 6px 0 0}#site-user-permissions td:nth-child(3) .tablesaw-cell-label{display:none}#site-user-permissions td:nth-child(3) .tablesaw-cell-content{width:100%;max-width:100%}#site-user-permissions.tablesaw-stack tbody tr{border-bottom:0}}
diff --git a/application/asset/js/admin.js b/application/asset/js/admin.js
index 2fa499235d..267f50d26a 100644
--- a/application/asset/js/admin.js
+++ b/application/asset/js/admin.js
@@ -189,6 +189,96 @@ var Omeka = {
         }
     },
 
+    initializeSelector : function(tableId, selectorId) {
+        var table = $(tableId);
+        var existingRowData = table.data('existing-rows');
+        var rowTemplate = $($.parseHTML(table.data('rowTemplate')));
+        var selector = $(selectorId);
+        var totalCount = $(selectorId).find('.selector-total-count');
+      
+        var parentToggle = function(e) {
+            e.stopPropagation();
+            if ($(this).children('li')) {
+                $(this).toggleClass('show');
+            }
+        }
+        
+        var appendRow = function(id) {
+            if (table.find(".resource-id[value='" + id + "']").length) {
+                return;
+            }
+            var tableRow = rowTemplate.clone();
+            var selectorRow = selector.find('[data-resource-id="' + id + '"]');
+            tableRow.find('.resource-id').val(id);
+            tableRow.find('.data-value').each(function() {
+                var tableRowCell = $(this);
+                var tableRowKey = tableRowCell.data('row-key');
+                var tableRowValue = selectorRow.data(tableRowKey);
+                tableRowCell.text(tableRowValue);
+            });
+            selectorRow.addClass('added');
+            table.append(tableRow).removeClass('empty').trigger('appendRow');
+            updateSiteCount(id);
+        }
+    
+        var updateSiteCount = function(id) {
+            var resource = $('[data-resource-id="' + id + '"]');
+            var resourceParent = resource.parents('.selector-parent');
+            var childCount = resourceParent.find('.selector-child-count').first();
+            if (resource.hasClass('added')) {
+                var newTotalCount = parseInt(totalCount.text()) - 1;
+                var newChildCount = parseInt(childCount.text()) - 1;
+            } else {
+                var newTotalCount = parseInt(totalCount.text()) + 1;
+                var newChildCount = parseInt(childCount.text()) + 1;
+            }
+            totalCount.text(newTotalCount);
+            childCount.text(newChildCount);
+            if (newTotalCount == 0) {
+                selector.find('.resources-available').addClass('empty');
+            } else {
+                selector.find('.resources-available').removeClass('empty');
+            }
+            if (newChildCount == 0) {
+                resourceParent.addClass('empty');
+            } else {
+                resourceParent.removeClass('empty');
+            }
+        }
+    
+        if (existingRowData.length > 0) {
+            $.each(existingRowData, function() {
+                appendRow(this.id);
+            });
+            table.removeClass('empty');
+        }
+    
+        // Add the selected resource to the edit panel.
+        $(selectorId + ' .selector-child').on('click', function(e) {
+            e.stopPropagation();
+            var selectorRow = $(this);
+            var selectorParent = selectorRow.parents('.selector-parent');
+            selectorParent.unbind('click');
+            appendRow(selectorRow.data('resource-id'));
+            selectorParent.bind('click', parentToggle);
+            Omeka.scrollTo(table.find('.resource-row:last-child'));
+        });
+
+        // Remove an item set from the edit panel.
+        table.on('click', '.o-icon-delete', function(e) {
+            e.preventDefault();
+            var row = $(this).closest('.resource-row');
+            var resourceId = row.find('.resource-id').val();
+            selector.find('[data-resource-id="' + resourceId + '"]').removeClass('added');
+            updateSiteCount(resourceId);
+            row.remove();
+            if ($('.resource-row').length < 1) {
+                table.addClass('empty');
+            }
+        });
+    },
+
+
     // @see http://stackoverflow.com/questions/7035825/regular-expression-for-a-language-tag-as-defined-by-bcp47
     // Removes `|[A-Za-z]{4}|[A-Za-z]{5,8}` from the "language" portion becuase,
     // while in the spec, it does not represent current usage.
diff --git a/application/asset/js/item-manage-item-sets.js b/application/asset/js/item-manage-item-sets.js
deleted file mode 100644
index 9d5f3ff85e..0000000000
--- a/application/asset/js/item-manage-item-sets.js
+++ /dev/null
@@ -1,51 +0,0 @@
-$(document).ready(function() {
-
-// Add the selected item set to the edit panel.
-$('#item-set-selector .selector-child').click(function(event) {
-    event.preventDefault();
-
-    $('#item-item-sets').removeClass('empty');
-    var itemSetId = $(this).data('item-set-id');
-
-    if ($('#item-item-sets').find("input[value='" + itemSetId + "']").length) {
-        return;
-    }
-
-    var row = $($('#item-set-template').data('template'));
-    var itemSetTitle = $(this).data('child-search');
-    var ownerEmail = $(this).data('owner-email');
-    row.children('td.item-set-title').text(itemSetTitle);
-    row.children('td.owner-email').text(ownerEmail);
-    row.find('td > input').val(itemSetId);
-    $('#item-item-sets > tbody:last').append(row);
-});
-
-// Remove an item set from the edit panel.
-$('#item-item-sets').on('click', '.o-icon-delete', function(event) {
-    event.preventDefault();
-
-    var removeLink = $(this);
-    var itemSetRow = $(this).closest('tr');
-    var itemSetInput = removeLink.closest('td').find('input');
-    itemSetInput.prop('disabled', true);
-
-    // Restore item set link.
-    var undoRemoveLink = $('<a>', {
-        href: '#',
-        class: 'fa fa-undo',
-        title: Omeka.jsTranslate('Restore item set'),
-        click: function(event) {
-            event.preventDefault();
-            itemSetRow.toggleClass('delete');
-            itemSetInput.prop('disabled', false);
-            removeLink.show();
-            $(this).remove();
-        },
-    });
-
-    itemSetRow.toggleClass('delete');
-    undoRemoveLink.insertAfter(removeLink);
-    removeLink.hide();
-});
-
-});
diff --git a/application/asset/js/resource-form.js b/application/asset/js/resource-form.js
index 94ff30f2a7..335577319b 100644
--- a/application/asset/js/resource-form.js
+++ b/application/asset/js/resource-form.js
@@ -94,9 +94,8 @@
         $('#select-item a').on('o:resource-selected', function (e) {
             var value = $('.value.selecting-resource');
             var valueObj = $('.resource-details').data('resource-values');
-            var namePrefix = value.data('name-prefix');
 
-            $(document).trigger('o:prepare-value', ['resource', value, valueObj, namePrefix]);
+            $(document).trigger('o:prepare-value', ['resource', value, valueObj]);
             Omeka.closeSidebar($('#select-resource'));
         });
 
@@ -117,8 +116,7 @@
                         field.find('.values').append(value);
                     }
                     var valueObj = $(this).data('resource-values');
-                    var namePrefix = value.data('name-prefix');
-                    $(document).trigger('o:prepare-value', ['resource', value, valueObj, namePrefix]);
+                    $(document).trigger('o:prepare-value', ['resource', value, valueObj]);
                 });
         });
 
@@ -189,11 +187,46 @@
                 e.preventDefault();
                 alert(errors.join("\n"));
             }
+
+            $('#values-json').val(JSON.stringify(collectValues()));
         });
 
         initPage();
     });
 
+    var collectValues = function () {
+        var values = {};
+        $('#properties').children().each(function () {
+            var propertyValues = [];
+            var property = $(this);
+            var propertyTerm = property.data('propertyTerm');
+            var propertyId = property.data('propertyId');
+            property.find('.values > .value').each(function () {
+                var valueData = {}
+                var value = $(this);
+                if (value.hasClass('delete')) {
+                    return;
+                }
+                valueData['property_id'] = propertyId;
+                valueData['type'] = value.data('dataType');
+                valueData['is_public'] = value.find('input.is_public').val();
+                value.find(':input[data-value-key]').each(function () {
+                    var input = $(this);
+                    valueKey = input.data('valueKey');
+                    if (!valueKey || input.prop('disabled')) {
+                        return;
+                    }
+                    valueData[valueKey] = input.val();
+                });
+                propertyValues.push(valueData);
+            });
+            if (propertyValues.length) {
+                values[propertyTerm] = propertyValues;
+            }
+        });
+        return values;
+    };
+
     /**
      * Make a new value.
      */
@@ -223,24 +256,15 @@
         }
         // Prepare the value node.
         var count = field.find('.value').length;
-        var namePrefix = field.data('property-term') + '[' + count + ']';
         var valueLabelID = 'property-' + field.data('property-id') + '-label';
-        value.data('name-prefix', namePrefix);
-        value.find('input.property')
-            .attr('name', namePrefix + '[property_id]')
-            .val(field.data('property-id'));
-        value.find('input.type')
-            .attr('name', namePrefix + '[type]')
-            .val(type);
         value.find('input.is_public')
-            .attr('name', namePrefix + '[is_public]')
             .val(isPublic ? 1 : 0);
         value.find('span.label')
             .attr('id', valueLabelID);
         value.find('textarea.input-value')
             .attr('aria-labelledby', valueLabelID);
         value.attr('aria-labelledby', valueLabelID);
-        $(document).trigger('o:prepare-value', [type, value, valueObj, namePrefix]);
+        $(document).trigger('o:prepare-value', [type, value, valueObj]);
 
         return value;
     };
@@ -248,14 +272,14 @@
     /**
      * Prepare the markup for the default data types.
      */
-    $(document).on('o:prepare-value', function(e, type, value, valueObj, namePrefix) {
+    $(document).on('o:prepare-value', function(e, type, value, valueObj) {
         // Prepare simple single-value form inputs using data-value-key
         value.find(':input').each(function () {
-            valueKey = $(this).data('valueKey');
+            var valueKey = $(this).data('valueKey');
             if (!valueKey) {
                 return;
             }
-            $(this).attr('name', namePrefix + '[' + valueKey + ']')
+            $(this).removeAttr('name')
                 .val(valueObj ? valueObj[valueKey] : null);
         });
 
diff --git a/application/asset/js/site-item-sets.js b/application/asset/js/site-item-sets.js
deleted file mode 100644
index da7e8a8813..0000000000
--- a/application/asset/js/site-item-sets.js
+++ /dev/null
@@ -1,66 +0,0 @@
-$(document).ready(function() {
-    
-new Sortable(document.getElementById('site-item-set-rows'), {
-    draggable: '.site-item-set-row',
-    handle: '.sortable-handle',
-});
-
-var itemSets = $('#site-item-sets');
-var noItemSets = $('#no-site-item-sets');
-var itemSetsData = itemSets.data('itemSets');
-var rowTemplate = $($.parseHTML(itemSets.data('rowTemplate')));
-
-var appendItemSet = function(id, title, email) {
-    if (itemSets.find(".site-item-set-id[value='" + id + "']").length) {
-        return;
-    }
-    var row = rowTemplate.clone();
-    row.find('.site-item-set-id').val(id);
-    row.find('.site-item-set-title').text(title);
-    row.find('.site-item-set-owner-email').text(email);
-    $('#site-item-set-rows').append(row);
-}
-
-if (itemSetsData.length) {
-    $.each(itemSetsData, function() {
-        appendItemSet(this.id, this.title, this.email);
-    });
-    itemSets.show();
-} else {
-    noItemSets.show();
-}
-
-$('#item-set-selector .selector-child').on('click', function() {
-    var itemSet = $(this);
-    appendItemSet(
-        itemSet.data('itemSetId'),
-        itemSet.data('childSearch'),
-        itemSet.data('ownerEmail')
-    );
-    itemSets.show();
-    noItemSets.hide()
-});
-
-itemSets.on('click', '.o-icon-delete', function(e) {
-    e.preventDefault();
-    var removeLink = $(this);
-    var undoLink = removeLink.siblings('.o-icon-undo');
-    var row = removeLink.closest('.site-item-set-row');
-    row.find('input').prop('disabled', true);
-    row.toggleClass('delete');
-    removeLink.hide();
-    undoLink.show();
-});
-
-itemSets.on('click', '.o-icon-undo', function(e) {
-    e.preventDefault();
-    var undoLink = $(this);
-    var removeLink = undoLink.siblings('.o-icon-delete');
-    var row = undoLink.closest('.site-item-set-row');
-    row.find('input').prop('disabled', false);
-    row.toggleClass('delete');
-    undoLink.hide();
-    removeLink.show();
-});
-
-});
diff --git a/application/asset/js/site-users.js b/application/asset/js/site-users.js
index c16213d065..7cb673b100 100644
--- a/application/asset/js/site-users.js
+++ b/application/asset/js/site-users.js
@@ -1,41 +1,29 @@
 $(document).ready(function() {
+    var permissionsTable = $('#site-user-permissions');
+    var existingRows = permissionsTable.data('existing-rows');
+    var index = 0;
 
-$('#content').on('click', '.o-icon-delete,.o-icon-undo', function(e) {
-    e.preventDefault();
-    $(this).parents('tr').toggleClass('delete');
-});
+    var updateRowIndex = function(rowId) {
+      var rowInput = $('.resource-id[value="' + rowId + '"]');
+      var row = rowInput.parents('.resource-row');
+      row.find('[name*="o:site_permission[__index__]"]').each(function() {
+        var inputName = $(this).attr('name');
+        var newinputName = inputName.replace('__index__', index);
+        $(this).attr('name', newinputName);
+      });
+      index++;
+    };
 
-$('#content').on('click', '.o-icon-delete', function() {
-    $(this).parents('tr').find('input[type="hidden"]').prop('disabled', true);
-});
-
-$('#content').on('click', '.o-icon-undo', function() {
-    $(this).parents('.user.value').find('input[type="hidden"]').prop('disabled', false);
-});
-
-$('.selector .selector-child').click(function() {
-    var user = $(this);
-    var userId = user.data('user-id');
-    var userText = user.data('child-search');
-    var permissionsTable = $('#site-user-permissions');
-    if (permissionsTable.find('.user-id[value="' + userId + '"]').length) {
-        // Do not add existing users.
-        return;
-    }
-    var index = permissionsTable.find('.user').length;
-    if (!index) {
-        permissionsTable.removeClass('empty');
-    }
-    var template = $($.parseHTML($('#user-row-template').data('template')));
-    template.find('.user-name').text(userText);
-    template.find('.user-id').val(userId);
-    template.find(':input').each(function() {
-        // Find and replace indexes for all inputs.
-        var thisInput = $(this);
-        var name = thisInput.attr('name').replace('[__index__]', '[' + index + ']');
-        thisInput.attr('name', name);
+    $.each(existingRows, function() {
+      var selectedRole = this.role;
+      var existingRowValueInput = $('.resource-id[value="' + this.id + '"]');
+      var existingRow = existingRowValueInput.parents('.resource-row');
+      existingRow.find('select').val(selectedRole);
+      updateRowIndex(this.id);
+    });
+    
+    permissionsTable.on('appendRow', function() {
+      updateRowIndex($('[name="o:site_permission[__index__][o:user][o:id]"]').val());
     });
-    permissionsTable.find('tbody').append(template);
 });
 
-});
diff --git a/application/asset/sass/_screen.scss b/application/asset/sass/_screen.scss
index 2502de52b5..f4ffe51bf8 100755
--- a/application/asset/sass/_screen.scss
+++ b/application/asset/sass/_screen.scss
@@ -660,6 +660,32 @@ a.collapse {
     margin-left: 3px;
 }
 
+.selector-table {
+    display: table;
+}
+
+.selector-table.empty,
+.selector-table + .no-resources {
+    display: none;
+}
+    
+.selector-table.empty + .no-resources {
+    display: block;
+}
+      
+.selector .resources-available.empty,
+.selector .resources-available + .resources-unavailable {
+    display: none;
+}
+
+.selector .resources-available.empty + .resources-unavailable {
+    display: block;
+}
+
+.selector .selector-child.added {
+  display: none;
+}
+
 /* @end */
 
 /* @group ----- Header ----- */
@@ -1838,6 +1864,10 @@ input[type="text"].value-language,
             border-radius: 0 0 3px 3px;
         }
     }
+    
+    .selector li.selector-parent.empty {
+        display: none;
+    }
 
     .selector li.show > ul {
         position: relative;
@@ -2499,23 +2529,11 @@ input[type="text"].value-language,
 
     /* @group ----- Item Sets ----- */
 
-    #item-item-sets + .no-resources {
-        display: none;
-    }
-
-    #item-item-sets.empty {
-        display: none;
-
-        & + .no-resources {
-            display: block;
-            padding: 0 $spacing-large;
-
-            &:before {
-                content: fa-content($fa-var-cubes);
-            }
-        }
+    #item-item-sets + .no-resources:before,
+    #site-item-sets + .no-resources:before {
+        content: fa-content($fa-var-cubes);
     }
-
+    
     #item-item-sets tr.delete {
         background-color: $delete-bg;
     }
@@ -2534,6 +2552,14 @@ input[type="text"].value-language,
     }
 
     /* @end */
+    
+    /* @group ----- Sites ----- */
+    
+    #item-sites.empty + .no-resources:before {
+        content: fa-content($fa-var-laptop);
+    }
+    
+    /* @end */
 
 /* @end */
 
@@ -3435,15 +3461,28 @@ body.sidebar-open #content {
     cursor: default;
 }
 
+    /* @group ----- Resources ----- */
+      
+    #site-item-sets th:first-child,
+    #site-item-sets th:last-child {
+        width: 1.5 * $spacing-large;
+    }
+    
+    #site-item-sets .delete .sortable-handle:before,
+    #site-item-sets .delete .o-icon-delete {
+        display: none;
+    }
+    
+    
+    /* @end */
+
     /* @group ----- User Permissions ----- */
 
     // The :not is pointless but gets this the proper precedence
     tr.value.delete > td:not(.input-footer) {
         display: table-cell;
     }
-    #site-user-permissions + .no-resources,
-    #site-user-permissions.empty,
-    tr.value:not(.delete) .o-icon-undo,
+    
     tr.value.delete .user-name,
     tr.value.delete select,
     tr.value.delete .o-icon-delete {
@@ -3454,13 +3493,8 @@ body.sidebar-open #content {
         width: 50%;
     }
 
-    #site-user-permissions.empty  + .no-resources {
-        display: block;
-        padding: 0 $spacing-large;
-
-        &:before {
-            content: fa-content($fa-var-users);
-        }
+    #site-user-permissions.empty  + .no-resources:before {
+        content: fa-content($fa-var-users);
     }
 
     #site-user-permissions .actions {
@@ -3530,7 +3564,7 @@ body.sidebar-open #content {
         padding: 0;
     }
 
-    .delete .sortable-handle {
+    .block.delete .sortable-handle {
         display: none;
     }
 
@@ -3922,6 +3956,12 @@ body.minimal {
         margin-bottom: $spacing-medium;
     }
 
+
+    h3 {
+        font-size: 1.125 * $base-font-size;
+        margin-bottom: $spacing-medium;
+    }
+
     fieldset legend {
         font-weight: bold;
         font-size: 1.25 * $base-font-size;
@@ -3991,12 +4031,54 @@ body.minimal {
         font-size: $base-font-size;
         margin-top: -1.333 * $spacing-large;
     }
+
+    .site-results {
+        margin-bottom: $spacing-large;
+    }
+    
+    .site-results > ul,
+    .item-results > ul {
+      padding-left: 0;
+    }
+    
+    .site-results > ul > li,
+    .item-results > ul > li {
+        list-style-type: none;
+    }
+    
+    .advanced-search {
+      margin: (-1 * $spacing-medium) 0 $spacing-large;
+      display: block;
+    }
+    
+    .advanced-search-actions {
+      margin: $spacing-medium 0;
+      
+      input[type="submit"] {
+        width: auto;
+        display: inline-block;
+      }
+    }
 }
 
 .forgot-password {
     margin: $spacing-small 0;
 }
 
+.sitewide-search-form {    
+    display: flex;
+    margin-bottom: $spacing-large;
+
+    input[type="text"] {
+      width: 100%;
+      margin-right: $spacing-small;      
+    }
+    
+    input[type="submit"] {
+      width: auto;
+    }
+}
+
 /* @end */
 
 /* @group ----- Assets ----- */
diff --git a/application/asset/sass/page-blocks.scss b/application/asset/sass/page-blocks.scss
new file mode 100644
index 0000000000..964e87062a
--- /dev/null
+++ b/application/asset/sass/page-blocks.scss
@@ -0,0 +1,226 @@
+@import "base";
+
+.item-showcase {
+    margin: 1rem 0;
+    border-top: 1px solid $border-gray;
+    border-bottom: 1px solid $border-gray;
+    padding: calc(1rem - 1px) 0 0;
+    overflow: hidden;
+    text-align: center;
+    clear: both;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+}
+
+.item.resource .caption {
+    font-size: .875rem;
+    line-height: 1.5rem;
+
+    * {
+        margin: 0 0 1rem 0;
+    }
+
+    & > *:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.item-showcase .resource.item {
+    vertical-align: top;
+    margin-bottom: 1rem;
+
+    img {
+        margin-right: .5rem;
+        max-width: 100%;
+    }
+
+    &:only-child img {
+        margin: 0 auto;
+    }
+
+    &:not(:only-child) {
+        width: 25%;
+        clear: none;
+        padding: 0 .5rem;
+    }
+
+    &:not(:only-child) h3 {
+        clear: left;
+        font-size: 1rem;
+        line-height: 1.5rem;
+        margin: .5rem 0 0;
+    }
+
+    &:not(:only-child) img {
+        max-height: 7rem;
+        width: auto;
+        float: none;
+        margin-right: 0;
+        vertical-align: top;
+    }
+}
+
+.right,
+.left {
+    overflow: hidden;
+    max-width: 33.33%;
+}
+
+.left .item.resource,
+.right .item.resource {
+    margin: 0 0 1rem 0;
+
+    &:first-of-type {
+        padding-top: calc(1rem - 1px);
+        margin-top: 0;
+    }
+
+    &:last-of-type {
+        padding-bottom: -1px;
+    }
+    
+    .media-render a {
+        display: block;
+    }
+    
+    audio,
+    canvas,
+    video,
+    progress,
+    img {
+        max-width: 100%;
+        vertical-align: bottom;
+        margin-bottom: .5rem;
+    }
+}
+
+/* IE/Edge min-content alternative */
+.file {
+    border-top: 1px solid $border-gray;
+    border-bottom: 1px solid $border-gray;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+}
+
+.left.file {
+    float: left;
+    clear: left;
+    margin: 0 1rem 1rem 0;
+}
+
+.right.file {
+    float: right;
+    clear: right;
+    margin: 0 0 1rem 1rem;
+}
+
+.center.file {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    text-align: center;
+    
+    .item {
+        width: 100%;
+    }
+}
+
+.left .item.resource > a:first-child,
+.right .item.resource > a:first-child {
+    vertical-align: top;
+}
+
+.medium .item.resource > h3,
+.square .item.resource > h3 {
+    font-size: $base-font-size;
+    line-height: 1.5rem;
+}
+
+.left .item.resource > h3,
+.right .item.resource > h3 {
+    margin: 0;
+}
+
+.left .item.resource + p,
+.right .item.resource + p {
+    margin-top: 0;
+}
+
+.break {
+    width: 100%;
+    clear: both;
+    border-bottom: 1px solid $border-gray;
+    padding-bottom: -1px;
+    margin: 1rem 0;
+
+    &.transparent {
+        border-color: transparent;
+    }
+
+    &.opaque {
+        border-color: $border-gray;
+    }
+}
+
+.preview-block {
+    margin: 1rem 0;
+    overflow: hidden;
+    width: 100%;
+    clear: both;
+}
+
+.toc-block > ul {
+    margin: 1rem 0;
+    list-style-type: none;
+    border-left: 5px solid $border-gray;
+}
+
+.toc-block > ul > li {
+    margin-bottom: .5rem;
+}
+
+.toc-block > ul > li > a {
+    font-weight: bold;
+}
+
+.toc-block ul ul {
+    list-style-type: none;
+    padding-left: 0;
+}
+
+.toc-block ul ul ul {
+    padding-left: 1.25em;
+}
+
+.toc-block ul ul li:before {
+    content: "\2014";
+    color: $border-gray;
+}
+
+.item-with-metadata {
+    width: 100%;
+    overflow: hidden;
+    margin: 1rem 0;
+}
+
+.item-with-metadata .show.resource {
+    margin: (2rem) 0;
+}
+
+.list-of-sites .site-list {
+    .site {
+        margin-bottom: .5rem;
+    }
+
+    .site-link {
+        display: inline-block;
+        font-size: 1.25rem;
+        margin-bottom: .25rem;
+    }
+    
+    .site-summary {
+        margin: 0 0 0 .5rem;
+        line-height: 20px;
+    }
+}
diff --git a/application/config/application.config.php b/application/config/application.config.php
index 75455d829c..67b7eb493e 100644
--- a/application/config/application.config.php
+++ b/application/config/application.config.php
@@ -1,15 +1,16 @@
 <?php
 namespace Omeka;
 
-$reader = new \Zend\Config\Reader\Ini;
+$reader = new \Laminas\Config\Reader\Ini;
 return [
     'modules' => [
-        'Zend\Form',
-        'Zend\I18n',
-        'Zend\Mvc\I18n',
-        'Zend\Mvc\Plugin\Identity',
-        'Zend\Navigation',
-        'Zend\Router',
+        'Laminas\Form',
+        'Laminas\I18n',
+        'Laminas\Mvc\I18n',
+        'Laminas\Mvc\Plugin\Identity',
+        'Laminas\Navigation',
+        'Laminas\Router',
+        'Laminas\ZendFrameworkBridge',
         'Omeka',
     ],
     'module_listener_options' => [
diff --git a/application/config/module.config.php b/application/config/module.config.php
index 030fc08fbc..5832b27e9d 100644
--- a/application/config/module.config.php
+++ b/application/config/module.config.php
@@ -186,10 +186,10 @@
     'logger' => [
         'log' => false,
         'path' => OMEKA_PATH . '/logs/application.log',
-        'priority' => \Zend\Log\Logger::NOTICE,
+        'priority' => \Laminas\Log\Logger::NOTICE,
     ],
     'http_client' => [
-        'adapter' => \Zend\Http\Client\Adapter\Socket::class,
+        'adapter' => \Laminas\Http\Client\Adapter\Socket::class,
         'sslcapath' => null,
         'sslcafile' => null,
     ],
@@ -232,7 +232,7 @@
     ],
     'service_manager' => [
         'abstract_factories' => [
-            \Zend\Navigation\Service\NavigationAbstractServiceFactory::class,
+            \Laminas\Navigation\Service\NavigationAbstractServiceFactory::class,
         ],
         'factories' => [
             'Omeka\Acl' => Service\AclFactory::class,
@@ -279,13 +279,13 @@
             'Omeka\Environment' => Service\EnvironmentFactory::class,
         ],
         'invokables' => [
-            'ModuleRouteListener' => \Zend\Mvc\ModuleRouteListener::class,
+            'ModuleRouteListener' => \Laminas\Mvc\ModuleRouteListener::class,
             'Omeka\MvcExceptionListener' => Mvc\ExceptionListener::class,
             'Omeka\MvcListeners' => Mvc\MvcListeners::class,
             'Omeka\ViewApiJsonRenderer' => View\Renderer\ApiJsonRenderer::class,
         ],
         'delegators' => [
-            'Zend\I18n\Translator\TranslatorInterface' => [
+            'Laminas\I18n\Translator\TranslatorInterface' => [
                 'Omeka\Service\Delegator\TranslatorDelegatorFactory',
             ],
         ],
@@ -294,7 +294,7 @@
             'Omeka\File\Thumbnailer' => 'Omeka\File\Thumbnailer\ImageMagick',
             'Omeka\Job\DispatchStrategy' => 'Omeka\Job\DispatchStrategy\PhpCli',
             'Omeka\JobDispatcher' => 'Omeka\Job\Dispatcher',
-            'Zend\Authentication\AuthenticationService' => 'Omeka\AuthenticationService',
+            'Laminas\Authentication\AuthenticationService' => 'Omeka\AuthenticationService',
         ],
         'shared' => [
             'Omeka\Paginator' => false,
@@ -304,6 +304,7 @@
     'controllers' => [
         'invokables' => [
             'Omeka\Controller\Index' => Controller\IndexController::class,
+            'Omeka\Controller\Search' => Controller\SearchController::class,
             'Omeka\Controller\Maintenance' => Controller\MaintenanceController::class,
             'Omeka\Controller\Site\Index' => Controller\Site\IndexController::class,
             'Omeka\Controller\Site\Item' => Controller\Site\ItemController::class,
@@ -339,6 +340,7 @@
             'messenger' => Mvc\Controller\Plugin\Messenger::class,
             'setBrowseDefaults' => Mvc\Controller\Plugin\SetBrowseDefaults::class,
             'currentSite' => Mvc\Controller\Plugin\CurrentSite::class,
+            'mergeValuesJson' => Mvc\Controller\Plugin\MergeValuesJson::class,
         ],
         'factories' => [
             'api' => Service\ControllerPlugin\ApiFactory::class,
@@ -386,6 +388,7 @@
             'filterSelector' => View\Helper\FilterSelector::class,
             'propertySelector' => View\Helper\PropertySelector::class,
             'itemSetSelector' => View\Helper\ItemSetSelector::class,
+            'siteSelector' => View\Helper\SiteSelector::class,
             'userSelector' => View\Helper\UserSelector::class,
             'searchFilters' => View\Helper\SearchFilters::class,
             'blockAttachmentsForm' => View\Helper\BlockAttachmentsForm::class,
@@ -440,19 +443,19 @@
             'passwordRequirements' => Service\ViewHelper\PasswordRequirementsFactory::class,
         ],
         'delegators' => [
-            'Zend\Form\View\Helper\FormElement' => [
+            'Laminas\Form\View\Helper\FormElement' => [
                 Service\Delegator\FormElementDelegatorFactory::class,
             ],
-            'Zend\Form\View\Helper\FormSelect' => [
+            'Laminas\Form\View\Helper\FormSelect' => [
                 Service\Delegator\FormSelectDelegatorFactory::class,
             ],
-            'Zend\Form\View\Helper\FormRow' => [
+            'Laminas\Form\View\Helper\FormRow' => [
                 Service\Delegator\FormRowDelegatorFactory::class,
             ],
-            'Zend\View\Helper\Navigation' => [
+            'Laminas\View\Helper\Navigation' => [
                 Service\Delegator\NavigationDelegatorFactory::class,
             ],
-            'Zend\View\Helper\HeadTitle' => [
+            'Laminas\View\Helper\HeadTitle' => [
                 Service\Delegator\HeadTitleDelegatorFactory::class,
             ],
         ],
diff --git a/application/config/routes.config.php b/application/config/routes.config.php
index 5d0aad693e..cd2c6d7705 100644
--- a/application/config/routes.config.php
+++ b/application/config/routes.config.php
@@ -3,7 +3,7 @@
     'router' => [
         'routes' => [
             'top' => [
-                'type' => \Zend\Router\Http\Literal::class,
+                'type' => \Laminas\Router\Http\Literal::class,
                 'options' => [
                     'route' => '/',
                     'defaults' => [
@@ -14,7 +14,7 @@
                 ],
             ],
             'site' => [
-                'type' => \Zend\Router\Http\Segment::class,
+                'type' => \Laminas\Router\Http\Segment::class,
                 'options' => [
                     'route' => '/s/:site-slug',
                     'constraints' => [
@@ -30,7 +30,7 @@
                 'may_terminate' => true,
                 'child_routes' => [
                     'resource' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/:controller[/:action]',
                             'defaults' => [
@@ -43,7 +43,7 @@
                         ],
                     ],
                     'resource-id' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/:controller/:id[/:action]',
                             'defaults' => [
@@ -57,7 +57,7 @@
                         ],
                     ],
                     'item-set' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/item-set/:item-set-id',
                             'defaults' => [
@@ -70,7 +70,7 @@
                         ],
                     ],
                     'page-browse' => [
-                        'type' => \Zend\Router\Http\Literal::class,
+                        'type' => \Laminas\Router\Http\Literal::class,
                         'options' => [
                             'route' => '/page',
                             'defaults' => [
@@ -80,7 +80,7 @@
                         ],
                     ],
                     'page' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/page/:page-slug',
                             'defaults' => [
@@ -92,7 +92,7 @@
                 ],
             ],
             'admin' => [
-                'type' => \Zend\Router\Http\Literal::class,
+                'type' => \Laminas\Router\Http\Literal::class,
                 'options' => [
                     'route' => '/admin',
                     'defaults' => [
@@ -105,7 +105,7 @@
                 'may_terminate' => true,
                 'child_routes' => [
                     'default' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/:controller[/:action]',
                             'constraints' => [
@@ -118,7 +118,7 @@
                         ],
                     ],
                     'id' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '/:controller/:id[/:action]',
                             'constraints' => [
@@ -132,7 +132,7 @@
                         ],
                     ],
                     'site' => [
-                        'type' => \Zend\Router\Http\Literal::class,
+                        'type' => \Laminas\Router\Http\Literal::class,
                         'options' => [
                             'route' => '/site',
                             'defaults' => [
@@ -145,7 +145,7 @@
                         'may_terminate' => true,
                         'child_routes' => [
                             'slug' => [
-                                'type' => \Zend\Router\Http\Segment::class,
+                                'type' => \Laminas\Router\Http\Segment::class,
                                 'options' => [
                                     'route' => '/s/:site-slug',
                                     'constraints' => [
@@ -158,7 +158,7 @@
                                 'may_terminate' => true,
                                 'child_routes' => [
                                     'action' => [
-                                        'type' => \Zend\Router\Http\Segment::class,
+                                        'type' => \Laminas\Router\Http\Segment::class,
                                         'options' => [
                                             'route' => '[/:action]',
                                             'constraints' => [
@@ -167,7 +167,7 @@
                                         ],
                                     ],
                                     'page' => [
-                                        'type' => \Zend\Router\Http\Segment::class,
+                                        'type' => \Laminas\Router\Http\Segment::class,
                                         'options' => [
                                             'route' => '/page',
                                             'defaults' => [
@@ -178,7 +178,7 @@
                                         'may_terminate' => true,
                                         'child_routes' => [
                                             'default' => [
-                                                'type' => \Zend\Router\Http\Segment::class,
+                                                'type' => \Laminas\Router\Http\Segment::class,
                                                 'options' => [
                                                     'route' => '/:page-slug[/:action]',
                                                     'constraints' => [
@@ -195,7 +195,7 @@
                                 ],
                             ],
                             'add' => [
-                                'type' => \Zend\Router\Http\Literal::class,
+                                'type' => \Laminas\Router\Http\Literal::class,
                                 'options' => [
                                     'route' => '/add',
                                     'defaults' => [
@@ -208,7 +208,7 @@
                 ],
             ],
             'api' => [
-                'type' => \Zend\Router\Http\Literal::class,
+                'type' => \Laminas\Router\Http\Literal::class,
                 'options' => [
                     'route' => '/api',
                     'defaults' => [
@@ -219,7 +219,7 @@
                 'may_terminate' => true,
                 'child_routes' => [
                     'default' => [
-                        'type' => \Zend\Router\Http\Segment::class,
+                        'type' => \Laminas\Router\Http\Segment::class,
                         'options' => [
                             'route' => '[/:resource[/:id]]',
                             'constraints' => [
@@ -230,7 +230,7 @@
                 ],
             ],
             'api-context' => [
-                'type' => \Zend\Router\Http\Literal::class,
+                'type' => \Laminas\Router\Http\Literal::class,
                 'options' => [
                     'route' => '/api-context',
                     'defaults' => [
@@ -240,7 +240,7 @@
                 ],
             ],
             'install' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/install(/.*)?',
                     'spec' => '/install',
@@ -251,7 +251,7 @@
                 ],
             ],
             'migrate' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/migrate(/.*)?',
                     'spec' => '/migrate',
@@ -262,7 +262,7 @@
                 ],
             ],
             'maintenance' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/maintenance(/.*)?',
                     'spec' => '/maintenance',
@@ -273,7 +273,7 @@
                 ],
             ],
             'login' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/login(/.*)?',
                     'spec' => '/login',
@@ -284,7 +284,7 @@
                 ],
             ],
             'logout' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/logout(/.*)?',
                     'spec' => '/logout',
@@ -295,7 +295,7 @@
                 ],
             ],
             'create-password' => [
-                'type' => \Zend\Router\Http\Segment::class,
+                'type' => \Laminas\Router\Http\Segment::class,
                 'options' => [
                     'route' => '/create-password/:key',
                     'constraints' => [
@@ -308,7 +308,7 @@
                 ],
             ],
             'forgot-password' => [
-                'type' => \Zend\Router\Http\Regex::class,
+                'type' => \Laminas\Router\Http\Regex::class,
                 'options' => [
                     'regex' => '/forgot-password(/.*)?',
                     'spec' => '/forgot-password',
@@ -318,6 +318,19 @@
                     ],
                 ],
             ],
+            'search' => [
+                'type' => \Laminas\Router\Http\Segment::class,
+                'options' => [
+                    'route' => '/search[/:action]',
+                    'defaults' => [
+                        'controller' => 'Omeka\Controller\Search',
+                        'action' => 'index',
+                    ],
+                    'constraints' => [
+                        'action' => '[a-zA-Z0-9_-]+',
+                    ],
+                ],
+            ],
         ],
     ],
 ];
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityApiKey.php b/application/data/doctrine-proxies/__CG__OmekaEntityApiKey.php
index ab9c3aa8e8..cd4e565eb5 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityApiKey.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityApiKey.php
@@ -12,14 +12,14 @@ class ApiKey extends \Omeka\Entity\ApiKey implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class ApiKey extends \Omeka\Entity\ApiKey implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityAsset.php b/application/data/doctrine-proxies/__CG__OmekaEntityAsset.php
index 1a02f94839..788071d3bd 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityAsset.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityAsset.php
@@ -12,14 +12,14 @@ class Asset extends \Omeka\Entity\Asset implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Asset extends \Omeka\Entity\Asset implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityFulltextSearch.php b/application/data/doctrine-proxies/__CG__OmekaEntityFulltextSearch.php
index 0481a42af1..e1ee06ee98 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityFulltextSearch.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityFulltextSearch.php
@@ -12,14 +12,14 @@ class FulltextSearch extends \Omeka\Entity\FulltextSearch implements \Doctrine\O
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class FulltextSearch extends \Omeka\Entity\FulltextSearch implements \Doctrine\O
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityItem.php b/application/data/doctrine-proxies/__CG__OmekaEntityItem.php
index b72e40b090..85355a5591 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityItem.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityItem.php
@@ -12,14 +12,14 @@ class Item extends \Omeka\Entity\Item implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Item extends \Omeka\Entity\Item implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -64,10 +66,10 @@ public function __construct($initializer = null, $cloner = null)
     public function __sleep()
     {
         if ($this->__isInitialized__) {
-            return ['__isInitialized__', 'id', 'media', 'siteBlockAttachments', 'itemSets', 'owner', 'resourceClass', 'resourceTemplate', 'thumbnail', 'title', 'isPublic', 'created', 'modified', 'values'];
+            return ['__isInitialized__', 'id', 'media', 'siteBlockAttachments', 'itemSets', 'sites', 'owner', 'resourceClass', 'resourceTemplate', 'thumbnail', 'title', 'isPublic', 'created', 'modified', 'values'];
         }
 
-        return ['__isInitialized__', 'id', 'media', 'siteBlockAttachments', 'itemSets', 'owner', 'resourceClass', 'resourceTemplate', 'thumbnail', 'title', 'isPublic', 'created', 'modified', 'values'];
+        return ['__isInitialized__', 'id', 'media', 'siteBlockAttachments', 'itemSets', 'sites', 'owner', 'resourceClass', 'resourceTemplate', 'thumbnail', 'title', 'isPublic', 'created', 'modified', 'values'];
     }
 
     /**
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
@@ -232,6 +235,17 @@ public function getItemSets()
         return parent::getItemSets();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function getSites()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSites', []);
+
+        return parent::getSites();
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityItemSet.php b/application/data/doctrine-proxies/__CG__OmekaEntityItemSet.php
index 5de9e014dc..e4a70327fd 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityItemSet.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityItemSet.php
@@ -12,14 +12,14 @@ class ItemSet extends \Omeka\Entity\ItemSet implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class ItemSet extends \Omeka\Entity\ItemSet implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityJob.php b/application/data/doctrine-proxies/__CG__OmekaEntityJob.php
index e489d4a325..96f8773dff 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityJob.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityJob.php
@@ -12,14 +12,14 @@ class Job extends \Omeka\Entity\Job implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Job extends \Omeka\Entity\Job implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityMedia.php b/application/data/doctrine-proxies/__CG__OmekaEntityMedia.php
index 6a8c839544..b787eeb70e 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityMedia.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityMedia.php
@@ -12,14 +12,14 @@ class Media extends \Omeka\Entity\Media implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Media extends \Omeka\Entity\Media implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityMigration.php b/application/data/doctrine-proxies/__CG__OmekaEntityMigration.php
index 62416b2777..5e2cb218e2 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityMigration.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityMigration.php
@@ -12,14 +12,14 @@ class Migration extends \Omeka\Entity\Migration implements \Doctrine\ORM\Proxy\P
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Migration extends \Omeka\Entity\Migration implements \Doctrine\ORM\Proxy\P
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityModule.php b/application/data/doctrine-proxies/__CG__OmekaEntityModule.php
index 21693e4d2d..93ecd892e5 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityModule.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityModule.php
@@ -12,14 +12,14 @@ class Module extends \Omeka\Entity\Module implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Module extends \Omeka\Entity\Module implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityPasswordCreation.php b/application/data/doctrine-proxies/__CG__OmekaEntityPasswordCreation.php
index 8b02c17a0c..0b9d845e35 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityPasswordCreation.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityPasswordCreation.php
@@ -12,14 +12,14 @@ class PasswordCreation extends \Omeka\Entity\PasswordCreation implements \Doctri
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class PasswordCreation extends \Omeka\Entity\PasswordCreation implements \Doctri
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityProperty.php b/application/data/doctrine-proxies/__CG__OmekaEntityProperty.php
index c84cf73e6b..01e20f2a72 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityProperty.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityProperty.php
@@ -12,14 +12,14 @@ class Property extends \Omeka\Entity\Property implements \Doctrine\ORM\Proxy\Pro
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Property extends \Omeka\Entity\Property implements \Doctrine\ORM\Proxy\Pro
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityResourceClass.php b/application/data/doctrine-proxies/__CG__OmekaEntityResourceClass.php
index e3658081f2..d1c808f2d7 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityResourceClass.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityResourceClass.php
@@ -12,14 +12,14 @@ class ResourceClass extends \Omeka\Entity\ResourceClass implements \Doctrine\ORM
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class ResourceClass extends \Omeka\Entity\ResourceClass implements \Doctrine\ORM
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplate.php b/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplate.php
index 2d71325281..4c55668484 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplate.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplate.php
@@ -12,14 +12,14 @@ class ResourceTemplate extends \Omeka\Entity\ResourceTemplate implements \Doctri
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class ResourceTemplate extends \Omeka\Entity\ResourceTemplate implements \Doctri
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplateProperty.php b/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplateProperty.php
index 1223b01d76..e12349eb53 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplateProperty.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityResourceTemplateProperty.php
@@ -12,14 +12,14 @@ class ResourceTemplateProperty extends \Omeka\Entity\ResourceTemplateProperty im
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class ResourceTemplateProperty extends \Omeka\Entity\ResourceTemplateProperty im
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySession.php b/application/data/doctrine-proxies/__CG__OmekaEntitySession.php
index e15a61e1b9..01de2fca78 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySession.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySession.php
@@ -12,14 +12,14 @@ class Session extends \Omeka\Entity\Session implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Session extends \Omeka\Entity\Session implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySetting.php b/application/data/doctrine-proxies/__CG__OmekaEntitySetting.php
index 9ec96e767b..86894186c3 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySetting.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySetting.php
@@ -12,14 +12,14 @@ class Setting extends \Omeka\Entity\Setting implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Setting extends \Omeka\Entity\Setting implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySite.php b/application/data/doctrine-proxies/__CG__OmekaEntitySite.php
index 7fe95badd7..2ca6740b2c 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySite.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySite.php
@@ -12,14 +12,14 @@ class Site extends \Omeka\Entity\Site implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Site extends \Omeka\Entity\Site implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -64,10 +66,10 @@ public function __construct($initializer = null, $cloner = null)
     public function __sleep()
     {
         if ($this->__isInitialized__) {
-            return ['__isInitialized__', 'id', 'slug', 'theme', 'title', 'summary', 'navigation', 'homepage', 'itemPool', 'owner', 'created', 'modified', 'isPublic', 'pages', 'sitePermissions', 'siteItemSets'];
+            return ['__isInitialized__', 'id', 'slug', 'theme', 'title', 'summary', 'navigation', 'homepage', 'itemPool', 'owner', 'created', 'modified', 'isPublic', 'assignNewItems', 'pages', 'sitePermissions', 'siteItemSets', 'items'];
         }
 
-        return ['__isInitialized__', 'id', 'slug', 'theme', 'title', 'summary', 'navigation', 'homepage', 'itemPool', 'owner', 'created', 'modified', 'isPublic', 'pages', 'sitePermissions', 'siteItemSets'];
+        return ['__isInitialized__', 'id', 'slug', 'theme', 'title', 'summary', 'navigation', 'homepage', 'itemPool', 'owner', 'created', 'modified', 'isPublic', 'assignNewItems', 'pages', 'sitePermissions', 'siteItemSets', 'items'];
     }
 
     /**
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
@@ -430,6 +433,28 @@ public function isPublic()
         return parent::isPublic();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function setAssignNewItems($assignNewItems)
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'setAssignNewItems', [$assignNewItems]);
+
+        return parent::setAssignNewItems($assignNewItems);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAssignNewItems()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getAssignNewItems', []);
+
+        return parent::getAssignNewItems();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -463,6 +488,17 @@ public function getSiteItemSets()
         return parent::getSiteItemSets();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function getItems()
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'getItems', []);
+
+        return parent::getItems();
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySiteBlockAttachment.php b/application/data/doctrine-proxies/__CG__OmekaEntitySiteBlockAttachment.php
index 9bc5aae205..f6f0da3bbc 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySiteBlockAttachment.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySiteBlockAttachment.php
@@ -12,14 +12,14 @@ class SiteBlockAttachment extends \Omeka\Entity\SiteBlockAttachment implements \
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SiteBlockAttachment extends \Omeka\Entity\SiteBlockAttachment implements \
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySiteItemSet.php b/application/data/doctrine-proxies/__CG__OmekaEntitySiteItemSet.php
index 241f896ef7..26983e4d29 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySiteItemSet.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySiteItemSet.php
@@ -12,14 +12,14 @@ class SiteItemSet extends \Omeka\Entity\SiteItemSet implements \Doctrine\ORM\Pro
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SiteItemSet extends \Omeka\Entity\SiteItemSet implements \Doctrine\ORM\Pro
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySitePage.php b/application/data/doctrine-proxies/__CG__OmekaEntitySitePage.php
index 309148334c..3922e64617 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySitePage.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySitePage.php
@@ -12,14 +12,14 @@ class SitePage extends \Omeka\Entity\SitePage implements \Doctrine\ORM\Proxy\Pro
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SitePage extends \Omeka\Entity\SitePage implements \Doctrine\ORM\Proxy\Pro
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySitePageBlock.php b/application/data/doctrine-proxies/__CG__OmekaEntitySitePageBlock.php
index c4ca45ab6f..75f4db80ec 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySitePageBlock.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySitePageBlock.php
@@ -12,14 +12,14 @@ class SitePageBlock extends \Omeka\Entity\SitePageBlock implements \Doctrine\ORM
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SitePageBlock extends \Omeka\Entity\SitePageBlock implements \Doctrine\ORM
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySitePermission.php b/application/data/doctrine-proxies/__CG__OmekaEntitySitePermission.php
index 47444f3d3b..ce0d5bc01a 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySitePermission.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySitePermission.php
@@ -12,14 +12,14 @@ class SitePermission extends \Omeka\Entity\SitePermission implements \Doctrine\O
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SitePermission extends \Omeka\Entity\SitePermission implements \Doctrine\O
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntitySiteSetting.php b/application/data/doctrine-proxies/__CG__OmekaEntitySiteSetting.php
index 633fd588a2..4ac41af5fe 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntitySiteSetting.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntitySiteSetting.php
@@ -12,14 +12,14 @@ class SiteSetting extends \Omeka\Entity\SiteSetting implements \Doctrine\ORM\Pro
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class SiteSetting extends \Omeka\Entity\SiteSetting implements \Doctrine\ORM\Pro
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityUser.php b/application/data/doctrine-proxies/__CG__OmekaEntityUser.php
index 2bcc3d8505..3816b1d8b8 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityUser.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityUser.php
@@ -12,14 +12,14 @@ class User extends \Omeka\Entity\User implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class User extends \Omeka\Entity\User implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityUserSetting.php b/application/data/doctrine-proxies/__CG__OmekaEntityUserSetting.php
index 497dd4e7e7..7dfe1efc9f 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityUserSetting.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityUserSetting.php
@@ -12,14 +12,14 @@ class UserSetting extends \Omeka\Entity\UserSetting implements \Doctrine\ORM\Pro
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class UserSetting extends \Omeka\Entity\UserSetting implements \Doctrine\ORM\Pro
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityValue.php b/application/data/doctrine-proxies/__CG__OmekaEntityValue.php
index 937f2618eb..3793c6a425 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityValue.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityValue.php
@@ -12,14 +12,14 @@ class Value extends \Omeka\Entity\Value implements \Doctrine\ORM\Proxy\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Value extends \Omeka\Entity\Value implements \Doctrine\ORM\Proxy\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/doctrine-proxies/__CG__OmekaEntityVocabulary.php b/application/data/doctrine-proxies/__CG__OmekaEntityVocabulary.php
index 2a9b16d816..bf4415e8ea 100644
--- a/application/data/doctrine-proxies/__CG__OmekaEntityVocabulary.php
+++ b/application/data/doctrine-proxies/__CG__OmekaEntityVocabulary.php
@@ -12,14 +12,14 @@ class Vocabulary extends \Omeka\Entity\Vocabulary implements \Doctrine\ORM\Proxy
      *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
      *      initialization process and an array of ordered parameters that were passed to that method.
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
+     * @see \Doctrine\Common\Proxy\Proxy::__setInitializer
      */
     public $__initializer__;
 
     /**
      * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
+     * @see \Doctrine\Common\Proxy\Proxy::__setCloner
      */
     public $__cloner__;
 
@@ -31,20 +31,22 @@ class Vocabulary extends \Omeka\Entity\Vocabulary implements \Doctrine\ORM\Proxy
     public $__isInitialized__ = false;
 
     /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
+     * @var array<string, null> properties to be lazy loaded, indexed by property name
+     */
+    public static $lazyPropertiesNames = array (
+);
+
+    /**
+     * @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
      *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
+     * @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = [];
+    public static $lazyPropertiesDefaults = array (
+);
 
 
 
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
+    public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
     {
 
         $this->__initializer__ = $initializer;
@@ -82,7 +84,7 @@ public function __wakeup()
 
                 $existingProperties = get_object_vars($proxy);
 
-                foreach ($proxy->__getLazyProperties() as $property => $defaultValue) {
+                foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
                     if ( ! array_key_exists($property, $existingProperties)) {
                         $proxy->$property = $defaultValue;
                     }
@@ -165,6 +167,7 @@ public function __getCloner()
     /**
      * {@inheritDoc}
      * @internal generated method: use only when explicitly handling proxy specific loading logic
+     * @deprecated no longer in use - generated code now relies on internal components rather than generated public API
      * @static
      */
     public function __getLazyProperties()
diff --git a/application/data/install/schema.sql b/application/data/install/schema.sql
index b9f5717b8c..7b29792b04 100644
--- a/application/data/install/schema.sql
+++ b/application/data/install/schema.sql
@@ -55,6 +55,15 @@ CREATE TABLE `item_set` (
   PRIMARY KEY (`id`),
   CONSTRAINT `FK_1015EEEBF396750` FOREIGN KEY (`id`) REFERENCES `resource` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+CREATE TABLE `item_site` (
+  `item_id` int(11) NOT NULL,
+  `site_id` int(11) NOT NULL,
+  PRIMARY KEY (`item_id`,`site_id`),
+  KEY `IDX_A1734D1F126F525E` (`item_id`),
+  KEY `IDX_A1734D1FF6BD1646` (`site_id`),
+  CONSTRAINT `FK_A1734D1F126F525E` FOREIGN KEY (`item_id`) REFERENCES `item` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `FK_A1734D1FF6BD1646` FOREIGN KEY (`site_id`) REFERENCES `site` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 CREATE TABLE `job` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `owner_id` int(11) DEFAULT NULL,
@@ -219,6 +228,7 @@ CREATE TABLE `site` (
   `created` datetime NOT NULL,
   `modified` datetime DEFAULT NULL,
   `is_public` tinyint(1) NOT NULL,
+  `assign_new_items` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `UNIQ_694309E4989D9B62` (`slug`),
   UNIQUE KEY `UNIQ_694309E4571EDDA` (`homepage_id`),
diff --git a/application/data/migrations/20171128053327_EnableNotifications.php b/application/data/migrations/20171128053327_EnableNotifications.php
index e6ee866b90..07ac59e930 100644
--- a/application/data/migrations/20171128053327_EnableNotifications.php
+++ b/application/data/migrations/20171128053327_EnableNotifications.php
@@ -4,7 +4,7 @@
 use Doctrine\DBAL\Connection;
 use Omeka\Db\Migration\ConstructedMigrationInterface;
 use Omeka\Settings\Settings;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class EnableNotifications implements ConstructedMigrationInterface
 {
diff --git a/application/data/migrations/20190729023728_IndexFulltextSearch.php b/application/data/migrations/20190729023728_IndexFulltextSearch.php
index 7d5064e28a..9ff24db64c 100644
--- a/application/data/migrations/20190729023728_IndexFulltextSearch.php
+++ b/application/data/migrations/20190729023728_IndexFulltextSearch.php
@@ -4,7 +4,7 @@
 use Doctrine\DBAL\Connection;
 use Omeka\Db\Migration\ConstructedMigrationInterface;
 use Omeka\Job\Dispatcher;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class IndexFulltextSearch implements ConstructedMigrationInterface
 {
diff --git a/application/data/migrations/20200224022356_SiteItems.php b/application/data/migrations/20200224022356_SiteItems.php
new file mode 100644
index 0000000000..452712c4ba
--- /dev/null
+++ b/application/data/migrations/20200224022356_SiteItems.php
@@ -0,0 +1,42 @@
+<?php
+namespace Omeka\Db\Migrations;
+
+use Doctrine\DBAL\Connection;
+use Omeka\Db\Migration\ConstructedMigrationInterface;
+use Omeka\Job\Dispatcher;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class SiteItems implements ConstructedMigrationInterface
+{
+    /**
+     * @var Dispatcher
+     */
+    private $dispatcher;
+
+    public static function create(ServiceLocatorInterface $services)
+    {
+        return new self($services->get('Omeka\Job\Dispatcher'));
+    }
+
+    public function __construct(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    public function up(Connection $conn)
+    {
+        $conn->exec('CREATE TABLE item_site (item_id INT NOT NULL, site_id INT NOT NULL, INDEX IDX_A1734D1F126F525E (item_id), INDEX IDX_A1734D1FF6BD1646 (site_id), PRIMARY KEY(item_id, site_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB;');
+        $conn->exec('ALTER TABLE item_site ADD CONSTRAINT FK_A1734D1F126F525E FOREIGN KEY (item_id) REFERENCES item (id) ON DELETE CASCADE;');
+        $conn->exec('ALTER TABLE item_site ADD CONSTRAINT FK_A1734D1FF6BD1646 FOREIGN KEY (site_id) REFERENCES site (id) ON DELETE CASCADE;');
+
+        $sites = [];
+        $stmt = $conn->query('SELECT id, item_pool FROM site');
+        while ($row = $stmt->fetch()) {
+            $sites[$row['id']] = json_decode($row['item_pool'], true);
+        }
+        $this->dispatcher->dispatch('Omeka\Job\UpdateSiteItems', [
+            'sites' => $sites,
+            'action' => 'add',
+        ]);
+    }
+}
diff --git a/application/data/migrations/20200226064602_AddHasAllItems.php b/application/data/migrations/20200226064602_AddHasAllItems.php
new file mode 100644
index 0000000000..516cd226db
--- /dev/null
+++ b/application/data/migrations/20200226064602_AddHasAllItems.php
@@ -0,0 +1,13 @@
+<?php
+namespace Omeka\Db\Migrations;
+
+use Doctrine\DBAL\Connection;
+use Omeka\Db\Migration\MigrationInterface;
+
+class AddHasAllItems implements MigrationInterface
+{
+    public function up(Connection $conn)
+    {
+        $conn->exec("ALTER TABLE site ADD has_all_items TINYINT(1) DEFAULT '0' NOT NULL;");
+    }
+}
diff --git a/application/data/migrations/20200325091157_AddAssignOnCreate.php b/application/data/migrations/20200325091157_AddAssignOnCreate.php
new file mode 100644
index 0000000000..c50a48d7c7
--- /dev/null
+++ b/application/data/migrations/20200325091157_AddAssignOnCreate.php
@@ -0,0 +1,13 @@
+<?php
+namespace Omeka\Db\Migrations;
+
+use Doctrine\DBAL\Connection;
+use Omeka\Db\Migration\MigrationInterface;
+
+class AddAssignOnCreate implements MigrationInterface
+{
+    public function up(Connection $conn)
+    {
+        $conn->exec("ALTER TABLE site CHANGE has_all_items assign_on_create TINYINT(1) DEFAULT '0' NOT NULL");
+    }
+}
diff --git a/application/data/migrations/20200326091310_AddAssignNewItems.php b/application/data/migrations/20200326091310_AddAssignNewItems.php
new file mode 100644
index 0000000000..2e9499f778
--- /dev/null
+++ b/application/data/migrations/20200326091310_AddAssignNewItems.php
@@ -0,0 +1,13 @@
+<?php
+namespace Omeka\Db\Migrations;
+
+use Doctrine\DBAL\Connection;
+use Omeka\Db\Migration\MigrationInterface;
+
+class AddAssignNewItems implements MigrationInterface
+{
+    public function up(Connection $conn)
+    {
+        $conn->exec("ALTER TABLE site CHANGE assign_on_create assign_new_items TINYINT(1) DEFAULT '0' NOT NULL");
+    }
+}
diff --git a/application/data/scripts/extract-vocab-strings.php b/application/data/scripts/extract-vocab-strings.php
index 08cd94821d..833c6c3006 100644
--- a/application/data/scripts/extract-vocab-strings.php
+++ b/application/data/scripts/extract-vocab-strings.php
@@ -6,7 +6,7 @@
 
 require dirname(dirname(dirname(__DIR__))) . '/bootstrap.php';
 $config = require OMEKA_PATH . '/application/config/application.config.php';
-$application = Zend\Mvc\Application::init($config);
+$application = Laminas\Mvc\Application::init($config);
 $services = $application->getServiceManager();
 
 $rdfImporter = $services->get('Omeka\RdfImporter');
diff --git a/application/data/scripts/update-db-data-module.php b/application/data/scripts/update-db-data-module.php
index dc68c5d530..ac27f3b665 100644
--- a/application/data/scripts/update-db-data-module.php
+++ b/application/data/scripts/update-db-data-module.php
@@ -31,7 +31,7 @@
 // Initialize the Omeka application using the test database.
 $config = require OMEKA_PATH . '/application/config/application.config.php';
 $config['modules'][] = $moduleName;
-$application = Zend\Mvc\Application::init($config);
+$application = Laminas\Mvc\Application::init($config);
 
 $entityManager = $application->getServiceManager()->get('Omeka\EntityManager');
 
diff --git a/application/language/ca_ES.mo b/application/language/ca_ES.mo
index e7f2de9c4a..2bea8b87ec 100644
Binary files a/application/language/ca_ES.mo and b/application/language/ca_ES.mo differ
diff --git a/application/language/ca_ES.po b/application/language/ca_ES.po
index abd7af8253..a2861cf94d 100644
--- a/application/language/ca_ES.po
+++ b/application/language/ca_ES.po
@@ -4,17 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# John Flatness <john@zerocrates.org>, 2018
 # Rubén Alcaraz Martínez <rubenalcarazmartinez@gmail.com>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Rubén Alcaraz Martínez <rubenalcarazmartinez@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/omeka/teams/14184/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,18 +64,18 @@ msgstr "L'adaptador %1$s no implementa l'operació de supressió en lot."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "El camp \"%s\" no està disponible en la classe d'entitat %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "El camp \"%1$s\" no està disponible en la classe d'entitat %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Permís denegat per a l'usuari actual per %s al recurs %s."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Permís denegat per a l'usuari actual per %1$s al recurs %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -86,7 +86,7 @@ msgstr "Benvingut"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Benvingut al nou lloc. Aquesta és una pàgina d'exemple."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Consulta"
 
@@ -95,7 +95,7 @@ msgstr "Consulta"
 msgid "The API does not support the \"%s\" resource."
 msgstr "L'API no suporta el recurs \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +110,11 @@ msgstr "Per defecte"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Voleu afegir un altre ítem?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Voleu afegir un altre conjunt d'ítems?"
 
@@ -198,8 +198,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "El mòdul \"%s\" s'ha marcat com a \"%s\" i no es pot activar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "El mòdul \"%1$s\" s'ha marcat com a \"%2$s\" i no es pot activar"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -208,8 +208,8 @@ msgstr "El mòdul \"%s\" no s'ha trobat a la base de dades durant l'activació"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "El mòdul \"%s\" s'ha marcat com a \"%s\" i no es pot desactivar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "El mòdul \"%1$s\" s'ha marcat com a \"%2$s\" i no es pot desactivar"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -218,13 +218,13 @@ msgstr "El mòdul \"%s\" no s'ha trobat a la base de dades durant la desactivaci
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "El mòdul \"%s\" s'ha marcat com a \"%s\" i no es pot instal·lar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "El mòdul \"%1$s\" s'ha marcat com a \"%2$s\" i no es pot instal·lar"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "El mòdul \"%s\" s'ha marcat com a \"%s\" i no es pot desinstal·lar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "El mòdul \"%1$s\" s'ha marcat com a \"%2$s\" i no es pot desinstal·lar"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -234,8 +234,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "El mòdul \"%s\" s'ha marcat com a \"%s\" i no es pot actualitzar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "El mòdul \"%1$s\" s'ha marcat com a \"%2$s\" i no es pot actualitzar"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -244,8 +244,8 @@ msgstr "El mòdul \"%s\" no s'ha trobat a la base de dades durant l'actualitzaci
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Permís denegat per al usuari actual per %s al mòdul %s."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permís denegat per al usuari actual per %1$s al mòdul %2$s."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -360,7 +360,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -453,8 +453,9 @@ msgid "AND"
 msgstr "I"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -519,7 +520,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rol"
 
@@ -552,8 +553,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "La mida màxima de les pujades és %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -573,7 +574,7 @@ msgstr "La mida màxima de les pujades és %s MB."
 msgid "Edit"
 msgstr "Edita"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -601,7 +602,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -613,6 +614,10 @@ msgstr "Suprimeix el valor"
 msgid "Add new item set"
 msgstr "Afegeix un conjunt d'ítems"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -722,7 +727,7 @@ msgid "Block to be removed"
 msgstr "Bloc que voleu suprimir"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -730,6 +735,7 @@ msgstr "Restaura el valor"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -740,17 +746,17 @@ msgstr "Restaura el valor"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Conjunts d'ítems"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "El valor que se suprimirà"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -898,10 +904,6 @@ msgstr "Polseu sobre un conjunt d'ítems per afegir-lo al tauler d'edició."
 msgid "Filter item sets"
 msgstr "Filtra els conjunts d'ítems"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Tots els conjunts d'ítems"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -939,7 +941,7 @@ msgstr "Tot"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -991,8 +993,8 @@ msgstr "Següent"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s de %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1055,12 +1057,12 @@ msgstr "Feu clic sobre una propietat per afegir-la al panel d'edició."
 msgid "Filter properties"
 msgstr "Propietats del filtre"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Afegeix una propietat"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1153,17 +1155,17 @@ msgstr "Surt"
 msgid "Log in"
 msgstr "Inicia sessió"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtra els usuaris"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1173,7 +1175,7 @@ msgstr "Hi ha una nova versió de l'Omeka S disponible. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Descarrega la nova versió."
 
@@ -1195,7 +1197,7 @@ msgid "Details:"
 msgstr "Detalls:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Recursos"
 
@@ -1406,7 +1408,7 @@ msgstr "Edició en lot dels conjunts d'ítems"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1452,7 +1454,7 @@ msgstr "Identificador"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Propietari"
 
@@ -1616,10 +1618,11 @@ msgstr "Esteu segur que voleu suprimir els conjunts d'ítems seleccionats?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: aquesta acció suprimirà permanentment %s conjunts d'ítems i no et podrà "
-"desfer."
+"%1$s: aquesta acció suprimirà permanentment %2$s conjunts d'ítems i no et "
+"podrà desfer."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1784,9 +1787,10 @@ msgstr "Esteu segur que voleu suprimir els ítems seleccionats?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: aquesta acció suprimirà permanentment %s ítems i no es podrà desfer."
+"%1$s: aquesta acció suprimirà permanentment %2$s ítems i no es podrà desfer."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1953,7 +1957,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2267,7 +2271,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Afegeix un nou usuari"
 
@@ -2286,7 +2290,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2298,7 +2303,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2387,7 +2392,7 @@ msgstr "URI de l'espai de noms:"
 msgid "This vocabulary has no classes."
 msgstr "Aquest vocabulari no té classes."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2414,7 +2419,7 @@ msgstr "Accepta els canvis"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2425,8 +2430,8 @@ msgstr "Llocs"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Aneu a %s per començar a treballar amb %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Aneu a %1$s per començar a treballar amb %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2508,7 +2513,7 @@ msgid "Theme"
 msgstr "Plantilla"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Fons d'ítems"
 
@@ -2555,16 +2560,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr "No hi ha pàgines disponibles."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Restaura el conjunt d'ítems"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Hi ha %s ítems en el fons d'aquest lloc."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "No s'ha assignat cap conjunt d'ítems a aquest lloc."
 
@@ -2603,30 +2604,30 @@ msgstr "El tema seleccionat no té opcions de configuració"
 msgid "Current theme"
 msgstr "Plantilla en ús"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Edita els paràmetres de la plantilla"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Hi ha una nova versió d'aquesta plantilla disponible. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Error: aquesta plantilla no és vàlida."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2642,17 +2643,12 @@ msgstr "Restaura"
 msgid "User permissions"
 msgstr "Permisos d'usuari"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Usuari que voleu suprimir"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "El lloc no té usuaris. Afegiu usuaris amb les opcions d'aquesta pàgina."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Feu clic sobre un usuari per afegir-lo al lloc."
 
@@ -2728,35 +2724,39 @@ msgstr "Cerca avançada d'ítems"
 msgid "Item"
 msgstr "Ítem"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Teniu canvis sense desar."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Restaura el conjunt d'ítems"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Tanca la col·lecció d'icones"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Obre la col·lecció d'icones"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Error en carregar la plantilla de recurs mitjançant l'API"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Restaura la propietat"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Introduïu una etiqueta d'idioma vàlida"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Descripció"
 
@@ -2815,25 +2815,25 @@ msgstr "sense títol"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Error en la descàrrega %s:%s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Error en la descàrrega %1$s: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Error en la descàrrega %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Error en la descàrrega %1$s: %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2872,31 +2872,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Fitxer de la plantilla del recurs"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "URI de l'espai de noms de"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Fitxer de vocabulari"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "El títol del vocabulari."
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Una descripció del vocabulari llegible per humans."
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2936,7 +3029,7 @@ msgid "Suggested class"
 msgstr "Classe suggerida"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "General"
 
@@ -2986,12 +3079,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3001,7 +3094,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Idioma"
 
@@ -3018,7 +3111,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Resultats per pàgina"
 
@@ -3144,12 +3237,12 @@ msgid "Confirm email"
 msgstr "Confirma el correu electrònic"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Títol de la instal·lació"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Zona horària"
 
@@ -3220,7 +3313,7 @@ msgid "Confirm"
 msgstr "Confirma"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "Codi de localització/idioma global per a totes les interfícies."
 
@@ -3244,55 +3337,55 @@ msgstr "Confirma la contrasenya nova"
 msgid "New key label"
 msgstr "Nova etiqueta de la clau"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Correu electrònic de l'administrador"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "El nombre màxim de resultats per pàgina en les pàgines de navegació."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Informació de l'etiqueta de la propietat"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 "Informació addicional que acompanya les etiquetes en les pàgines de "
 "recursos."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Cap"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Mostra el vocabulari"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Mostra el terme"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Lloc per defecte"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Cap per defecte (mostra un sumari dels llocs)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Activa les notificacions de versió"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
@@ -3300,66 +3393,66 @@ msgstr ""
 "Activa les notificacions de noves versions disponibles de l'Omeka S, mòduls "
 "o plantilles."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Seguretat"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Utilitza l'HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Neteja l'HTML dels usuaris."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Desactiva la validació de fitxers"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 "Marqueu aquesta opció per desactivar la validació de formats i d'extensions."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Tipus de contingut permesos"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Una llista separada per comes dels tipus de formats permesos per a la "
 "càrrega de fitxers."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Extensions de fitxer permeses"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Una llista separada per comes de les extensions permeses per a la càrrega de"
 " fitxers."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "Clau reCAPTCHA del lloc"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "Clau secreta del reCAPTCHA"
 
@@ -3385,7 +3478,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3412,56 +3505,6 @@ msgstr "codi hexadecimal de tres o sis dígits, o \"transparent\""
 msgid "Invalid color format"
 msgstr "Format de color no vàlid"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Fitxer de vocabulari"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Heu de verificar que sou una persona amb el CAPTCHA."
@@ -3527,15 +3570,15 @@ msgstr "Permisos d'usuari actualitzats correctament"
 msgid "Site theme successfully updated"
 msgstr "Plantilla del lloc actualitzada correctament"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Paràmetres de la plantilla actualitzada correctament"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Lloc suprimit correctament"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "lloc"
 
@@ -3611,8 +3654,8 @@ msgstr "La plantilla de recurs s'ha creat correctament. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3647,12 +3690,12 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 "La clau d'API s'ha creat correctament. <br><br> Aquestes són la vostre ID i "
 "credencial per accedir a l'API. ATENCIÓ: La \"key_credential\" serà "
 "irrecuperable desprès que abandoneu aquesta pàgina. <br><br> key_identity: "
-"<code>%s</code> key_credential: <code>%s</code>"
+"<code>%1$s</code> <br>key_credential: <code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3694,49 +3737,49 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "L'ítem s'ha creat correctament. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "El conjunt d'ítems s'ha actualitzat correctament"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Conjunt d'ítems"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "El conjunt d'ítems s'ha suprimit correctament"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Heu de seleccionar com a mínim un conjunt d'ítems per suprimir en lot."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Els conjunts d'ítems s'han actualitzat correctament"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "S'estan suprimint els conjunts d'ítems. Pot trigar una estona."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "Heu de seleccionar com a mínim un conjunt d'ítems per editar en lot."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Els conjunts d'ítems s'han editat correctament"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "S'estan editant els conjunts d'ítems. Pot trigar una estona."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "vocabulari"
 
@@ -3745,51 +3788,51 @@ msgstr "vocabulari"
 msgid "Vocabulary successfully imported. %s"
 msgstr "El vocabulari s'ha importat correctament. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Reviseu els canvis abans d'acceptar-los."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "El vocabulari s'ha importat correctament"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "El vocabulari s'ha suprimit correctament"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "El multimèdia s'ha actualitzat correctament"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "El multimèdia s'ha suprimit correctament"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3813,24 +3856,24 @@ msgstr "Els ítems s'han suprimit correctament"
 msgid "Deleting items. This may take a while."
 msgstr "S'estan suprimint els ítems. Pot trigar una estona."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "L'ítem s'ha creat correctament. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "L'ítem s'ha actualitzat correctament"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Heu de seleccionar com a mínim un ítem per editar-lo en lot."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Els ítems s'han editat correctament"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "S'estan editant els ítems. Pot trigar una estona."
 
@@ -3956,14 +3999,14 @@ msgstr "Puja el fitxer"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3974,15 +4017,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4037,55 +4080,63 @@ msgstr "Galeria d'ítems"
 msgid "Item with metadata"
 msgstr "Ítem amb metadades"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Alineació de la miniatura"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Desconegut [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4195,7 +4246,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4214,39 +4265,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6242,10 +6293,6 @@ msgstr "Person"
 msgid "A person."
 msgstr "Una persona."
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Un document."
@@ -6266,6 +6313,10 @@ msgstr "Group"
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Project"
diff --git a/application/language/cs.mo b/application/language/cs.mo
index 6f0a9a75f5..4ac68ded77 100644
Binary files a/application/language/cs.mo and b/application/language/cs.mo differ
diff --git a/application/language/cs.po b/application/language/cs.po
index e5c10d57db..143896eaf8 100644
--- a/application/language/cs.po
+++ b/application/language/cs.po
@@ -6,15 +6,16 @@
 # Translators:
 # Martin Slavík <martin.d.slavik@gmail.com>, 2018
 # Jiří Vírava <appukonrad@gmail.com>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Jiří Vírava <appukonrad@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Czech (https://www.transifex.com/omeka/teams/14184/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,18 +65,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -86,7 +87,7 @@ msgstr "Vítejte"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Vítejte na vašem novém webu. Toto je stránka s příklady."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Procházet"
 
@@ -95,7 +96,7 @@ msgstr "Procházet"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API rozhraní nepodporuje zdroj  \"%s\" ."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +111,11 @@ msgstr "Výchozí"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Přidat další položku?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Přidat další sadu položek?"
 
@@ -197,7 +198,7 @@ msgstr "OpenSeadragon není k dispozici, pokud není povolen JavaScript."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -207,7 +208,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -217,12 +218,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -232,7 +233,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -242,7 +243,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -350,7 +351,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -443,8 +444,9 @@ msgid "AND"
 msgstr "A"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -509,7 +511,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Role"
 
@@ -542,8 +544,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -563,7 +565,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Upravit"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -590,7 +592,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -602,6 +604,10 @@ msgstr "Odstranit hodnotu"
 msgid "Add new item set"
 msgstr ""
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -711,7 +717,7 @@ msgid "Block to be removed"
 msgstr "Blok k odstranění"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -719,6 +725,7 @@ msgstr "Obnovit hodnotu"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -729,17 +736,17 @@ msgstr "Obnovit hodnotu"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Sady položek"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Hodnota k odstranění"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -887,10 +894,6 @@ msgstr ""
 msgid "Filter item sets"
 msgstr ""
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr ""
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -928,7 +931,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -980,8 +983,8 @@ msgstr "Následující"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s z %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s z %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1044,12 +1047,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Přidat vlastnost"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1142,17 +1145,17 @@ msgstr "Odhlásit"
 msgid "Log in"
 msgstr "Přihlášení"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1162,7 +1165,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1184,7 +1187,7 @@ msgid "Details:"
 msgstr "Detaily:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Zdroje"
 
@@ -1395,7 +1398,7 @@ msgstr ""
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1441,7 +1444,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Vlastník"
 
@@ -1605,7 +1608,8 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1769,7 +1773,8 @@ msgstr "Opravdu chcete smazat vybrané položky?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1933,7 +1938,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2246,7 +2251,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
@@ -2265,7 +2270,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2277,7 +2283,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2366,7 +2372,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2393,7 +2399,7 @@ msgstr "Přijmout změny"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2404,7 +2410,7 @@ msgstr ""
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2483,7 +2489,7 @@ msgid "Theme"
 msgstr ""
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2530,16 +2536,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2578,30 +2580,30 @@ msgstr ""
 msgid "Current theme"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2615,16 +2617,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2700,35 +2697,39 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2787,24 +2788,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2843,30 +2844,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2907,7 +3001,7 @@ msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2957,12 +3051,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2972,7 +3066,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -2987,7 +3081,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3113,12 +3207,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3189,7 +3283,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3213,113 +3307,113 @@ msgstr "Potvrdit nové heslo"
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3345,7 +3439,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3372,56 +3466,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3487,15 +3531,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3571,8 +3615,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3607,7 +3651,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3650,48 +3694,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "slovník"
 
@@ -3700,51 +3744,51 @@ msgstr "slovník"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Slovník úspěšně importován. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Před přijetím těchto změn si je přečtěte."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Slovník úspěšně aktualizován"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Změny ve slovníku úspěšně provedeny"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Slovník úspěšně smazán"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3768,24 +3812,24 @@ msgstr "Položky úspěšně smazány"
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Položka úspěšně aktualizována"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Položky úspěšně upraveny"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3911,14 +3955,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3929,15 +3973,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -3992,8 +4036,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4001,46 +4049,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4148,7 +4200,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4167,39 +4219,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6123,10 +6175,6 @@ msgstr "Osoba"
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6147,6 +6195,10 @@ msgstr "Skupina"
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Projekt"
diff --git a/application/language/de_DE.mo b/application/language/de_DE.mo
index 29e093be1d..2a558ce71f 100644
Binary files a/application/language/de_DE.mo and b/application/language/de_DE.mo differ
diff --git a/application/language/de_DE.po b/application/language/de_DE.po
index 6f6c81989c..5f76d46cad 100644
--- a/application/language/de_DE.po
+++ b/application/language/de_DE.po
@@ -6,15 +6,17 @@
 # Translators:
 # Michael Müller <m.mueller@culture-to-go.de>, 2018
 # Joachim Räth <info@ihregeschichte.info>, 2019
+# John Flatness <john@zerocrates.org>, 2020
+# m_art_in <220180@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Joachim Räth <info@ihregeschichte.info>, 2019\n"
+"Last-Translator: m_art_in <220180@gmail.com>, 2020\n"
 "Language-Team: German (Germany) (https://www.transifex.com/omeka/teams/14184/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,18 +66,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -86,16 +88,16 @@ msgstr "Willkommen"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Willkommen auf ihrer neuen Website. Dies ist eine Beispielseite."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Objekte durchstöbern"
 
 #: application/src/Api/Manager.php:201
 #, php-format
 msgid "The API does not support the \"%s\" resource."
-msgstr ""
+msgstr "Die API unterstützt nicht die %s Resource"
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +112,11 @@ msgstr "Standard"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Ein weiteres Objekt hinzufügen?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Weitere Sammlung hinzufügen?"
 
@@ -155,7 +157,7 @@ msgstr "Ungültiges Modul"
 
 #: application/src/Controller/Admin/ModuleController.php:82
 msgid "Invalid INI"
-msgstr ""
+msgstr "Ungültige INI"
 
 #: application/src/Controller/Admin/ModuleController.php:83
 msgid "Invalid Omeka S version"
@@ -197,7 +199,7 @@ msgstr "OpenSeadragon ist nur verfügbar, wenn JavaScript aktiviert ist."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -207,7 +209,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -217,12 +219,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -234,7 +236,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -245,7 +247,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -371,8 +373,9 @@ msgstr "Das Passwort muss mindestens %s Zahlen enthalten."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
-msgstr "Das Passwort muss zumindest %s Symbole enthalten: <code>%s</code> "
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr ""
+"Das Passwort muss zumindest %1$s Symbole enthalten: <code>%2$s</code> "
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -397,27 +400,27 @@ msgstr "enthält nicht"
 #: application/src/View/Helper/SearchFilters.php:36
 #: application/view/common/advanced-search/properties.phtml:69
 msgid "is resource with ID"
-msgstr ""
+msgstr "ist Ressource mit der ID"
 
 #: application/src/View/Helper/SearchFilters.php:37
 #: application/view/common/advanced-search/properties.phtml:70
 msgid "is not resource with ID"
-msgstr ""
+msgstr "ist nicht Ressource mit der ID"
 
 #: application/src/View/Helper/SearchFilters.php:38
 #: application/view/common/advanced-search/properties.phtml:71
 msgid "has any value"
-msgstr ""
+msgstr "enthält einen Wert"
 
 #: application/src/View/Helper/SearchFilters.php:39
 #: application/view/common/advanced-search/properties.phtml:72
 msgid "has no values"
-msgstr ""
+msgstr "enthält keinen Wert"
 
 #: application/src/View/Helper/SearchFilters.php:47
 #: application/view/common/advanced-search/fulltext.phtml:6
 msgid "Search full-text"
-msgstr ""
+msgstr "Volltextsuche"
 
 #: application/src/View/Helper/SearchFilters.php:60
 #: application/view/common/linked-resources.phtml:33
@@ -464,8 +467,9 @@ msgid "AND"
 msgstr "UND"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -530,7 +534,7 @@ msgstr "Name"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rolle"
 
@@ -563,8 +567,8 @@ msgstr "Besitzt Berechtigung für den Standort"
 msgid "The maximum upload size is %s MB."
 msgstr "Die maximale Dateigröße zum Hochladen beträgt %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -584,7 +588,7 @@ msgstr "Die maximale Dateigröße zum Hochladen beträgt %s MB."
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -611,7 +615,7 @@ msgstr "Sucht nach Objekten aus diesen Sammlungen."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -623,6 +627,10 @@ msgstr "Wert entfernen"
 msgid "Add new item set"
 msgstr "Neue Sammlung hinzufügen"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Suchtext"
@@ -669,7 +677,7 @@ msgstr "Neue Vorlage hinzufügen"
 
 #: application/view/common/advanced-search/site-pool.phtml:12
 msgid "In site pool"
-msgstr "In den Objektpool des Standortes"
+msgstr "Im Objektpool des Standortes"
 
 #: application/view/common/advanced-search/users.phtml:17
 msgid "Search by email"
@@ -732,7 +740,7 @@ msgid "Block to be removed"
 msgstr "Block wird entfernt"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -740,6 +748,7 @@ msgstr "Wert wiederherstellen"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -750,17 +759,17 @@ msgstr "Wert wiederherstellen"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Sammlungen"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Wert wird entfernt"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -909,10 +918,6 @@ msgstr ""
 msgid "Filter item sets"
 msgstr "Sammlungen filtern"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Alle Sammlungen"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -950,7 +955,7 @@ msgstr "Alle"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1002,8 +1007,8 @@ msgstr "Nächstes"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s von %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s von %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1067,12 +1072,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr "Eigenschaften filtern"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Eigenschaft hinzufügen"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1168,18 +1173,18 @@ msgstr "Abmelden"
 msgid "Log in"
 msgstr "Anmelden"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Markieren Sie einen Nutzer, um ihn dem Bearbeitungsfeld hinzuzufügen."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Nutzer filtern"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Alle Nutzer (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1188,7 +1193,7 @@ msgstr "Eine neue Version von Omeka S ist verfügbar. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Neue Version herunterladen"
 
@@ -1210,7 +1215,7 @@ msgid "Details:"
 msgstr ""
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Ressourcen"
 
@@ -1263,7 +1268,7 @@ msgstr "Medien suchen"
 #: application/view/layout/layout-admin.phtml:87
 #: application/view/omeka/site-admin/index/index.phtml:70
 msgid "View public site"
-msgstr ""
+msgstr "Öffentlichen Standort anzeigen"
 
 #: application/view/layout/layout-admin.phtml:93
 #: application/view/omeka/admin/module/browse.phtml:11
@@ -1294,7 +1299,7 @@ msgstr "Nutzerhandbuch"
 
 #: application/view/layout/layout-admin.phtml:114
 msgid "Support forums"
-msgstr ""
+msgstr "Nutzerforen"
 
 #: application/view/layout/layout.phtml:30
 msgid "Powered by Omeka S"
@@ -1381,7 +1386,7 @@ msgstr "Ontologien (%s)"
 #: application/view/omeka/admin/index/browse.phtml:29
 #: application/view/omeka/admin/vocabulary/browse.phtml:29
 msgid "Import new vocabulary"
-msgstr "Neues Vokabular importieren"
+msgstr "Neue Ontologie importieren"
 
 #: application/view/omeka/admin/index/browse.phtml:33
 #, php-format
@@ -1423,7 +1428,7 @@ msgstr ""
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1469,7 +1474,7 @@ msgstr "Identifikator"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -1634,9 +1639,10 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: Diese Aktion wird dauerhaft %s Sammlungen löschen und kann nicht "
+"%1$s: Diese Aktion wird dauerhaft %2$s Sammlungen löschen und kann nicht "
 "rückgängig gemacht werden."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1802,10 +1808,11 @@ msgstr "Sind Sie sicher, dass Sie die ausgewählten Objekte löschen möchten?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: Diese Aktion wird dauerhaft %s Objekte löschen und kann nicht rückgängig"
-" gemacht werden."
+"%1$s: Diese Aktion wird dauerhaft %2$s Objekte löschen und kann nicht "
+"rückgängig gemacht werden."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1974,10 +1981,10 @@ msgstr "Sind Sie sicher, dass Sie die ausgewählten Medien löschen möchten?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: Diese Aktion wird dauerhaft %s Medien löschen und kann nicht rückgängig "
-"gemacht werden."
+"%1$s: Diese Aktion wird dauerhaft %2$s Medien löschen und kann nicht "
+"rückgängig gemacht werden."
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2292,7 +2299,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Sie bearbeiten %s Nutzer (außer Sie selbst)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Neuen Nutzer hinzufügen"
 
@@ -2311,10 +2318,11 @@ msgstr "Sind Sie sicher, dass Sie die ausgewählten Nutzer löschen möchten?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
-"%s: Diese Aktion wird dauerhaft %s Nutzer löschen und kann nicht rückgängig "
-"gemacht werden."
+"%1$s: Diese Aktion wird dauerhaft %2$s Nutzer löschen und kann nicht "
+"rückgängig gemacht werden."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2327,11 +2335,11 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
-"%s : Diese Aktion wird dauerhaft %s Nutzer löschen (außer Sie selbst) und "
-"kann nicht rückgängig gemacht werden."
+"%1$s : Diese Aktion wird dauerhaft %2$s Nutzer löschen (außer Sie selbst) "
+"und kann nicht rückgängig gemacht werden."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2418,7 +2426,7 @@ msgstr "Namensraum URI:"
 msgid "This vocabulary has no classes."
 msgstr "Dieses Vokabular enthält keine Klassen."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2445,7 +2453,7 @@ msgstr "Änderungen genehmigen"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2456,8 +2464,8 @@ msgstr "Standorte"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Gehen Sie zum %s, um die Arbeit mit %s zu beginnen."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Gehen Sie zum %1$s, um die Arbeit mit %2$s zu beginnen."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2537,7 +2545,7 @@ msgid "Theme"
 msgstr "Designvorlage"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Objektpool"
 
@@ -2570,7 +2578,7 @@ msgstr "Verknüpfung zu einer Standort-Seite hinzufügen"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:28
 msgid "Select a homepage"
-msgstr ""
+msgstr "Wählen Sie eine Startseite aus."
 
 #: application/view/omeka/site-admin/index/navigation.phtml:32
 msgid "Add a custom link"
@@ -2584,16 +2592,12 @@ msgstr "Seiten filtern"
 msgid "There are no available pages."
 msgstr "Keine verfügbaren Seiten"
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Sammlung wiederherstellen"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Im Objektpool dieses Standorts befinden sich aktuell %s Objekte."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Diesem Standort wurden keine Sammlungen zugewiesen."
 
@@ -2632,30 +2636,30 @@ msgstr "Die aktuelle Designvorlage enthält keine Einstellungsoptionen."
 msgid "Current theme"
 msgstr "Aktuelle Designvorlage"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Einstellungen der Designvorlage bearbeiten"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Eine neue Version dieser Designvorlage ist verfügbar. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Fehler: Diese Designvorlage ist ungültig."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2672,18 +2676,13 @@ msgstr "Wiederherstellen"
 msgid "User permissions"
 msgstr "Nutzerberechtigungen"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Dieser Standort hat keine Nutzer. Fügen Sie Nutzer über die Schaltfläche auf"
 " der rechten Seite hinzu."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Markieren Sie einen Nutzer, um ihn zum Standort hinzuzufügen."
 
@@ -2717,7 +2716,7 @@ msgstr "Kurzform"
 
 #: application/view/omeka/site-admin/page/index.phtml:39
 msgid "View public page"
-msgstr ""
+msgstr "Öffentliche Seite anzeigen"
 
 #: application/view/omeka/site-admin/page/index.phtml:50
 msgid "Delete page"
@@ -2759,35 +2758,39 @@ msgstr "Erweiterte Objektsuche"
 msgid "Item"
 msgstr "Objekt"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Sie haben ungesicherte Änderungen."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Sammlung wiederherstellen"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr ""
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Laden der Ressourcenvorlage von der API fehlgeschlagen"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Eigenschaft wiederherstellen"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2846,25 +2849,25 @@ msgstr "Kein Titel"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Fehler beim Herunterladen %s : %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Fehler beim Herunterladen %1$s : %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Fehler beim Herunterladen %s : %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Fehler beim Herunterladen %1$s : %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2902,31 +2905,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Ressourcenvorlagendatei"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "Namensraum-URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Vokabulardatei"
+
+#: application/src/Form/VocabularyForm.php:95
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Ein menschenlesbarer Titel des Vokabulars."
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "Vokabular-URL"
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Eine menschenlesbare Beschreibung des Vokabulars."
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Dateiformat"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2966,7 +3062,7 @@ msgid "Suggested class"
 msgstr "Vorgeschlagene Klasse"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Allgemein"
 
@@ -2992,12 +3088,14 @@ msgstr "Medien in Objektseiten einbetten"
 
 #: application/src/Form/SiteSettingsForm.php:63
 msgid "Show page pagination"
-msgstr ""
+msgstr "Seitenzählung anzeigen"
 
 #: application/src/Form/SiteSettingsForm.php:64
 msgid ""
 "Show pagination that helps users follow a linear narrative through a site."
-msgstr "Seitenzählung anzeigen"
+msgstr ""
+"Seitenzählung anzeigen, die dem Nutzer hilft, einer linearen Erzählung durch"
+" einen Standort zu folgen."
 
 #: application/src/Form/SiteSettingsForm.php:75
 msgid "Show user bar on public views"
@@ -3016,12 +3114,12 @@ msgid "Always"
 msgstr "Immer"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3031,22 +3129,24 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
-msgstr ""
+msgstr "Gebietsschema"
 
 #: application/src/Form/SiteSettingsForm.php:104
 msgid ""
 "Locale/language code for this site. Leave blank to use the global locale "
 "setting."
 msgstr ""
+"Gebietsschema / Sprachcode für diesen Standort. Leer lassen, um das globale "
+"Gebietsschema zu nutzen."
 
 #: application/src/Form/SiteSettingsForm.php:126
 msgid "Restrict browse to attached items"
-msgstr "Durchstöbern auf verknüpfte Objekte begrenzen"
+msgstr "Durchstöbern auf verknüpfte Objekte beschränken"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Ergebnisse pro Seite"
 
@@ -3099,13 +3199,13 @@ msgstr "Vorlagen auswählen"
 
 #: application/src/Form/SiteSettingsForm.php:209
 msgid "Restrict to templates"
-msgstr ""
+msgstr "Auf Vorlagen beschränken"
 
 #: application/src/Form/SiteSettingsForm.php:210
 msgid "Restrict search results to resources of the selected templates."
 msgstr ""
-"Begrenzen Sie Suchergebnisse auf Ressourcen, die die ausgewählten Vorlagen "
-"verwenden."
+"Beschränken Sie Suchergebnisse auf Ressourcen, die die ausgewählten Vorlagen"
+" verwenden."
 
 #: application/src/Form/UserBatchUpdateForm.php:30
 msgid "Set role"
@@ -3174,12 +3274,12 @@ msgid "Confirm email"
 msgstr "E-Mail bestätigen"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Titel der Installation"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Zeitzone"
 
@@ -3189,7 +3289,7 @@ msgstr "Die E-Mail-Adressen stimmen nicht überein"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:33
 msgid "Set visibility"
-msgstr ""
+msgstr "Setze Sichtbarkeit"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:50
 msgid "Set openness"
@@ -3250,9 +3350,9 @@ msgid "Confirm"
 msgstr "Bestätigen"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
-msgstr ""
+msgstr "Globales Gebietsschema / Sprachcode für alle Schnittstellen."
 
 #: application/src/Form/UserForm.php:148
 msgid "Default resource template"
@@ -3274,39 +3374,39 @@ msgstr "Neues Passwort bestätigen"
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Administrator E-Mail"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Ohne"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Vokabular anzeigen"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Begriff anzeigen"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Standard-Standort"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3314,77 +3414,79 @@ msgstr ""
 "Wählen Sie aus, welcher Standort erscheinen soll, wenn Nutzer zur Starseite "
 "der Installation gehen."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Kein Standard (zeige Liste der Standorte)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
-msgstr ""
+msgstr "Versionsbenachrichtigungen aktivieren"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
-"Aktiviere Benachrichtigungen, wenn neue Versionen von Omeka S, Modulen oder "
+"Aktiviert Benachrichtigungen, wenn neue Versionen von Omeka S, Modulen oder "
 "Designvorlagen verfügbar sind."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
-msgstr ""
+msgstr "Voreinstellung für die Sichtbarkeit von Inhalten auf Privat setzen"
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
+"Setzt die Voreinstellung für die Sichtbarkeit aller neu erstellter Objekte, "
+"Sammlungen und Standorte auf Privat."
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
-msgstr ""
+msgstr "Für Volltextsuche indexieren"
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Sicherheit"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Unterstützte Medientypen"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Unterstützte Dateinamenendungen"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3410,7 +3512,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3437,56 +3539,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Vokabulardatei"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "Vokabular-URL"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "Dateiformat"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3530,7 +3582,7 @@ msgstr "Seite erfolgreich erstellt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:201
 msgid "Homepage"
-msgstr ""
+msgstr "Startseite"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:207
 msgid "First page in navigation"
@@ -3552,15 +3604,15 @@ msgstr "Nutzerberechtigungen erfolgreich aktualisiert"
 msgid "Site theme successfully updated"
 msgstr "Designvorlage des Standortes erfolgreich aktualisiert"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Einstellungen der Designvorlage erfolgreich aktualisiert"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Standort erfolgreich gelöscht"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "Standort"
 
@@ -3636,8 +3688,8 @@ msgstr "Ressourcenvorlage erfolgreich erstellt. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3672,7 +3724,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3715,48 +3767,48 @@ msgstr "Nutzer erfolgreich bearbeitet"
 msgid "Editing users. This may take a while."
 msgstr "Nutzer werden bearbeitet. Dies kann einen Moment dauern."
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Sammlung erfolgreich erstellt. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Sammlung erfolgreich aktualisiert"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Sammlung"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Sammlung erfolgreich gelöscht"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Sammlungen erfolgreich gelöscht"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Sammlungen werden gelöscht.Dies kann einen Moment dauern."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Sammlungen erfolgreich bearbeitet"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Sammlungen werden bearbeitet. Dies kann einen Moment dauern."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "Vokabular"
 
@@ -3765,51 +3817,51 @@ msgstr "Vokabular"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Vokabular erfolgreich importiert %s "
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Bitte überprüfen Sie diese Änderungen, bevor Sie sie bestätigen."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Vokabular erfolgreich aktualisiert"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Vokabular erfolgreich geändert"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Vokabular erfolgreich gelöscht"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Medien erfolgreich aktualisiert"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Medien erfolgreich gelöscht"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Medien erfolgreich gelöscht"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "Medien werden gelöscht. Dies kann einen Moment dauern."
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "Medien erfolgreich bearbeitet."
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "Medien werden bearbeitet. Dies kann einen Moment dauern."
 
@@ -3833,24 +3885,24 @@ msgstr "Objekte erfolgreich gelöscht"
 msgid "Deleting items. This may take a while."
 msgstr "Objekte werden gelöscht. Dies kann einen Moment dauern."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Objekt erfolgreich erstellt. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Objekt erfolgreich aktualisiert"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Objekte erfolgreich bearbeitet"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Objekte werden bearbeitet. Dies kann einen Moment dauern."
 
@@ -3976,14 +4028,14 @@ msgstr "Datei hochladen"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3994,15 +4046,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4057,55 +4109,63 @@ msgstr "Objektbeispiel"
 msgid "Item with metadata"
 msgstr "Objekt mit Metadaten"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Ausrichtung Vorschaubild"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Unbekannt  [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Liste der Standorte"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "Alphabetisch"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "Älteste zuerst"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "Neueste zuerst"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Maximale Anzahl an Standorten"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "Ein leerer Wert bedeutet keine Begrenzung."
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "Seitenzählung"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr "Seitenzählung anzeigen (nur bei gesetzer Begrenzung)"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "Zusammenfassungen anzeigen"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Vorschau durchstöbern"
@@ -4215,8 +4275,8 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "Die \"%s\" Ressourcenvorlage erfordert einen \"%s\"-Wert"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "Die \"%1$s\" Ressourcenvorlage erfordert einen \"%2$s\"-Wert"
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4232,41 +4292,41 @@ msgstr "Ein Standort benötigt einen Objektpool."
 
 #: application/src/Api/Adapter/SiteAdapter.php:257
 msgid "A homepage must belong to its parent site."
-msgstr ""
+msgstr "Eine Startseite muss einem Standort zugeordnet werden."
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Ungültige Navigation: Seitenverknüpfungen müssen eindeutig sein"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Medien müssen einem Objekt zugeordnet werden."
 
@@ -6206,10 +6266,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6230,6 +6286,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
@@ -6481,7 +6541,7 @@ msgstr ""
 
 #. Property label for Friend of a Friend:homepage
 msgid "homepage"
-msgstr ""
+msgstr "Startseite"
 
 #. Property comment for Friend of a Friend:homepage
 msgid "A homepage for some thing."
@@ -6565,7 +6625,7 @@ msgstr ""
 
 #. Property label for Friend of a Friend:thumbnail
 msgid "thumbnail"
-msgstr ""
+msgstr "Vorschaubild"
 
 #. Property comment for Friend of a Friend:thumbnail
 msgid "A derived thumbnail image."
@@ -6581,7 +6641,7 @@ msgstr ""
 
 #. Property label for Friend of a Friend:workplaceHomepage
 msgid "workplace homepage"
-msgstr ""
+msgstr "Arbeitsplatz Startseite"
 
 #. Property comment for Friend of a Friend:workplaceHomepage
 msgid ""
@@ -6659,7 +6719,7 @@ msgstr ""
 
 #. Property label for Friend of a Friend:fundedBy
 msgid "funded by"
-msgstr ""
+msgstr "gefördert durch"
 
 #. Property comment for Friend of a Friend:fundedBy
 msgid "An organization funding a project or person."
@@ -6667,7 +6727,7 @@ msgstr ""
 
 #. Property label for Friend of a Friend:logo
 msgid "logo"
-msgstr ""
+msgstr "Logo"
 
 #. Property comment for Friend of a Friend:logo
 msgid "A logo representing some thing."
diff --git a/application/language/es.mo b/application/language/es.mo
index e6a1ef8193..d2cf86e780 100644
Binary files a/application/language/es.mo and b/application/language/es.mo differ
diff --git a/application/language/es.po b/application/language/es.po
index 8910427f6e..61048e1069 100644
--- a/application/language/es.po
+++ b/application/language/es.po
@@ -9,19 +9,20 @@
 # gustavo urbano <gusunavarro@gmail.com>, 2018
 # José Manuel Gómez <jogogo2@gmail.com>, 2018
 # Josu Aramberri <jaramberri@i2basque.es>, 2018
-# Isaac, 2018
+# Isaac Sánchez Barrera, 2018
 # Darío Hereñú, 2019
 # mikasa254 <aferro2k6@gmail.com>, 2019
 # Carlos Rivera <Robertohernande9z9@hotmail.com>, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Carlos Rivera <Robertohernande9z9@hotmail.com>, 2019\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/omeka/teams/14184/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,20 +73,20 @@ msgstr "El adaptador %1$s no implementa la operación de borrado por lotes."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "El campo \"%s\" no está disponible en la clase de entidad %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "El campo \"%1$s\" no está disponible en la clase de entidad %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
-"Permiso denegado al usuario actual para que acceda a %s del recurso %s."
+"Permiso denegado al usuario actual para que acceda a %1$s del recurso %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "No se ha encontrado la entidad %s con el criterio %s"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "No se ha encontrado la entidad %1$s con el criterio %2$s"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -95,7 +96,7 @@ msgstr "Bienvenido"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Bienvenido a tu nuevo sitio. Esta es una página de ejemplo"
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Navegar"
 
@@ -104,7 +105,7 @@ msgstr "Navegar"
 msgid "The API does not support the \"%s\" resource."
 msgstr "La API no soporta el recurso \"%s\" "
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -119,11 +120,11 @@ msgstr "Predefinido"
 msgid "Asset uploads must be POSTed."
 msgstr "Las subidas de 'asset' deben utilizar el método POST."
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "¿Añadir otro elemento?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "¿Añadir otro conjunto de elementos?"
 
@@ -206,8 +207,8 @@ msgstr "OpenSeadragon no estará disponible a menos que JavaScript esté activo"
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser activado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser activado"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -217,8 +218,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser desactivado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser desactivado"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -229,13 +230,13 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser instalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser instalado"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser desinstalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser desinstalado"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -246,8 +247,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no se puede actualizar"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no se puede actualizar"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -258,8 +259,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Permiso denegado al usuario actual para %s del módulo %s."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permiso denegado al usuario actual para %1$s del módulo %2$s."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -386,8 +387,8 @@ msgstr "La contraseña debe contener al menos %s números."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
-msgstr "La contraseña debe contener al menos  <code>%s símbolos: %s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr "La contraseña debe contener al menos %1$s símbolos: <code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -479,8 +480,9 @@ msgid "AND"
 msgstr "Y"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -545,7 +547,7 @@ msgstr "Nombre"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rol"
 
@@ -578,8 +580,8 @@ msgstr "Tiene permiso en el sitio"
 msgid "The maximum upload size is %s MB."
 msgstr "El tamaño máximo de subida son %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -599,7 +601,7 @@ msgstr "El tamaño máximo de subida son %s MB."
 msgid "Edit"
 msgstr "Editar"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -627,7 +629,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -639,6 +641,10 @@ msgstr "Borrar valor"
 msgid "Add new item set"
 msgstr "Añadir nuevo conjunto de items"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Consulta de texto"
@@ -748,7 +754,7 @@ msgid "Block to be removed"
 msgstr "Bloque a eliminar"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -756,6 +762,7 @@ msgstr "Recuperar valor"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -766,17 +773,17 @@ msgstr "Recuperar valor"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Conjuntos de items"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Valor a eliminar"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -924,10 +931,6 @@ msgstr "Pincha en un conjunto de items para añadirlo al panel de edición."
 msgid "Filter item sets"
 msgstr "Filtrar conjuntos de items"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Todos los conjuntos de items"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -965,7 +968,7 @@ msgstr "Todos"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1017,8 +1020,8 @@ msgstr "Siguiente"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s-%s de %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1081,12 +1084,12 @@ msgstr "Pincha sobre una propiedad para añadirla al panel de edición"
 msgid "Filter properties"
 msgstr "Filtrar propiedades"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Añadir propiedad"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1182,18 +1185,18 @@ msgstr "Cerrar sesión"
 msgid "Log in"
 msgstr "Conectarse"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Haga clic en un usuario para agregarlo al panel de edición"
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtrar usuarios"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Todos los usuarios (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1202,7 +1205,7 @@ msgstr "Está disponible una nueva versión de Omeka S. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Obtener la nueva versión"
 
@@ -1224,7 +1227,7 @@ msgid "Details:"
 msgstr "Detalles:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Recursos"
 
@@ -1437,7 +1440,7 @@ msgstr "Editar por lotes los conjuntos de items"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1483,7 +1486,7 @@ msgstr "Identificador"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Propietario"
 
@@ -1647,10 +1650,11 @@ msgstr "¿Estás seguro de borrar los conjuntos de items seleccionados?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: esta acción borrará permanentemente %s conjuntos de items y no se podrá "
-"deshacer."
+"%1$s: esta acción borrará permanentemente %2$s conjuntos de items y no se "
+"podrá deshacer."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1815,9 +1819,10 @@ msgstr "¿Estás seguro de borrar los items seleccionados?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: esta acción borrará permanentemente %s items y no podrá deshacerse."
+"%1$s: esta acción borrará permanentemente %2$s items y no podrá deshacerse."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1986,9 +1991,9 @@ msgstr "¿Está seguro de que desea eliminar los medios seleccionados?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: esta acción eliminará permanentemente los medios %s y no se podrá "
+"%1$s: esta acción eliminará permanentemente los medios %2$s y no se podrá "
 "deshacer."
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2303,7 +2308,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Esta editando %s usuarios (excepto tú)"
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Añadir nuevo usuario"
 
@@ -2322,10 +2327,11 @@ msgstr "¿Est seguro de que desea eliminar los usuarios seleccionados?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
-"%s: esta acción eliminará de forma permanente a %s usuarios y no se podrá "
-"deshacerse. "
+"%1$s: esta acción eliminará de forma permanente a %2$s usuarios y no se "
+"podrá deshacerse."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2338,11 +2344,11 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
-"%s: esta acción eliminará de forma permanente %s usuarios (excepto usted) y "
-"no podrá deshacerse."
+"%1$s: esta acción eliminará de forma permanente %2$s usuarios (excepto "
+"usted) y no podrá deshacerse."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2429,7 +2435,7 @@ msgstr "Espacio de nombres URI:"
 msgid "This vocabulary has no classes."
 msgstr "Este vocabulario no tiene clases."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2458,7 +2464,7 @@ msgstr "Aceptar cambios"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2469,8 +2475,8 @@ msgstr "Sitios"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Ir a %s para empezar a trabajar con %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Ir a %1$s para empezar a trabajar con %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2550,7 +2556,7 @@ msgid "Theme"
 msgstr "Tema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Grupo de items"
 
@@ -2597,16 +2603,12 @@ msgstr "Filtrar páginas"
 msgid "There are no available pages."
 msgstr "No hay páginas disponibles"
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Restaurar conjunto de items"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Existen actualmente %s items en este grupo de sitios"
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Ningún conjunto de items está asignado a este sitio"
 
@@ -2645,30 +2647,30 @@ msgstr "El tema actual no tienen opciones de configuración"
 msgid "Current theme"
 msgstr "Tema actual"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Editar ajustes del tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Una nueva versión del tema está disponible. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Error: este tema no es válido"
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2684,18 +2686,13 @@ msgstr "Restaurar"
 msgid "User permissions"
 msgstr "Permisos de usuario"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Usuario a borrar"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Este sitio no tiene usuarios. Añade usuarios utilizando la interfaz de la "
 "derecha."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Pincha sobre un usuairo para añadirlo a este sitio."
 
@@ -2771,35 +2768,39 @@ msgstr "Búsqueda avanzada de item"
 msgid "Item"
 msgstr "Item"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Algo salió mal"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Tienes cambios pendientes de guardar."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Restaurar conjunto de items"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Cerrar colección de iconos"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Abrir colección de iconos"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Fallo al cargar la plantilla de recursos desde el API"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Restablecer propiedad"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Por favor, introduce una etiqueta de lenguaje válida"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Descripción"
 
@@ -2858,27 +2859,29 @@ msgstr "sin título"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
-"Error validando \"%s\". No puedo almacenar ficheros con el tipo de medios "
-"\"%s\"."
+"Error validando \"%1$s\". No puedo almacenar ficheros con el tipo de medios "
+"\"%2$s\"."
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
-msgstr "Error validando \"%s\". No puedo almacenar ficheros con la extensión \"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
+msgstr ""
+"Error validando \"%1$s\". No puedo almacenar ficheros con la extensión "
+"\"%2$s\"."
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Error descargando %s: %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Error descargando %1$s: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Error descanrgando %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Error descargando %1$s: %2$s%3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2916,35 +2919,124 @@ msgstr "Configuración de miniatura de último recurso no válida"
 msgid "Resource template file"
 msgstr "Fichero de plantilla de recurso"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
-"Un identificador de vocabulario conciso, utilizado como abreviatura para el "
-"espacio de nombres de la URI."
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "Espacio de nombres URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Fichero de vocabulario"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "URL de vocabulario"
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Formato de archivo"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr "[Detección automática]"
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr "JSON-LD (.jsonld)"
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr "N-Triples (.nt)"
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr "Notation3 (.n3)"
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr "RDF/XML (.rdf)"
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr "Turtle (.ttl)"
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
 msgstr ""
-"El único espacio de nombres URI utilizada por el vocabulario para "
-"identificar  clases de miembros locales y propiedades."
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Un título comprensible por humanos para el vocabulario"
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Una descripción comprensible por humanos para el vocabulario"
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2986,7 +3078,7 @@ msgid "Suggested class"
 msgstr "Clase sugerida"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "General"
 
@@ -3038,12 +3130,12 @@ msgid "Always"
 msgstr "Siempre"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr "Deshabilitar la inserción de JSON-LD"
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3056,7 +3148,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Zona"
 
@@ -3073,7 +3165,7 @@ msgid "Restrict browse to attached items"
 msgstr "Restringir navegación a items adjuntados"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Resultados por página"
 
@@ -3203,12 +3295,12 @@ msgid "Confirm email"
 msgstr "Confirmar correo electrónico"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Título de instalación"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Zona horaria"
 
@@ -3279,7 +3371,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "Código de zona/idioma global para todas las interfaces."
 
@@ -3303,40 +3395,40 @@ msgstr "Confirmar nueva contraseña"
 msgid "New key label"
 msgstr "Nueva etiqueta de clave"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Correo electrónico del administrador"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "El número máximo de resultados por página en páginas de navegación"
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Propiedad etiqueta de informacion"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 "La información adicional que acompaña las etiquetas en páginas de recursos."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Ninguno"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Mostrar Vocabulario"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Mostrar Término"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Sitio por defecto"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3344,15 +3436,15 @@ msgstr ""
 "Seleccionar qué sitio debe aparecer cuando los usuarios van a la portada de "
 "la instalación."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Sin sitio por defecto (mostrar índice de sitios)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Habilitar notificaciones de versiones"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
@@ -3360,67 +3452,67 @@ msgstr ""
 "Habilitar notificaciones cuando una nueva versión de Omeka S, módulos o "
 "temas estén disponibles."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Seguridad"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Usar HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Limpiar HTML introducido por el usuario."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Deshabilitar validación de ficheros"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 "Marcar esto para deshabilitar validación de tipos de ficheros de medios y "
 "extensiones."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Tipos de mdios permitidos"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Una lista separada por comas de tipos de medios permitidos para subir "
 "ficheros."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Extensiones de fichero permitidas"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Una lista separada por comas de extensiones de fichero para subidas de "
 "ficheros."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "Clave de sitio reCAPTCHA"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "clave secreta reCAPTCHA"
 
@@ -3446,8 +3538,8 @@ msgstr "Contiene al menos %s números."
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
-msgstr "contiene al menos %s símbolos: %s"
+msgid "contain at least %1$s symbols: %2$s"
+msgstr "contiene al menos %1$s símbolos: %2$s"
 
 #: application/src/Form/Element/PasswordConfirm.php:43
 msgid "Password must:"
@@ -3473,62 +3565,6 @@ msgstr "tres o seis dígitos de color en hexadecimal, o \"trnasparent\""
 msgid "Invalid color format"
 msgstr "Formato de color no válido"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Fichero de vocabulario"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-"Elija un archivo de vocabulario RDF. Debe elegir un archivo o ingresar una "
-"URL."
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "URL de vocabulario"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-"Introduzca una URL de vocabulario RDF. Debes ingresar una URL o elegir un "
-"archivo."
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "Formato de archivo"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr "[Detección automática]"
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr "JSON-LD (.jsonld)"
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr "N-Triples (.nt)"
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr "Notation3 (.n3)"
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr "RDF/XML (.rdf)"
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr "Turtle (.ttl)"
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-"Ingrese el idioma preferido de las etiquetas y comentarios usando una "
-"etiqueta de idioma IETF. Por defecto es el primero disponible."
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Debes verificar que eres un humano completando el CAPTCHA."
@@ -3594,15 +3630,15 @@ msgstr "Permisos de usuario actualizados satisfactoriamente"
 msgid "Site theme successfully updated"
 msgstr "Tema del siito actualizado satisfactoriamente"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Configuración del tema actualizado satisfactoriamente"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Sitio borrado satisfactoriamente"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "sitio"
 
@@ -3680,8 +3716,8 @@ msgstr "Plantilla de recurso creada con éxito. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3716,12 +3752,12 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 "Clave de API creada con éxito.<br><br>Aquí está tu ID de clave y "
-"credenciales para acceder al API. AVISO: \"clave_credencial\" no será "
-"recuperable después de salir de esta página.<br><br>clave_identidad: "
-"<code>%s>/code><br>clave_credencial: <code>%s</code>"
+"credenciales para acceder al API. AVISO: \"key_credential\" no será "
+"recuperable después de salir de esta página.<br><br>key_identity: "
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3763,49 +3799,49 @@ msgstr "Usuarios editados satisfactoriamente"
 msgid "Editing users. This may take a while."
 msgstr "Editando usuarios. Esto puede tardar un poco"
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Conjunto de items creado con éxito. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Conjunto de items actualizado con éxito"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "conjunto de items"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Conjunto de items borrado con éxito"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Debes seleccionar al menos un conjunto de items para el borrado por lotes"
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Conjuntos de items borrados con éxito"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Borrando conjuntos de ietms. Esto puede tardar un rato"
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "Debes seleccionar al menos un conjunto de items para editar por lotes"
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Conjunto de itmes editado con éxito"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Editando conjunto de items. Esto puede tardar un rato"
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "vocabulario"
 
@@ -3814,51 +3850,51 @@ msgstr "vocabulario"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Vocabulario importado con éxito. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Por favor, revisa estos cambios antes de aceptarlos."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Vocabulario actualizado con éxito"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Cambios en el vocabulario hechos con éxito"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Vocabulario borrado con éxito"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Medios actualizados con éxito"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Medios borrados con éxito"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr "Debe seleccionar al menos un medio para eliminar"
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Medios eliminados con éxito"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "Eliminando. Esto puede tardar un poco"
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr "Debe seleccionar al menos un medio para editar"
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "Medios editados correctamente"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "Editando. Esto puede tardar un poco."
 
@@ -3882,24 +3918,24 @@ msgstr "Items borrados con éxito"
 msgid "Deleting items. This may take a while."
 msgstr "Borrando items. Esto puede tardar un rato."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Item creado con éxito. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Item actualizado con éxito"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Debes seleccionar al menos un item para editar por lotes."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Items editados con éxito"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Editando items. Esto puede tardar un rato"
 
@@ -4029,14 +4065,14 @@ msgstr "Subir fichero"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -4047,15 +4083,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4110,55 +4146,63 @@ msgstr "Presentación de item"
 msgid "Item with metadata"
 msgstr "Item con metadatos"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Alineamiento de miniatura"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Desconocido [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Lista de sitios"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "Alfabético"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "Los más viejos, primero"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "El más reciente, primero"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Número máximo de sitios"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "Un valor vacío significa que no hay límite."
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "Paginación "
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr "Mostrar paginación (solo si se establece un límite)"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "Mostrar resúmenes"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Navegar por la previsualización"
@@ -4266,8 +4310,8 @@ msgstr "Los medios deben ser un array"
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "La plantilla de recuros \"%s\" requiere un valor \"%s\""
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "La plantilla de recuros \"%1$s\" requiere un valor \"%2$s\""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4285,39 +4329,39 @@ msgstr "Un siito debe tener datos de un grupo de items."
 msgid "A homepage must belong to its parent site."
 msgstr "Página de inicio debe pertenecer a su sitio principal."
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "Navegación no válida: navegación debe ser un array"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Navegación no válida: tipo de enlace ausente"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Navegación no válida: datos de enlace ausentes"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Navegación no válida: datos de enlace no válidos"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Navegación no válida: los enlaces de página deben ser únicos"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "Navegación no válida: enlaces deben ser un array"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr "Medios deben ser un 'ingester'"
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr "Medios deben establecer un 'ingester' válido."
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Los medios deben pertenecer a un item."
 
@@ -6413,10 +6457,6 @@ msgstr "Persona"
 msgid "A person."
 msgstr "Una persona"
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr "Un agente (ej. persona, grupo, software o artefacto físico)."
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Un documento."
@@ -6437,6 +6477,10 @@ msgstr "Grupo"
 msgid "A class of Agents."
 msgstr "Una clase de Agentes."
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr "Un agente (ej. persona, grupo, software o artefacto físico)."
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Proyecto"
diff --git a/application/language/es_419.mo b/application/language/es_419.mo
index 964feaa39c..1d3981731d 100644
Binary files a/application/language/es_419.mo and b/application/language/es_419.mo differ
diff --git a/application/language/es_419.po b/application/language/es_419.po
index 6984407c72..a0b476711c 100644
--- a/application/language/es_419.po
+++ b/application/language/es_419.po
@@ -6,15 +6,16 @@
 # Translators:
 # Jairo Antonio Melo Flórez <jairom@colmich.edu.mx>, 2018
 # Jorge Castorina <castorin@mdp.edu.ar>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Jorge Castorina <castorin@mdp.edu.ar>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Spanish (Latin America) (https://www.transifex.com/omeka/teams/14184/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,19 +66,20 @@ msgstr "El adaptador %1$s no se implementa en la operación masiva de borrado."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "El campo \"%s\" no se encuentra disponible en la entidad de la clase %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr ""
+"El campo \"%1$s\" no se encuentra disponible en la entidad de la clase %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Permiso negado para el usuario actual a %s el recurso %s."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Permiso negado para el usuario actual a %1$s el recurso %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "La entidad %s con el criterio %s no se ha encontrado"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -87,7 +89,7 @@ msgstr "Bienvenido"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Bienvenido a su nuevo sitio. Esta es una página de ejemplo."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Navegar"
 
@@ -96,7 +98,7 @@ msgstr "Navegar"
 msgid "The API does not support the \"%s\" resource."
 msgstr "La API no soporta el recurso \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -111,11 +113,11 @@ msgstr "Predeterminado"
 msgid "Asset uploads must be POSTed."
 msgstr "Las subidas Asset deben ser POSTed."
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "¿Añadir otro elemento?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "¿Añadir otra colección?"
 
@@ -199,8 +201,8 @@ msgstr "OpenSeadragon no está disponible a menos que se habilite JavaScript."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "El módulo \"%s\" está márcado como \"%s\" y no puede ser activado."
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "El módulo \"%1$s\" está márcado como \"%2$s\" y no puede ser activado."
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -211,8 +213,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "El módulo \"%s\" está márcado como \"%s\" y no puede ser desactivado."
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "El módulo \"%1$s\" está márcado como \"%2$s\" y no puede ser desactivado."
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -223,13 +225,13 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser instalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser instalado"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser desinstalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser desinstalado"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -240,8 +242,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "El módulo \"%s\" está marcado como \"%s\" y no puede ser actualizado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "El módulo \"%1$s\" está marcado como \"%2$s\" y no puede ser actualizado"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -252,8 +254,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Permiso negado para el usuario actual a %s al módulo %s."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permiso negado para el usuario actual a %1$s al módulo %2$s."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -380,7 +382,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -473,8 +475,9 @@ msgid "AND"
 msgstr "Y"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -539,7 +542,7 @@ msgstr "Nombre"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rol"
 
@@ -572,8 +575,8 @@ msgstr "Tiene permiso en el sitio"
 msgid "The maximum upload size is %s MB."
 msgstr "El tamaño máximo para las subidas es de %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -593,7 +596,7 @@ msgstr "El tamaño máximo para las subidas es de %s MB."
 msgid "Edit"
 msgstr "Editar"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -621,7 +624,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -633,6 +636,10 @@ msgstr "Borrar valor"
 msgid "Add new item set"
 msgstr "Añadir nueva colección"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Buscar texto"
@@ -742,7 +749,7 @@ msgid "Block to be removed"
 msgstr "Bloque a eliminar"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -750,6 +757,7 @@ msgstr "Restaurar valores"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -760,17 +768,17 @@ msgstr "Restaurar valores"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Colecciones"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Valores a ser removidos"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -918,10 +926,6 @@ msgstr "Haga clic en una colección para añadirla al panel de edición"
 msgid "Filter item sets"
 msgstr "Filtrar colecciones"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Todas las colecciones"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -959,7 +963,7 @@ msgstr "Todo"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1011,8 +1015,8 @@ msgstr "Siguiente"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s de %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1075,12 +1079,12 @@ msgstr "Clic en una propiedad para añadirla al panel de edición."
 msgid "Filter properties"
 msgstr "Filtrar propiedades"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Añadir propiedades"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1173,18 +1177,18 @@ msgstr "Cerrar cesión"
 msgid "Log in"
 msgstr "Conectarse"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Clic en un usuario para añadirlo al panel de edición."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtrar usuarios"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Todos los usuarios (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1193,7 +1197,7 @@ msgstr "Una nueva versión de Omeka S está disponible. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Obtener la nueva versión."
 
@@ -1215,7 +1219,7 @@ msgid "Details:"
 msgstr "Detalles:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Recursos"
 
@@ -1426,7 +1430,7 @@ msgstr "Editar elementos en grupo"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1472,7 +1476,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Propietario"
 
@@ -1636,10 +1640,11 @@ msgstr "¿Está seguro de querer eliminar las colecciones seleccionadas?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: esta acción eliminará de manera permanente %s colecciones y no podrá "
-"deshacerse."
+"%1$s: esta acción eliminará de manera permanente %2$s colecciones y no podrá"
+" deshacerse."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1804,9 +1809,10 @@ msgstr "¿Está seguro de querer borrar los elementos seleccionados?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: esta acción borrará de manera permanente %selementos y no se puede "
+"%1$s: esta acción borrará de manera permanente %2$selementos y no se puede "
 "deshacer."
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1976,9 +1982,10 @@ msgstr "¿Está seguro de querer borrar los medios seleccionados?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: esta acción borrará de manera permanente %smedios y no puede deshacerse."
+"%1$s: esta acción borrará de manera permanente %2$smedios y no puede "
+"deshacerse."
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2290,7 +2297,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Está editando %s usuarios (excepto usted mismo)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Añadir nuevo usuario"
 
@@ -2309,7 +2316,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2321,7 +2329,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2410,7 +2418,7 @@ msgstr "Nombre único de URI:"
 msgid "This vocabulary has no classes."
 msgstr "Este vocabulario no tiene clases."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2437,7 +2445,7 @@ msgstr "Aceptar cambios"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2448,8 +2456,8 @@ msgstr "Sitios"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Ir al %spara empezar a trabajar con %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Ir al %1$spara empezar a trabajar con %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2529,7 +2537,7 @@ msgid "Theme"
 msgstr "Tema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Grupo de elementos"
 
@@ -2576,16 +2584,12 @@ msgstr "Filtrar páginas"
 msgid "There are no available pages."
 msgstr "No hay páginas disponibles."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Restaurar colección"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "En este momento hay %selementos en el grupo de este sitio."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "No hay colecciones asignadas a este sitio."
 
@@ -2624,30 +2628,30 @@ msgstr "Este tema no tiene opciones de configuración"
 msgid "Current theme"
 msgstr "Tema actual"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Editar la configuración del tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Una nueva versión de este tema está disponible. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Error: tema no compatible,"
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2664,18 +2668,13 @@ msgstr "Restaurar"
 msgid "User permissions"
 msgstr "Permisos de usuario"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Usuario a eliminar"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Este sitio no tiene usuarios. Par añadirlos utilice la interface de la "
 "derecha."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Clic en un usuario para añadirlo al sitio."
 
@@ -2751,35 +2750,39 @@ msgstr "Búsqueda avanzada de elementos"
 msgid "Item"
 msgstr "Elemento"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Restaurar colección"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr ""
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2838,24 +2841,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2894,30 +2897,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2958,7 +3054,7 @@ msgid "Suggested class"
 msgstr "Clase sugerida"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "General"
 
@@ -3008,12 +3104,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3023,7 +3119,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -3038,7 +3134,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Resultados por página"
 
@@ -3164,12 +3260,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Título de la instalación"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Zona horaria"
 
@@ -3240,7 +3336,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3264,113 +3360,113 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Correo electrónico del administrador"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3396,7 +3492,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3423,56 +3519,6 @@ msgstr "Código de color hexadecimal de tres o seis dígitos, o \"transparente\"
 msgid "Invalid color format"
 msgstr "Formato de color inválido"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Debe verificar que es humano completando el CAPTCHA"
@@ -3538,15 +3584,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3622,8 +3668,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3658,7 +3704,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3701,48 +3747,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3751,51 +3797,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3819,24 +3865,24 @@ msgstr ""
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3962,14 +4008,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3980,15 +4026,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4043,8 +4089,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4052,46 +4102,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4199,7 +4253,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4218,39 +4272,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6174,10 +6228,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6198,6 +6248,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/et.mo b/application/language/et.mo
index 16000a2803..1a71d4162a 100644
Binary files a/application/language/et.mo and b/application/language/et.mo differ
diff --git a/application/language/et.po b/application/language/et.po
index 6a8410c251..1a2fa68061 100644
--- a/application/language/et.po
+++ b/application/language/et.po
@@ -4,17 +4,18 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Moon Ika <m8nika@gmail.com>, 2019
 # Rivo Zängov <eraser@eraser.ee>, 2019
+# John Flatness <john@zerocrates.org>, 2020
+# Moon Ika, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>, 2019\n"
+"Last-Translator: Moon Ika, 2020\n"
 "Language-Team: Estonian (https://www.transifex.com/omeka/teams/14184/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,19 +65,19 @@ msgstr "Adapteris %1$s pole hulgi kustutamise funktsiooni."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "%s sissekannet kriteeriumiga %s ei leitud"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "%1$s sissekannet kriteeriumiga %2$s ei leitud"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -86,7 +87,7 @@ msgstr "Tere tulemast"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Tere tulemast sinu uuele saidile. See on näidislehekülg."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Sirvi"
 
@@ -95,7 +96,7 @@ msgstr "Sirvi"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API ei toeta ressurssi \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +111,11 @@ msgstr "Vaikeväärtus"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Lisada veel üks ühik?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Lisada veel üks ühikute kogum?"
 
@@ -197,8 +198,8 @@ msgstr "OpenSeadragon pole saadaval, kui JavaScript pole lubatud."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Mooduli \"%s\" staatus on \"%s\" ja seda ei saa arhiveerida"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Mooduli \"%1$s\" staatus on \"%2$s\" ja seda ei saa arhiveerida"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -207,8 +208,8 @@ msgstr "Moodul \"%s\" polnud aktiveerimise ajal andmebaasis"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Mooduli \"%s\" staatus on \"%s\" ja seda ei saa deaktiveerida"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Mooduli \"%1$s\" staatus on \"%2$s\" ja seda ei saa deaktiveerida"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -217,13 +218,13 @@ msgstr "Moodul \"%s\" polnud deaktiveerimise ajal andmebaasis"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Mooduli \"%s\" staatus on \"%s\" ja seda ei saa paigaldada"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Mooduli \"%1$s\" staatus on \"%2$s\" ja seda ei saa paigaldada"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Mooduli \"%s\" staatus on \"%s\" ja seda ei saa eemaldada"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Mooduli \"%1$s\" staatus on \"%2$s\" ja seda ei saa eemaldada"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -232,8 +233,8 @@ msgstr "Moodulit \"%s\" ei leitud eemaldamisel andmebaasist"
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Mooduli \"%s\" staatus on \"%s\" ja seda ei saa uuendada"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "Mooduli \"%1$s\" staatus on \"%2$s\" ja seda ei saa uuendada"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -242,7 +243,7 @@ msgstr "Moodulit \"%s\" ei leitud uuendamisel andmebaasist"
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -358,8 +359,8 @@ msgstr "Paroolis peab olema vähemalt %s arv(u)."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
-msgstr "Paroolis peab olema vähemalt %s sümbol(it): <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr "Paroolis peab olema vähemalt %1$s sümbol(it): <code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -451,8 +452,9 @@ msgid "AND"
 msgstr "JA"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -517,7 +519,7 @@ msgstr "Nimi"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Roll"
 
@@ -550,8 +552,8 @@ msgstr "On õigused saidil"
 msgid "The maximum upload size is %s MB."
 msgstr "Maksimaalne üleslaadimise suurus on %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -571,7 +573,7 @@ msgstr "Maksimaalne üleslaadimise suurus on %s MB."
 msgid "Edit"
 msgstr "Muuda"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -598,7 +600,7 @@ msgstr "Otsib ühikuid, mis on seotud mõnega nendest ühikute kogumitest."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -610,6 +612,10 @@ msgstr "Eemalda väärtus"
 msgid "Add new item set"
 msgstr "Lisa uus ühikute kogum"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Päringu tekst"
@@ -719,7 +725,7 @@ msgid "Block to be removed"
 msgstr "Eemaldatav plokk"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -727,6 +733,7 @@ msgstr "Taasta väärtus"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -737,17 +744,17 @@ msgstr "Taasta väärtus"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Ühikute kogumid"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Eemaldatav väärtus"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -895,10 +902,6 @@ msgstr "Kliki ühikute kogumil, et seda muutmise lehele lisada."
 msgid "Filter item sets"
 msgstr "Filtreeri ühikute kogumeid"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Kõik ühikute kogumid"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -936,7 +939,7 @@ msgstr "Kõik"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -988,8 +991,8 @@ msgstr "Järgmine"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s. Ühikuid kokku %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s. Ühikuid kokku %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1052,12 +1055,12 @@ msgstr "Kliki omadusel, et seda muutmise lehele lisada."
 msgid "Filter properties"
 msgstr "Filtri omadused"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Lisa omadus"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1150,18 +1153,18 @@ msgstr "Logi välja"
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtreeri kasutajaid"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Kõik kasutajad (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1170,7 +1173,7 @@ msgstr "Saadaval on uus Omeka S versioon. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Hangi uus versioon."
 
@@ -1192,7 +1195,7 @@ msgid "Details:"
 msgstr "Üksikasjad:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Ressursid"
 
@@ -1403,7 +1406,7 @@ msgstr "Muuda ühikute kogumeid hulgi"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1449,7 +1452,7 @@ msgstr "Identifikaator"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Omanik"
 
@@ -1613,10 +1616,11 @@ msgstr "Oled sa kindel, et soovid valitud ühikute kogumid kustutada?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: see toiming kustutab jäädavalt %s ühikute kogumid ja seda sammu ei saa "
-"tagasi võtta."
+"%1$s: see toiming kustutab jäädavalt %2$s ühikute kogumid ja seda sammu ei "
+"saa tagasi võtta."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1781,7 +1785,8 @@ msgstr "Oled sa kindel, et soovid valitud ühikuid kustutada?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1947,7 +1952,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2260,7 +2265,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Sa muudad %s kasutajat (välja arvatud iseennast)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Lisa uus kasutaja"
 
@@ -2279,10 +2284,11 @@ msgstr "Oled sa kindel, et soovid valitud kasutajaid kustutada?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
-"%s: see toiming kustutab jäädavalt %s kasutajat ja seda sammu ei saa tagasi "
-"võtta."
+"%1$s: see toiming kustutab jäädavalt %2$s kasutajat ja seda sammu ei saa "
+"tagasi võtta."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2295,11 +2301,11 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
-"%s: see toiming kustutab jäädavalt %s kasutajat (väljaarvatud sina ise) ja "
-"seda sammu ei saa tagasi võtta."
+"%1$s: see toiming kustutab jäädavalt %2$s kasutajat (väljaarvatud sina ise) "
+"ja seda sammu ei saa tagasi võtta."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2386,7 +2392,7 @@ msgstr "Nimeruumi URI:"
 msgid "This vocabulary has no classes."
 msgstr "Sõnastikul pole ühtegi klassi."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2413,7 +2419,7 @@ msgstr "Nõustu muudatustega"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2424,7 +2430,7 @@ msgstr "Saidid"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2504,7 +2510,7 @@ msgid "Theme"
 msgstr "Teema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2551,16 +2557,12 @@ msgstr "Filtreeri lehekülgi"
 msgid "There are no available pages."
 msgstr "Ühtegi lehekülge pole saadaval."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Taasta ühikute kogum"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Selle saidiga pole seotud ühtegi ühikute kogumit."
 
@@ -2599,30 +2601,30 @@ msgstr "Praegusel teemal pole seadistamise valikuid."
 msgid "Current theme"
 msgstr "Praegune teema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Muuda teema seadeid"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Sellest teemast on saadaval uus versioon. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Tõrge: see teema on vigane."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Staatus: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2638,16 +2640,11 @@ msgstr "Taasta"
 msgid "User permissions"
 msgstr "Kasutaja õigused"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Eemaldatav kasutaja"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Kasutaja saidile lisamiseks kliki kasutajal."
 
@@ -2723,35 +2720,39 @@ msgstr "Laiendatud ühikute otsing"
 msgid "Item"
 msgstr "Ühik"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Midagi läks valesti"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Sul on salvestamata muudatusi."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Taasta ühikute kogum"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Sulge ikoonikomplekt"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Ava ikoonikomplekt"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Ressursi malli laadimine API-st ebaõnnestus"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Taasta omadus"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Palun sisesta korrektne keele silt"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -2810,25 +2811,25 @@ msgstr "pealkirja pole"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Viga allalaadimisel %s: %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Viga allalaadimisel %1$s: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Viga allalaadimisel %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Viga allalaadimisel %1$s: %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2866,31 +2867,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Ressursi malli fail"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "Nimeruumi URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Sõnastiku fail"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "Sõnastiku URL"
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Failivorming"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr "[Automaatne tuvastamine]"
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr "JSON-LD (.jsonld)"
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr "N-Triples (.nt)"
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr "Notation3 (.n3)"
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr "RDF/XML (.rdf)"
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr "Turtle (.ttl)"
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Sõnastiku inimloetav pealkiri."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Sõnastiku inimloetav kirjeldus."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2930,7 +3024,7 @@ msgid "Suggested class"
 msgstr "Soovitatud klass"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Üldine"
 
@@ -2980,12 +3074,12 @@ msgid "Always"
 msgstr "Alati"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2995,7 +3089,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Keel"
 
@@ -3010,7 +3104,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Tulemusi lehe kohta"
 
@@ -3136,12 +3230,12 @@ msgid "Confirm email"
 msgstr "Kinnita e-posti aadress"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Saidi nimi"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Ajavöönd"
 
@@ -3212,7 +3306,7 @@ msgid "Confirm"
 msgstr "Kinnita"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3236,53 +3330,53 @@ msgstr "Kinnita uut parooli"
 msgid "New key label"
 msgstr "Uue võtme silt"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Administraatori e-post"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Omaduse sildi info"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Pole"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Näita sõnastikku"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Näita terminit"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Vaikimisi sait"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Vaikeväärtust pole (näitab saitide indeksit)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Luba versioonide teavitusi"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
@@ -3290,61 +3384,61 @@ msgstr ""
 "Luba teavitusi, kui Omeka S-i, moodulite või teemade uus versioon on "
 "saadaval."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Turvalisus"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Kasuta HTML-i puhastajat"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Keela failide kontrollimine"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Lubatud meedia liigid"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Lubatud faililaiendid"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "reCAPTCHA saidi võti"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHA salavõti"
 
@@ -3370,8 +3464,8 @@ msgstr "sisaldama vähemalt %s numbrit."
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
-msgstr "sisaldama vähemalt %s sümbolit: %s"
+msgid "contain at least %1$s symbols: %2$s"
+msgstr "sisaldama vähemalt %1$s sümbolit: %2$s"
 
 #: application/src/Form/Element/PasswordConfirm.php:43
 msgid "Password must:"
@@ -3397,56 +3491,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr "Vigane värvi vorming"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Sõnastiku fail"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr "Vali RDF-i sõnastiku fail. Pead valima faili või sisestama URL-i."
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "Sõnastiku URL"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr "Vali RDF-i sõnastiku URL. Pead sisestama URL-i või valima faili."
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "Failivorming"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr "[Automaatne tuvastamine]"
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr "JSON-LD (.jsonld)"
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr "N-Triples (.nt)"
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr "Notation3 (.n3)"
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr "RDF/XML (.rdf)"
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr "Turtle (.ttl)"
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Pead tõestama, et oled inimene, sisestades selle CAPTCHA."
@@ -3512,15 +3556,15 @@ msgstr "Kasutaja õiguseid on uuendatud"
 msgid "Site theme successfully updated"
 msgstr "Saidi kujundus on uuendatud"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Kujunduse seaded on uuendatud"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Sait on kustutatud"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "sait"
 
@@ -3596,8 +3640,8 @@ msgstr "Ressursi mall on loodud. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3632,7 +3676,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3675,48 +3719,48 @@ msgstr "Kasutajaid on muudetud"
 msgid "Editing users. This may take a while."
 msgstr "Kasutajate muutmine. See võib veidi aega võtta."
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Ühikute kogum on loodud. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Ühikute kogumit on uuendatud"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "ühikute kogum"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Ühikute kogum on kustutatud"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "Hulgikustutamiseks pead valima vähemalt ühe ühikute kogumi."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Ühikute kogum on kustutatud"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Ühikute kogumite kustutamine. See võib veidi aega võtta."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "Hulgi muutmiseks pead valima vähemalt ühie ühikute kogumi."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Ühikute kogumeid on muudetud"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Ühikute kogumite muutmine. See võib veidi aega võtta."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "sõnastik"
 
@@ -3725,51 +3769,51 @@ msgstr "sõnastik"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Sõnastik on imporditud. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Sõnastikku on uuendatud"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Sõnastikku on muudetud"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Sõnastik on kustutatud"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Meedia on uuendatud"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Meedia on kustutatud"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Meediafailid on kustutatud"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "Meediafailide kustutamine. See võib veidi aega võtta."
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "Meediafailid on kustutatud"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "Meediafailide muutmine. See võib veidi aega võtta"
 
@@ -3793,24 +3837,24 @@ msgstr "Ühikud on kustutatud"
 msgid "Deleting items. This may take a while."
 msgstr "Ühikute kustutamine. See võib veidi aega võtta."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Ühik on loodud. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Ühikut on uuendatud"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Hulgimuutmiseks pead valima vähemalt ühe ühiku."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Ühikuid on muudetud"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Ühikute muutmine. See võib veidi aega võtta."
 
@@ -3936,14 +3980,14 @@ msgstr "Laadi fail üles"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3954,15 +3998,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4017,55 +4061,63 @@ msgstr "Ühiku aken"
 msgid "Item with metadata"
 msgstr "Ühik metaandmetega"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Pisipildi joondus"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Tundmatu [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Saitide nimekiri"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "Tähestiku järjekorras"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "Vanemad eespool"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "Uuemad eespool"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Maksimaalne saitide arv"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "Tühi väärtus tähendab, et limiiti pole."
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "Piiramatult"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "Lehekülgedeks jagamine"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "Näita kokkuvõtteid"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Sirvimise eelvaade"
@@ -4173,7 +4225,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4192,39 +4244,39 @@ msgstr "Saidil peavad olema ühikute andmed."
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Vigane menüü: lingi liik puudub"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Vigane menüü: lingi andmed puuduvad"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Vigane menüü: vigased lingi andmed"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Vigane menüü: lehekülje lingid peavad olema kordumatud"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Meedia peab kuuluma ühiku juurde."
 
@@ -4928,7 +4980,7 @@ msgstr "Lisamise kuupäev"
 
 #. Property comment for Dublin Core:dateSubmitted
 msgid "Date of submission of the resource."
-msgstr "Selle ressursi lisamise kuupäev."
+msgstr "Ressursi lisamise kuupäev."
 
 #. Property label for Dublin Core:educationLevel
 msgid "Audience Education Level"
@@ -6151,10 +6203,6 @@ msgstr "Isik"
 msgid "A person."
 msgstr "Isik"
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Dokument"
@@ -6175,6 +6223,10 @@ msgstr "Grupp"
 msgid "A class of Agents."
 msgstr "Agentide klass."
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Projekt"
diff --git a/application/language/fi_FI.mo b/application/language/fi_FI.mo
index 30da858f3f..94c939771a 100644
Binary files a/application/language/fi_FI.mo and b/application/language/fi_FI.mo differ
diff --git a/application/language/fi_FI.po b/application/language/fi_FI.po
index 8b929e0d24..7ea985a939 100644
--- a/application/language/fi_FI.po
+++ b/application/language/fi_FI.po
@@ -6,15 +6,16 @@
 # Translators:
 # Sami Varjo <sami.varjo@vaasa.fi>, 2017
 # Matti Lassila <matti.lassila@gmail.com>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Matti Lassila <matti.lassila@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/omeka/teams/14184/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,18 +65,18 @@ msgstr "The %1$s adapter does not implement the batch delete operation."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "The \"%1$s\" field is not available in the %2$s entity class."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Käyttäjällä  ei ole %s oikeuksia kohteeseen %s ."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Käyttäjällä  ei ole %1$s oikeuksia kohteeseen %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -86,7 +87,7 @@ msgstr "Tervetuloa"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Tervetuloa uudelle sivustollesi. Tämä on esimerkkisivu."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Selaa"
 
@@ -95,7 +96,7 @@ msgstr "Selaa"
 msgid "The API does not support the \"%s\" resource."
 msgstr ""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +111,11 @@ msgstr "Oletus"
 msgid "Asset uploads must be POSTed."
 msgstr "Tiedostot täytyy lähettää POST-pyynnöllä."
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Lisää toinen aineisto?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Lisää toinen kokoelma?"
 
@@ -197,7 +198,7 @@ msgstr "OpenSeadragon vaatii Javascript-tuen."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -207,7 +208,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -217,12 +218,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -232,7 +233,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -242,7 +243,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -368,7 +369,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -461,8 +462,9 @@ msgid "AND"
 msgstr "JA"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -527,7 +529,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rooli"
 
@@ -560,8 +562,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "Tiedoston enimmäiskoko on %s MB"
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -581,7 +583,7 @@ msgstr "Tiedoston enimmäiskoko on %s MB"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -608,7 +610,7 @@ msgstr "Hakee aineistoja jotka kuuluvat mihin tahansa valituista kokoelmista."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -620,6 +622,10 @@ msgstr "Poista arvo"
 msgid "Add new item set"
 msgstr "Lisää kokoelma hakuehtoihin"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -729,7 +735,7 @@ msgid "Block to be removed"
 msgstr "Poistettava sisältölohko"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -737,6 +743,7 @@ msgstr "Palauta arvo"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -747,17 +754,17 @@ msgstr "Palauta arvo"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Kokoelmat"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Poistettava arvo"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -905,10 +912,6 @@ msgstr "Valitse kokoelma muokattavaksi klikkaamalla"
 msgid "Filter item sets"
 msgstr "Suodata kokoelmia"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Kaikki kokoelmat"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -946,7 +949,7 @@ msgstr "Kaikki"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -998,8 +1001,8 @@ msgstr "Seuraava"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s / %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr ""
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1062,12 +1065,12 @@ msgstr "Klikkaa kenttää lisätäksesi sen aineiston tietoihin"
 msgid "Filter properties"
 msgstr "Hae kenttää"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Lisää kenttä"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1160,17 +1163,17 @@ msgstr "Kirjaudu ulos"
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Hae käyttäjiä"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1180,7 +1183,7 @@ msgstr "Uusi Omeka S -versio on saatavissa. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Lataa uusi versio."
 
@@ -1202,7 +1205,7 @@ msgid "Details:"
 msgstr "Lisätietoja:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Aineistot"
 
@@ -1413,7 +1416,7 @@ msgstr "Massamuokkaa kokoelmia"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1459,7 +1462,7 @@ msgstr "Identifiointitunnus"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Omistaja"
 
@@ -1623,8 +1626,9 @@ msgstr "Haluatko varmasti poistaa valitut kokoelmat?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
-msgstr "%s: toiminto tuhoaa pysyvästi %s kokoelmaa ja sitä ei voi perua."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
+msgstr "%1$s: toiminto tuhoaa pysyvästi %2$s kokoelmaa ja sitä ei voi perua."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1787,8 +1791,9 @@ msgstr "Haluatko varmasti poistaa valitut aineistot?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
-msgstr "%s: toiminto tuhoaa pysyvästi %s aineistoa ja sitä ei voi perua."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
+msgstr "%1$s: toiminto tuhoaa pysyvästi %2$s aineistoa ja sitä ei voi perua."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1955,7 +1960,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2268,7 +2273,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
@@ -2287,7 +2292,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2299,7 +2305,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2388,7 +2394,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2415,7 +2421,7 @@ msgstr "Hyväksy muutokset"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2426,7 +2432,7 @@ msgstr "Sivustot"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2506,7 +2512,7 @@ msgid "Theme"
 msgstr "Ulkoasu"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Aineistovaranto"
 
@@ -2553,16 +2559,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr "Ei sivuja."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Palauta kokoelma"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Sivuston aineistovarannossa on %s aineistoa."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Sivustoon ei ole liitetty kokoelmia."
 
@@ -2601,30 +2603,30 @@ msgstr "Teemalla ei ole asetuksia."
 msgid "Current theme"
 msgstr "Valittu teema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Muokkaa teeman asetuksia"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Virhe: teema on virheellinen."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2638,17 +2640,12 @@ msgstr "Palauta"
 msgid "User permissions"
 msgstr "Käyttäjäoikeudet"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Poistettava käyttäjä"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Sivustolla ei ole käyttäjiä. Lisää käyttäjiä oikeanpuoleisesta valikosta."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Lisää käyttäjä klikkaamalla."
 
@@ -2724,35 +2721,39 @@ msgstr "Tarkennettu aineistohaku"
 msgid "Item"
 msgstr "Aineisto"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Virhetilanne"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Sinulla on tallentamattomia muutoksia"
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Palauta kokoelma"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr ""
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Palauta kenttä"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Anna kielimääritys oikeassa muodossa"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2811,24 +2812,24 @@ msgstr "ei nimekettä"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2867,31 +2868,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Tallennuspohjatiedosto"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Sanastotiedosto"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Käyttäjän luettavaksi tarkoitettu sanaston nimi."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Käyttäjän luettavaksi tarkoitettu sanaston kuvaus."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2932,7 +3026,7 @@ msgid "Suggested class"
 msgstr "Ehdotettu tyyppi"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Yleiset asetukset"
 
@@ -2982,12 +3076,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2997,7 +3091,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Kieliasetus"
 
@@ -3014,7 +3108,7 @@ msgid "Restrict browse to attached items"
 msgstr "Salli vain liitettyjen aineistojen selaus"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Tuloksia sivua kohti"
 
@@ -3140,12 +3234,12 @@ msgid "Confirm email"
 msgstr "Vahvista sähköposti"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Asennuksen nimi"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Aikavyöhyke"
 
@@ -3216,7 +3310,7 @@ msgid "Confirm"
 msgstr "Vahvista"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "Asennuksen kieliasetus"
 
@@ -3240,113 +3334,113 @@ msgstr "Vahvista uusi salasana"
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Ylläpitäjän sähköpostiosoite"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "Selausnäkymissä kerrallaan näytettävien aineistojen määrä"
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Kenttien tiedot"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr "Kentän nimen ohessa näytettävät lisätiedot."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Ei lisätietoja"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Sanasto"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Termi"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Oletussivusto"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr "Valitse sivusto joka näytetään asennuksen etusivulla"
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Sivustolistaus"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Ota versioilmoitukset käyttöön"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr "Ilmoita Omekan ja lisäosien päivityksistä."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Turvallisuusasetukset"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Ota HTMLPurifier käyttöön"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Suodattaa käyttäjän syöttämän HTML-koodin."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Älä validoi tiedostoja"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr "Älä validoi tiedostotyyppjä tai tiedostopäätteitä."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Sallitut tiedostotyypit"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Sallitut tiedostopäätteet"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "reCAPTCHA-sivustoavain"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHA salainen avain"
 
@@ -3372,7 +3466,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3399,56 +3493,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr "Virheellinen värimäärittely"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Sanastotiedosto"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Vahvista olevasi ihminen tekemällä oheisen tehtävän."
@@ -3514,15 +3558,15 @@ msgstr "Käyttäjäoikeudet päivitettiin onnistuneesti"
 msgid "Site theme successfully updated"
 msgstr "Sivuston ulkoasu päivitettiin onnistuneesti"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Ulkoasuasetukset päivitettiin onnistuneesti"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Sivusto on poistettu"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "sivusto"
 
@@ -3598,8 +3642,8 @@ msgstr "Tallennuspohjan luonti onnistui. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3634,7 +3678,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3677,48 +3721,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Kokoelman luonti onnistui. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Kokoelma on päivitetty"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "kokoelma"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Kokoelma on poistettu"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "Valitse vähintään yksi kokoelma massapoistoa varten."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Kokoelmat on poistettu."
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Poistetaan kokoelmia. Toiminnon suorittamisessa voi olla viivettä."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "Valitse vähintään yksi kokoelma massamuokkausta varten."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Kokoelmien muokkaus onnistui."
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Päivitetään kokoelmia. Toiminnon suorittamisessa voi olla viivettä."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "sanasto"
 
@@ -3727,51 +3771,51 @@ msgstr "sanasto"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Sanaston tuonti onnistui. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Tarkista muutokset ennen hyväksymistä."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Sanaston päivitys onnistui"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Sanaston muokkaus onnistui"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Sanasto on poistettu"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Tiedoston päivitys onnistui"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Tiedosto on poistettu"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3795,24 +3839,24 @@ msgstr "Aineistojen poisto onnistui"
 msgid "Deleting items. This may take a while."
 msgstr "Poistetaan aineistoja. Toiminnon suorittamisessa voi olla viivettä."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Aineiston luonti onnistui. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Aineisto on päivitetty"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Valitse vähintään yksi aineisto massamuokkausta varten."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Aineiston muokkaus onnistui"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Muokataan aineistoja. Toiminnan suorittamisessa voi olla viivettä."
 
@@ -3938,14 +3982,14 @@ msgstr "Lataa tiedosto"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3956,15 +4000,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4019,55 +4063,63 @@ msgstr "Aineistonosto"
 msgid "Item with metadata"
 msgstr "Aineistonosto ja kuvailutiedot"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Kuvan asemointi"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Tuntematon  [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Aineistolistaus"
@@ -4177,7 +4229,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4196,39 +4248,39 @@ msgstr "Sivustolla tulee olla aineistovaranto."
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6218,10 +6270,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6242,6 +6290,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/fr.mo b/application/language/fr.mo
index eea4a79777..54b89862ef 100644
Binary files a/application/language/fr.mo and b/application/language/fr.mo differ
diff --git a/application/language/fr.po b/application/language/fr.po
index 0086ed1118..7497114ae8 100644
--- a/application/language/fr.po
+++ b/application/language/fr.po
@@ -8,17 +8,17 @@
 # Stéphane Loret <stephane.loret@univ-nantes.fr>, 2018
 # symac <wikitipiac@laposte.net>, 2018
 # Pols12 <poltron54@gmail.com>, 2018
-# Daniel Berthereau <daniel.transifex@berthereau.net>, 2019
-# Laurent Thomas, 2019
+# Laurent Thomas, 2020
+# Daniel Berthereau <daniel.transifex@berthereau.net>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Laurent Thomas, 2019\n"
+"Last-Translator: Daniel Berthereau <daniel.transifex@berthereau.net>, 2020\n"
 "Language-Team: French (https://www.transifex.com/omeka/teams/14184/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,19 +68,21 @@ msgstr "L’adaptateur %1$s n’exécute pas l’opération de suppression multi
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "Le champ \"%s\" n’est pas disponible dans la classe d’entité %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "Le champ \"%1$s\" n’est pas disponible dans la classe d’entité %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Permission \"%s\" pour la ressource \"%s\" refusée à l’utilisateur actuel."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr ""
+"Permission \"%1$s\" pour la ressource \"%2$s\" refusée à l’utilisateur "
+"actuel."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "Entité %s avec critère %s non trouvée"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "Entité %1$s avec critère %2$s non trouvée"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -90,7 +92,7 @@ msgstr "Bienvenue"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Bienvenue sur votre nouveau site. Ceci est une page d’exemple."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Parcourir"
 
@@ -99,7 +101,7 @@ msgstr "Parcourir"
 msgid "The API does not support the \"%s\" resource."
 msgstr "L’API n’est pas compatible avec la ressource \"%s\""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -114,11 +116,11 @@ msgstr "Défaut"
 msgid "Asset uploads must be POSTed."
 msgstr "L’upload des assets doit être POSTé"
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Ajouter un autre contenu ?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Ajouter une autre collection ?"
 
@@ -201,8 +203,8 @@ msgstr "OpenSeadragon n’est pas disponible sauf si JavaScript est activé."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Le module \"%s\" est indiqué comme \"%s\" et ne peut pas être activé"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Le module \"%1$s\" est indiqué comme \"%2$s\" et ne peut pas être activé"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -211,8 +213,8 @@ msgstr "Le module \"%s\" n’est pas dans la base de données durant l’activat
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Le module \"%s\" est indiqué comme \"%s\" et ne peut pas être désactivé"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Le module \"%1$s\" est indiqué comme \"%2$s\" et ne peut pas être désactivé"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -222,13 +224,13 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Le module \"%s\" est indiqué comme \"%s\" et ne peut pas être installé"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Le module \"%1$s\" est indiqué comme \"%2$s\" et ne peut pas être installé"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Le module \"%s\" est indiqué comme \"%s\" et ne peut pas être désinstallé"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Le module \"%1$s\" est indiqué comme \"%2$s\" et ne peut pas être installé"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -239,8 +241,10 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Le module \"%s\" est indiqué comme \"%s\" et ne peut pas être mis à niveau"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr ""
+"Le module \"%1$s\" est indiqué comme \"%2$s\" et ne peut pas être mis à "
+"niveau"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -251,8 +255,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Permission \"%s\" du module \"%s\" refusée à l’utilisateur actuel."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permission \"%1$s\" du module \"%2$s\" refusée à l’utilisateur actuel."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -379,10 +383,10 @@ msgstr "Le mot de passe doit comporter au moins %s chiffres."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
-"Le mot de passe doit comporter au moins %s des caractères spéciaux suivants "
-": <code>%s</code>"
+"Le mot de passe doit comporter au moins %1$s des caractères spéciaux "
+"suivants : <code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -474,8 +478,9 @@ msgid "AND"
 msgstr "ET"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -540,7 +545,7 @@ msgstr "Nom"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rôle"
 
@@ -573,8 +578,8 @@ msgstr "Est habilité sur le site"
 msgid "The maximum upload size is %s MB."
 msgstr "La taille de chargement maximale est de %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -594,7 +599,7 @@ msgstr "La taille de chargement maximale est de %s MB."
 msgid "Edit"
 msgstr "Modifier"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -622,7 +627,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -634,6 +639,10 @@ msgstr "Supprimer la valeur"
 msgid "Add new item set"
 msgstr "Ajouter une nouvelle collection"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr "Recherche par type MIME"
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Valeur de la requête"
@@ -743,7 +752,7 @@ msgid "Block to be removed"
 msgstr "Bloc à supprimer"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -751,6 +760,7 @@ msgstr "Valeur à rétablir"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -761,17 +771,17 @@ msgstr "Valeur à rétablir"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Collections"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Valeur à supprimer"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -919,10 +929,6 @@ msgstr "Cliquez sur une collection pour l’ajouter au panneau de modification."
 msgid "Filter item sets"
 msgstr "Filtrer les collections"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Toutes les collections"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -960,7 +966,7 @@ msgstr "Tout"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1012,8 +1018,8 @@ msgstr "Suivant"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s sur %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1076,12 +1082,12 @@ msgstr "Cliquez sur une propriété pour l’ajouter au panneau de modification.
 msgid "Filter properties"
 msgstr "Filtrer les propriétés"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Ajouter une propriété"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1177,18 +1183,18 @@ msgstr "Se déconnecter"
 msgid "Log in"
 msgstr "Se connecter"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Cliquez sur un utilisateur pour l’ajouter au panneau de modification."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtrer les utilisateurs"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Tous les utilisateurs (%s)"
+msgid "Users (%s)"
+msgstr "Utilisateurs (%s)"
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1197,7 +1203,7 @@ msgstr "Une nouvelle version d'Omeka S est disponible. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Obtenir la nouvelle version"
 
@@ -1219,7 +1225,7 @@ msgid "Details:"
 msgstr "Détails : "
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Ressources"
 
@@ -1432,7 +1438,7 @@ msgstr "Modifier des collections en lots"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1478,7 +1484,7 @@ msgstr "Identifiant"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -1642,10 +1648,11 @@ msgstr "Êtes-vous sûr de vouloir supprimer les collections sélectionnées ?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s : cette action supprimera définitivement %s collections et ne pourra pas "
-"être annulée."
+"%1$s : cette action supprimera définitivement %2$s collections et ne pourra "
+"pas être annulée."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1810,10 +1817,11 @@ msgstr "Êtes-vous sûr de vouloir supprimer les contenus sélectionnés ?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s : cette action supprimera définitivement %s contenus et ne pourra pas "
-"être annulée."
+"%1$s : cette action supprimera définitivement %2$s contenus et ne pourra pas"
+" être annulée."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1982,9 +1990,10 @@ msgstr "Êtes-vous surs de vouloir supprimer les médias sélectionnés ?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s : cette action supprimera irrévocablement et définitivement %s médias."
+"%1$s : cette action supprimera irrévocablement et définitivement %2$s "
+"médias."
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2299,7 +2308,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Vous modifiez%s utilisateurs (sauf vous-même)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
@@ -2318,10 +2327,11 @@ msgstr "Êtes-vous sûr de vouloir supprimer les utilisateurs sélectionnés ?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
-"%s : cette action supprimera définitivement %s utilisateurs et ne pourra pas"
-" être annulée."
+"%1$s : cette action supprimera définitivement %2$s utilisateurs et ne pourra"
+" pas être annulée."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2334,11 +2344,11 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
-"%s : cette action supprimera définitivement %s utilisateurs (sauf vous-même)"
-" et ne pourra pas être annulée."
+"%1$s : cette action supprimera définitivement %2$s utilisateurs (sauf vous-"
+"même) et ne pourra pas être annulée."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2425,7 +2435,7 @@ msgstr "URI de l’espace de noms :"
 msgid "This vocabulary has no classes."
 msgstr "Ce vocabulaire n’a pas de classe."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2454,7 +2464,7 @@ msgstr "Accepter les changements"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2465,8 +2475,8 @@ msgstr "Sites"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Aller au %s pour commencer à travailler avec %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Aller au %1$s pour commencer à travailler avec %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2551,7 +2561,7 @@ msgid "Theme"
 msgstr "Thème"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Réservoir de contenus"
 
@@ -2598,16 +2608,12 @@ msgstr "Filtrer les pages"
 msgid "There are no available pages."
 msgstr "Il n’y a pas de page disponible."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Rétablir la collection"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Il y a actuellement %s contenus dans le réservoir de contenus."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Aucune collection n’est assignée à ce site."
 
@@ -2646,30 +2652,30 @@ msgstr "Le thème actuel n’a pas d’options de configuration."
 msgid "Current theme"
 msgstr "Thème actuel"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Modifier les paramètres du thème"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Une nouvelle version de ce thème est disponible. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Erreur : ce thème est invalide."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID  : %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Statut  : %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2686,17 +2692,12 @@ msgstr "Restaurer"
 msgid "User permissions"
 msgstr "Droits des utilisateurs"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Utilisateur à supprimer"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Ce site n’a pas d’utilisateurs. Ajoutez-en à l’aide du panneau de droite."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Cliquez sur un utilisateur pour l’ajouter au site."
 
@@ -2772,35 +2773,39 @@ msgstr "Recherche de contenus avancée"
 msgid "Item"
 msgstr "Contenu"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Quelque chose s’est mal passé"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Vous avez des modifications non enregistrées."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Rétablir la collection"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Fermer l’ensemble des icônes"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Ouvrir l’ensemble des icônes"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Échec du chargement du modèle de ressource à partir de l’API"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Restaurer la propriété"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Entrez une étiquette de langue valide"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Description"
 
@@ -2859,29 +2864,29 @@ msgstr "Sans titre"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
-"Erreur lors de la validation de \"%s\". Impossible de stocker les fichiers "
-"avec le type de média \"%s\"."
+"Erreur de validation de \"%1$s\". Impossible de gérer les fichiers avec le "
+"média type \"%2$s\"."
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
-"Erreur lors de la validation de \"%s\". Impossible de stocker les fichiers "
-"avec l’extension \"%s\"."
+"Erreur lors de la validation de \"%1$s\". Impossible de stocker les fichiers"
+" avec l’extension \"%2$s\"."
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Erreur lors du téléchargement %s  : %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Erreur lors du téléchargement %1$s  : %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Erreur lors du téléchargement %s  : %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Erreur lors du téléchargement %1$s : %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2920,35 +2925,144 @@ msgstr "Configuration de la vignette de secours invalide."
 msgid "Resource template file"
 msgstr "Fichier Modèle de ressource"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
-msgstr ""
-"Un identifiant de vocabulaire concis, utilisé comme proxy abrégé pour l’URI "
-"de l’espace de noms."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr "Info de base"
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr "Fichier"
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr "Avancé"
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr "Un titre du vocabulaire, lisible pour l’utilisateur."
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr "Une description du vocabulaire, lisible pour l’utilisateur."
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "URI de l’espace de noms"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
 msgstr ""
-"L’URI de l’espace de noms unique utilisé par le vocabulaire pour identifier "
-"les classes et les propriétés des membres locaux."
+"Indiquez l’URI unique de l’espace de noms du vocabulaire afin d’identifier "
+"les classes et les propriétés."
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Un titre du vocabulaire, lisible pour l’utilisateur."
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr "Préfixe de l’espace de noms"
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+"Indiquez un court identifiant de vocabulaire, qui servira comme raccourci "
+"pour l’URI de l’espace de noms."
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Fichier Vocabulaire"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+"Chargez un fichier de vocabulaire RDF. Vous devez choisir un fichier ou "
+"indiquer une URL."
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "URL du vocabulaire"
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+"Indiquer une URL de vocabulaire RDF. Vous devez choisir une URL ou charger "
+"un fichier."
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Format de fichier"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr "[Auto]"
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr "JSON-LD (.jsonld)"
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr "N-Triples (.nt)"
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr "Notation3 (.n3)"
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr "RDF/XML (.rdf)"
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr "Turtle (.ttl)"
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr "Langue préférée"
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+"Saisir la langue préférée pour les libellés et les commentaires en utilisant"
+" un <a target=\"_blank\" href=\"https://www.w3.org/International/articles"
+"/language-tags/\">identifiant IETF</a>. Le premier disponible sera appliqué "
+"par défaut."
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr "Propriété pour le libellé"
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+"Indiquer la propriété du libellé. Cette option est nécessaire seulement pour"
+" les vocabulaires qui utilisent une propriété peu courante pour les libellés"
+" Merci d’utiliser l’URI complète de la propriété entre les signes \"<\" et "
+"\">\"."
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr "Propriété pour le commentaire"
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Une description du vocabulaire, lisible pour l’utilisateur.."
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
+"Indiquer la propriété du commentaire. Cette option est nécessaire seulement "
+"pour les vocabulaires qui utilisent une propriété peu courante pour les "
+"commentaires. Merci d’utiliser l’URI complète de la propriété entre les "
+"signes \"<\" et \">\"."
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2990,7 +3104,7 @@ msgid "Suggested class"
 msgstr "Classe suggérée"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Général"
 
@@ -3042,12 +3156,12 @@ msgid "Always"
 msgstr "Toujours"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr "Désactiver le code JSON-LD embarqué"
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3060,7 +3174,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Paramètres régionaux"
 
@@ -3077,7 +3191,7 @@ msgid "Restrict browse to attached items"
 msgstr "Limiter la navigation aux contenus attachés"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Résultats par page"
 
@@ -3214,12 +3328,12 @@ msgid "Confirm email"
 msgstr "Confirmer l’email"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Titre de l’installation"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Fuseau horaire"
 
@@ -3290,7 +3404,7 @@ msgid "Confirm"
 msgstr "Confirmer"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 "Paramètres régionaux communs / code de langue pour toutes les interfaces."
@@ -3315,41 +3429,41 @@ msgstr "Confirmer le nouveau mot de passe"
 msgid "New key label"
 msgstr "Libellé de la nouvelle clé"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Email de l’administrateur"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "Le nombre maximum de résultats par page sur les pages de navigation."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Information sur le libellé de propriété"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 "Les informations supplémentaires qui accompagnent les libellés sur les pages"
 " de ressources."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Aucun"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Afficher le vocabulaire"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Afficher le terme"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Site par défaut"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3357,15 +3471,15 @@ msgstr ""
 "Sélectionnez le site qui doit apparaître lorsque les utilisateurs passent à "
 "la première page de l’installation."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Pas de défaut (afficher l’index des sites)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Activer la notification de version."
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
@@ -3373,11 +3487,11 @@ msgstr ""
 "Activer les notifications lorsqu'une nouvelle version d'Omeka S, d'un module"
 " ou d'un thème est disponible."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr "Visibilité Privée par défaut"
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
@@ -3386,57 +3500,57 @@ msgstr ""
 "formulaire de création de nouveaux contenus, nouvelles collections et "
 "nouveaux sites."
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr "Indexer la recherche en texte intégral"
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Sécurité"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Utiliser HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Nettoyer le HTML entré par l’utilisateur."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Désactiver la validation du fichier"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 "Cochez cette case pour désactiver la vérification du type de fichier et de "
 "l’extension."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Types de supports autorisés"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Une liste séparée par des virgules de types de médias autorisés pour les "
 "fichiers importés."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Extensions de fichier autorisées"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Une liste séparée par des virgules des extensions de fichiers autorisées "
 "pour les téléchargements de fichiers."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "clé du site ReCAPTCHA"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "clé secrète ReCAPTCHA"
 
@@ -3462,8 +3576,8 @@ msgstr "comporter au moins %s chiffres."
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
-msgstr "comporter au moins %s des caractères spéciaux suivants : %s"
+msgid "contain at least %1$s symbols: %2$s"
+msgstr "comporter au moins %1$s des caractères spéciaux suivants : %2$s"
 
 #: application/src/Form/Element/PasswordConfirm.php:43
 msgid "Password must:"
@@ -3489,63 +3603,6 @@ msgstr "Couleur hexadécimale à trois ou six chiffres, ou \"transparent\""
 msgid "Invalid color format"
 msgstr "Format de couleur invalide"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Fichier Vocabulaire"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-"Choisir un fichier de vocabulaire RDF. Vous devez choisir un fichier ou "
-"indiquer une URL."
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "URL du vocabulaire"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-"Indiquer une URL vocabulaire RDF. Vous devez choisir une URL ou charger un "
-"fichier."
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "Format de fichier"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr "[Auto]"
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr "JSON-LD (.jsonld)"
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr "N-Triples (.nt)"
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr "Notation3 (.n3)"
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr "RDF/XML (.rdf)"
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr "Turtle (.ttl)"
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-"Saisir la langue de préférence pour les libellés et les commentaires en "
-"utilisant un identifiant IETF. Le premier disponible sera appliqué par "
-"défaut."
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "You must verify that you are human by completing the CAPTCHA."
@@ -3611,15 +3668,15 @@ msgstr "Droits des utilisateurs mis à jour avec succès"
 msgid "Site theme successfully updated"
 msgstr "Thème du site mis à jour avec succès"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Paramètres du thème mis à jour avec succès"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Site supprimé avec succès"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "site"
 
@@ -3697,8 +3754,8 @@ msgstr "Modèle de ressource créé avec succès. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3733,13 +3790,13 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 "Clé API créée avec succès.<br><br>Voici l’ID de votre clé et les "
 "informations d’identification pour accéder à l’API. AVERTISSEMENT : "
-"\"key_credential\" sera irrécupérable après avoir quitté cette "
-"page.<br><br>key_identity : <code>%s</code><br>key_credential : "
-"<code>%s</code>"
+"\"key_credential\" ne pourra plus être récupéré après avoir quitté cette "
+"page.<br><br>key_identity : <code>%1$s</code><br>key_credential : "
+"<code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3786,53 +3843,53 @@ msgid "Editing users. This may take a while."
 msgstr ""
 "Modification des utilisateurs en cours. Cela peut prendre un peu de temps."
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Collection créée avec succès. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Collection mise à jour avec succès"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "collection"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Collection supprimée avec succès"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Vous devez sélectionner au moins une collection pour une suppression "
 "multiple."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Collections supprimées avec succès"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Suppression de collections. Cela peut prendre un peu de temps."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Vous devez sélectionner au moins une collection pour une modification "
 "multiple."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Collections modifiées avec succès."
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 "Modification des collections en cours. Cela peut prendre un peu de temps."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "vocabulaire"
 
@@ -3841,55 +3898,55 @@ msgstr "vocabulaire"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Vocabulaire importé avec succès. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Veuillez passer en revue ces modifications avant de les accepter."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Vocabulaire mis à jour avec succès"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Changements au vocabulaire réalisés avec succès"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Vocabulaire supprimé avec succès"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Média mis à jour avec succès"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Média supprimé avec succès"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 "Vous devez sélectionner au moins un média pour effectuer une suppression "
 "multiple."
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Médias supprimés avec succès"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "Suppression des médias. Cela peut prendre un peu de temps."
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 "Vous devez sélectionner au moins un média pour effectuer une modification "
 "multiple."
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "Médias mis à jour avec succès"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "Modification des médias en cours. Cela peut prendre un peu de temps."
 
@@ -3914,26 +3971,26 @@ msgstr "Contenus supprimés avec succès"
 msgid "Deleting items. This may take a while."
 msgstr "Suppression de contenus. Cela peut prendre un peu de temps."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Contenu créé avec succès. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Contenu mis à jour avec succès"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 "Vous devez sélectionner au moins un contenu pour effectuer une modification "
 "en lot."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Contenus modifiés avec succès."
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 "Modification des contenus en cours. Cela peut prendre un peu de temps."
@@ -4064,20 +4121,20 @@ msgstr "Charger le fichier"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 "Vous devez mettre à jour Omeka S au moins vers la version 1.0.0 avant de "
-"continuer la montée vers la version %s. Vous utilisez actuellement la "
-"version %s."
+"continuer la montée vers la version %1$s. Vous utilisez actuellement la "
+"version %2$s."
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
-"La version PHP installée (%s) est trop ancienne. Omeka requiert au minimum "
-"la version %s."
+"La version PHP installée (%1$s) est trop ancienne. Omeka requiert au minimum"
+" la version %2$s."
 
 #: application/src/Stdlib/Environment.php:62
 #, php-format
@@ -4087,20 +4144,20 @@ msgstr "Omeka requiert l'extension PHP %s, mais elle n'est pas chargée."
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
-"La version MySQL installée (%s) est trop ancienne. Omeka requiert au minimum"
-" la version %s."
+"La version MySQL installée (%1$s) est trop ancienne. Omeka requiert au "
+"minimum la version %2$s."
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
-"La version de MariaDB installée (%s) est trop ancienne. Omeka requiert au "
-"minimum la version %s."
+"La version de MariaDB installée (%1$s) est trop ancienne. Omeka requiert au "
+"minimum la version %2$s."
 
 #: application/src/Permissions/Acl.php:21
 msgid "Global Administrator"
@@ -4154,55 +4211,63 @@ msgstr "Vitrine de contenus"
 msgid "Item with metadata"
 msgstr "Contenus avec métadonnées"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Alignement des vignettes"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr "Embarquement du média"
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr "Alignement"
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Inconnu [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Liste des sites"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "Alphabétique"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "À partir du plus ancien"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "À partir du plus récent"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Nombre maximum de sites"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "Une valeur vide signifie pas de limite."
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "Sans limite"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "Pagination"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr "Montrer la pagination (lorsqu’une limite est définie)"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "Montrer les descriptions"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr "Exclure le site actuel"
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Aperçu des ressources"
@@ -4312,8 +4377,8 @@ msgstr "Les médias doivent être une liste."
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "Le modèle de ressource \"%s\" requiert une valeur \"%s\""
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "Le modèle de ressource \"%1$s\" requiert une valeur \"%2$s\""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4331,39 +4396,39 @@ msgstr "Un site doit avoir un réservoir de contenus."
 msgid "A homepage must belong to its parent site."
 msgstr "Une page d'accueil doit appartenir à son site parent."
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "Navigation invalide  : la navigation doit être une liste"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Lien de navigation invalide  : type manquant"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Navigation invalide  : lien sans données"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Navigation invalide  : données du lien invalides"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Navigation invalide  : les liens vers les pages doivent être uniques"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "Navigation invalide  : les liens doivent être une liste"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr "Les médias doivent définir un ingéreur."
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr "Les médias doivent définir un ingéreur valide."
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Un média doit appartenir à un contenu."
 
@@ -5043,7 +5108,7 @@ msgstr ""
 
 #. Property label for Dublin Core:isFormatOf
 msgid "Is Format Of"
-msgstr "Est le format de"
+msgstr "Est un format de"
 
 #. Property comment for Dublin Core:isFormatOf
 msgid ""
@@ -5384,7 +5449,7 @@ msgstr "Un document audio, un enregistrement."
 
 #. Class label for Bibliographic Ontology:AudioVisualDocument
 msgid "audio-visual document"
-msgstr "document audio-visual"
+msgstr "document audiovisuel"
 
 #. Class comment for Bibliographic Ontology:AudioVisualDocument
 msgid "An audio-visual document; film, video, and so forth."
@@ -5589,11 +5654,11 @@ msgstr "Un périodique d’articles scientifiques."
 
 #. Class label for Bibliographic Ontology:LegalCaseDocument
 msgid "Legal Case Document"
-msgstr "Document d’un dossier juridique"
+msgstr "Document d’un dossier judiciaire"
 
 #. Class comment for Bibliographic Ontology:LegalCaseDocument
 msgid "A document accompanying a legal case."
-msgstr "Un document qui accompagne un dossier juridique"
+msgstr "Un document qui accompagne un dossier judiciaire"
 
 #. Class label for Bibliographic Ontology:LegalDecision
 msgid "Decision"
@@ -5814,7 +5879,7 @@ msgstr ""
 
 #. Class label for Bibliographic Ontology:Series
 msgid "Series"
-msgstr "Diaporama"
+msgstr "Série"
 
 #. Class label for Bibliographic Ontology:Slide
 msgid "Slide"
@@ -5913,7 +5978,7 @@ msgstr "proclamé par"
 
 #. Property comment for Bibliographic Ontology:affirmedBy
 msgid "A legal decision that affirms a ruling."
-msgstr "Une décision juridique qui confirme un jugement."
+msgstr "Une décision judiciaire qui confirme un jugement."
 
 #. Property label for Bibliographic Ontology:annotates
 msgid "annotates"
@@ -5979,8 +6044,8 @@ msgid ""
 "A court associated with a legal document; for example, that which issues a "
 "decision."
 msgstr ""
-"Un tribunal associé à un document juridique ; par exemple, par exemple celui"
-" à l’origine du jugement."
+"Un tribunal associé à un document judiciaire ; par exemple, par exemple "
+"celui à l’origine du jugement."
 
 #. Property label for Bibliographic Ontology:degree
 msgid "degree"
@@ -6137,7 +6202,7 @@ msgstr "abrogé par"
 
 #. Property comment for Bibliographic Ontology:reversedBy
 msgid "A legal decision that reverses a ruling."
-msgstr "Une décision juridique qui abroge un verdict."
+msgstr "Une décision judiciaire qui abroge un verdict."
 
 #. Property label for Bibliographic Ontology:reviewOf
 msgid "review of"
@@ -6159,7 +6224,7 @@ msgstr "L’état de publication d’un contenu (généralement universitaire)."
 
 #. Property label for Bibliographic Ontology:subsequentLegalDecision
 msgid "subsequentLegalDecision"
-msgstr "décision juridique ultérieure"
+msgstr "décision judiciaire ultérieure"
 
 #. Property comment for Bibliographic Ontology:subsequentLegalDecision
 msgid ""
@@ -6472,12 +6537,6 @@ msgstr "Personne"
 msgid "A person."
 msgstr "Une personne"
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-"Un agent (par exemple une personne, un groupe, un logiciel ou un artefact "
-"physique)"
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Un document."
@@ -6498,6 +6557,12 @@ msgstr "Groupe"
 msgid "A class of Agents."
 msgstr "Une classe d’Agents."
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+"Un agent (par exemple une personne, un groupe, un logiciel ou un artefact "
+"physique)"
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Projet"
diff --git a/application/language/hu_HU.mo b/application/language/hu_HU.mo
index a513f07d72..ab375e6238 100644
Binary files a/application/language/hu_HU.mo and b/application/language/hu_HU.mo differ
diff --git a/application/language/hu_HU.po b/application/language/hu_HU.po
index 228a974964..02f54ae685 100644
--- a/application/language/hu_HU.po
+++ b/application/language/hu_HU.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Tamás Dombos, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Tamás Dombos, 2019\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/omeka/teams/14184/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,18 +64,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -85,7 +86,7 @@ msgstr ""
 msgid "Welcome to your new site. This is an example page."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Böngészés"
 
@@ -94,7 +95,7 @@ msgstr "Böngészés"
 msgid "The API does not support the \"%s\" resource."
 msgstr ""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr "Alapértelmezett"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Új elem hozzáadása?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Új elemkészlet hozzáadása?"
 
@@ -196,7 +197,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -206,7 +207,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -216,12 +217,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -231,7 +232,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -241,7 +242,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -349,7 +350,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -442,8 +443,9 @@ msgid "AND"
 msgstr "ÉS"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -508,7 +510,7 @@ msgstr "Név"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Szerep"
 
@@ -541,8 +543,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -562,7 +564,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -589,7 +591,7 @@ msgstr "Keresés az alábbi elemkészletek egyikéhez tartozó elemekre"
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -601,6 +603,10 @@ msgstr "Érték eltávolítása"
 msgid "Add new item set"
 msgstr "Új elemkészlet hozzáadása"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -710,7 +716,7 @@ msgid "Block to be removed"
 msgstr ""
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -718,6 +724,7 @@ msgstr "Érték visszaállítása"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -728,17 +735,17 @@ msgstr "Érték visszaállítása"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Elemkészletek"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr ""
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -886,10 +893,6 @@ msgstr ""
 msgid "Filter item sets"
 msgstr "Elemkészletek szűrése"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Összes elemkészlet"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -927,7 +930,7 @@ msgstr "Összes"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -979,7 +982,7 @@ msgstr "Következő"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
+msgid "%1$s–%2$s of %3$s"
 msgstr ""
 
 #: application/view/common/pagination.phtml:30
@@ -1043,12 +1046,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Tulajdonság hozzáadása"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1141,18 +1144,18 @@ msgstr "Kijelentkezés"
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Felhasználók szűrése"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Összes felhasználó (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1161,7 +1164,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1183,7 +1186,7 @@ msgid "Details:"
 msgstr "Részletek"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Erőforrások"
 
@@ -1394,7 +1397,7 @@ msgstr "Elemkészletek tömeges törlése"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1440,7 +1443,7 @@ msgstr "Azonosító"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Tulajdonos"
 
@@ -1604,7 +1607,8 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1768,7 +1772,8 @@ msgstr ""
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1932,7 +1937,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2245,7 +2250,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr ""
 
@@ -2264,7 +2269,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2276,7 +2282,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2365,7 +2371,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr "Ebben a szótárban nem találhatóak típusok"
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2392,7 +2398,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2403,8 +2409,8 @@ msgstr "Honlapok"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Nyissa meg az %s oldalt a munka megkezdéséhez a %s honlapon!"
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Nyissa meg az %1$s oldalt a munka megkezdéséhez a %2$s honlapon!"
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2482,7 +2488,7 @@ msgid "Theme"
 msgstr "Téma"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2529,16 +2535,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2577,30 +2579,30 @@ msgstr ""
 msgid "Current theme"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Téma beállítások szerkesztése"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2614,16 +2616,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2699,35 +2696,39 @@ msgstr "Részletes elem keresés"
 msgid "Item"
 msgstr "Elem"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2786,24 +2787,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2842,30 +2843,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2906,7 +3000,7 @@ msgid "Suggested class"
 msgstr "Javasolt típus"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2956,12 +3050,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2971,7 +3065,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -2986,7 +3080,7 @@ msgid "Restrict browse to attached items"
 msgstr "Böngészés korlátozása a csatolt elemekre"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3112,12 +3206,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3188,7 +3282,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3212,113 +3306,113 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3344,7 +3438,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3371,56 +3465,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3486,15 +3530,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Honlap sikeresen törölve"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3570,8 +3614,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3606,7 +3650,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3649,48 +3693,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Elemkészlet sikeresen létrehozva. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Elemkészlet sikeresen módosítva"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Elemkészlet"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Elemkészlet sikeresen törölve"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Elemkészletek sikeresen törölve"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3699,51 +3743,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Szótár sikeresen törölve"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Média sikeresen törölve"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Médiák sikeresen törölve"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3767,24 +3811,24 @@ msgstr "Elemek sikeresen törölve"
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3910,14 +3954,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3928,15 +3972,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -3991,8 +4035,12 @@ msgstr "Elem bemutató"
 msgid "Item with metadata"
 msgstr "Elem metaadattal"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4000,46 +4048,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Honlapok listája"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Honlapok maximális száma"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4147,7 +4199,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4166,39 +4218,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "A médiának elemhez kell kapcsolódnia."
 
@@ -6122,10 +6174,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6146,6 +6194,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/it.mo b/application/language/it.mo
index 51b3411768..34727ad034 100644
Binary files a/application/language/it.mo and b/application/language/it.mo differ
diff --git a/application/language/it.po b/application/language/it.po
index cd1a9b73d9..ed88f6ef3b 100644
--- a/application/language/it.po
+++ b/application/language/it.po
@@ -8,16 +8,16 @@
 # Latino Imparato <latino.imparato@gmail.com>, 2018
 # Simone Falteri <s.falteri@ifnet.it>, 2018
 # Tommaso Vitale, 2019
-# Giorgio Comai <g@giorgiocomai.eu>, 2019
+# Giorgio Comai <g@giorgiocomai.eu>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Giorgio Comai <g@giorgiocomai.eu>, 2019\n"
+"Last-Translator: Giorgio Comai <g@giorgiocomai.eu>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/omeka/teams/14184/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,19 +67,19 @@ msgstr "L'adapter %1$s non supporta operazioni batch di eliminazione"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "Il campo \"%s\" non è disponibile nella classe di entità %s. "
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "Il campo \"%1$s\" non è disponibile nella classe di entità %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Accesso negato per l'utente corrente per %s la risorsa %s"
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Permesso negato all'utente attuale di %1$s la risorsa %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "Entità %s con criterio %s non trovata"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "Entità %1$s con i criteri %2$s non è stata trovata"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -89,7 +89,7 @@ msgstr "Benvenuto"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Benvenuto nel tuo nuovo sito. Questa è una pagina di esempio."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Sfoglia"
 
@@ -98,7 +98,7 @@ msgstr "Sfoglia"
 msgid "The API does not support the \"%s\" resource."
 msgstr "Questa API non supporta la risorsa \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -113,11 +113,11 @@ msgstr "Default"
 msgid "Asset uploads must be POSTed."
 msgstr "Il caricamento delle risorse deve essere inviato via POST"
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Vuoi aggiungere un altro contenuto?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Vuoi aggiungere un'altra collezione?"
 
@@ -200,8 +200,8 @@ msgstr "OpenSeadragon non è disponibile se JavaScript non è abilitato."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Il modulo \"%s\" è indicato come \"%s\" e non può essere attivato"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Il modulo \"%1$s\" è segnato come \"%2$s\" e non può essere attivato"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -210,8 +210,8 @@ msgstr "Modulo \"%s\" assente dal database durante l'attivazione"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Il modulo \"%s\" è indicato come \"%s\" e non può essere disattivato"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Il modulo \"%1$s\" è segnato come \"%2$s\" e non può essere disattivato"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -220,13 +220,13 @@ msgstr "Il modulo \"%s\" è assente dal database durante la disattivazione"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Il modulo \"%s\" è indicato come \"%s\" e non può essere installato"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Il modulo \"%1$s\" è segnato come \"%2$s\" e non può essere installato"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Il modulo \"%s\" è indicato come \"%s\" e non può essere disinstallato"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Il modulo \"%1$s\" è segnato come \"%2$s\" e non può essere disinstallato"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -237,8 +237,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Il modulo \"%s\" è indicato come \"%s\" e non può essere aggiornato"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "Il modulo \"%1$s\" è segnato come \"%2$s\" e non può essere aggiornato"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -247,8 +247,8 @@ msgstr "Il modulo \"%s\" non è stato trovato nel database durante l'aggiornamen
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "L'utente corrente non è autorizzato a %s il modulo %s."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permesse negato all'utente attuale di %1$s il modulo %2$s"
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -369,8 +369,8 @@ msgstr "La password deve contenere almeno %s cifre."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
-msgstr "La password deve contenere almeno %s simboli: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr "La password deve contenere almeno %1$s simboli: <code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -462,8 +462,9 @@ msgid "AND"
 msgstr "AND"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -517,7 +518,7 @@ msgstr "Sito sconosciuto"
 #: application/view/omeka/admin/user/browse.phtml:78
 #: application/view/omeka/admin/user/show.phtml:17
 msgid "Email"
-msgstr "email"
+msgstr "Email"
 
 #: application/src/View/Helper/SearchUserFilters.php:54
 msgid "Name"
@@ -528,7 +529,7 @@ msgstr "Nome"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Ruolo"
 
@@ -561,8 +562,8 @@ msgstr "Ha i permessi necessari per il sito"
 msgid "The maximum upload size is %s MB."
 msgstr "La dimensione massima di un upload è di %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -582,7 +583,7 @@ msgstr "La dimensione massima di un upload è di %s MB."
 msgid "Edit"
 msgstr "Modifica"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -603,14 +604,14 @@ msgstr "Espandi"
 #: application/view/common/advanced-search/item-sets.phtml:18
 msgid "Searches for items that are assigned to any of these item sets."
 msgstr ""
-"Cerca i contenuti che sono assegnati a una qualsiasi di questecollezioni."
+"Cerca i contenuti che sono assegnati ad una qualsiasi di queste collezioni."
 
 #: application/view/common/advanced-search/item-sets.phtml:34
 #: application/view/common/advanced-search/properties.phtml:75
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -622,6 +623,10 @@ msgstr "Elimina valore"
 msgid "Add new item set"
 msgstr "Aggiungi una nuova collezione"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr "Cerca per tipo di file MIME"
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "Testo della query"
@@ -648,7 +653,7 @@ msgstr "Cerca per classe"
 
 #: application/view/common/advanced-search/resource-class.phtml:18
 msgid "Searches for items that are any of these classes."
-msgstr "Ricerca contenuti apartenenti ad una qualsiasi di queste classi"
+msgstr "Ricerca contenuti appartenenti ad una qualsiasi di queste classi"
 
 #: application/view/common/advanced-search/resource-class.phtml:34
 msgid "Add new class"
@@ -672,7 +677,7 @@ msgstr "Nel pool del sito"
 
 #: application/view/common/advanced-search/users.phtml:17
 msgid "Search by email"
-msgstr "Cerca per indirizzo di posta"
+msgstr "Cerca per indirizzo email"
 
 #: application/view/common/advanced-search/users.phtml:25
 msgid "Search by name"
@@ -731,7 +736,7 @@ msgid "Block to be removed"
 msgstr "Blocco da eliminare"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -739,6 +744,7 @@ msgstr "Ripristina valore"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -749,17 +755,17 @@ msgstr "Ripristina valore"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Collezione"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Valore da eliminare"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -908,10 +914,6 @@ msgstr ""
 msgid "Filter item sets"
 msgstr "Filtra le collezioni"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Tutte le collezioni"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -949,7 +951,7 @@ msgstr "Tutto"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1001,8 +1003,8 @@ msgstr "Seguente"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%sdi %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s di %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1065,12 +1067,12 @@ msgstr "Clicca su una proprietà per aggiungerla al pannello di modifica."
 msgid "Filter properties"
 msgstr "Proprietà del filtro"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Aggiungi proprietà"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1166,18 +1168,18 @@ msgstr "Disconnessione"
 msgid "Log in"
 msgstr "Connessione"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Clicca su un utente per aggiungerlo al pannello di modifica."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtra utenti"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Tutti gli utenti (%s)"
+msgid "Users (%s)"
+msgstr "Utenti (%s)"
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1186,7 +1188,7 @@ msgstr "È disponibile una nuova versione di Omeka S. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Scarica la nuova versione."
 
@@ -1208,7 +1210,7 @@ msgid "Details:"
 msgstr "Dettagli:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Risorse"
 
@@ -1421,7 +1423,7 @@ msgstr "Modifica le collezioni per lotti"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1467,7 +1469,7 @@ msgstr "Identificativo"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Proprietario"
 
@@ -1631,9 +1633,10 @@ msgstr "Sei sicuro di voler eliminare le collezioni selezionate?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: questa azione eliminerà in modo permanente %s collezioni e non potrà "
+"%1$s: questa azione cancellerà definitivamente %2$s collezioni e non può "
 "essere annullata."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1799,10 +1802,11 @@ msgstr "Sei sicuro di voler eliminare i contenuti selezionati?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: questa azione eliminerà definitivamente %s contenuti e non potrà essere "
-"annullata."
+"%1$s: questa azione eliminerà definitivamente %2$s contenuti e non può "
+"essere annullata."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1971,9 +1975,9 @@ msgstr "Elimina media"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: questa azione eliminerà definitivamente %s media e non potrà essere "
+"%1$s: questa azione eliminerà definitivamente %2$s media e non può essere "
 "annullata."
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2251,7 +2255,7 @@ msgstr "Elimina proprietà"
 
 #: application/view/omeka/admin/resource-template/show.phtml:10
 msgid "Export"
-msgstr "Esportazione"
+msgstr "Esporta"
 
 #: application/view/omeka/admin/resource-template/show.phtml:12
 msgid "Edit resource template"
@@ -2292,7 +2296,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "Sati modificando %s utenti (eccetto te stesso)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Aggiungi un utente"
 
@@ -2311,10 +2315,11 @@ msgstr "Sei sicuro di voler eliminare gli utenti selezionati?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
-"%s: questa azione eliminerà in modo definitivo %s utenti e non potrà essere "
-"annullata"
+"%1$s: questa azione eliminerà definitivamente %2$s utenti e non può essere "
+"annullata."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2327,11 +2332,11 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
-"%s: questa azione eliminerà in modo definitivo %s utenti (eccetto te stesso)"
-" e non può essere annullata"
+"%1$s: questa azione eliminerà definitivamente %2$s utenti (escluso l'utente "
+"attuale) e non può essere annullata."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2418,7 +2423,7 @@ msgstr "URI spazio nomi:"
 msgid "This vocabulary has no classes."
 msgstr "Questo vocabolario non possiede classi."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2447,7 +2452,7 @@ msgstr "Accetta le modifiche"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2458,8 +2463,8 @@ msgstr "Siti"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Vai a %s per iniziare a lavorare con %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Vai a %1$s per iniziare a lavorare con %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2483,7 +2488,7 @@ msgstr "Password dimenticata"
 
 #: application/view/omeka/login/forgot-password.phtml:11
 msgid "Send password reset email"
-msgstr "Invia email di reset della password"
+msgstr "Invia email di ripristino della password"
 
 #: application/view/omeka/login/login.phtml:7
 msgid "Forgot password?"
@@ -2544,7 +2549,7 @@ msgid "Theme"
 msgstr "Tema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Pool di contenuti"
 
@@ -2591,16 +2596,12 @@ msgstr "Filtra le pagine"
 msgid "There are no available pages."
 msgstr "Non ci sono pagine disponibili."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Ripristina la collezione"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Ci sono attualmente %s elementi nel pool di questo sito."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Nessuna collezione è assegnata a questo sito."
 
@@ -2639,30 +2640,30 @@ msgstr "Il tema corrente non ha opzioni di configurazione."
 msgid "Current theme"
 msgstr "Tema corrente"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Modifica le impostazioni del tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "È disponibile una nuova versione di questo tema. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Errore: questo tema non è valido."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2679,18 +2680,13 @@ msgstr "Ripristina"
 msgid "User permissions"
 msgstr "Autorizzazioni dell'utente"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Utente da eliminare"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Questo sito non ha utenti. Aggiungere utenti servendosi dell'interfaccia a "
 "destra."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Clicca su un utente per aggiungerlo al sito."
 
@@ -2766,35 +2762,39 @@ msgstr "Ricerca avanzata di contenuti"
 msgid "Item"
 msgstr "Contenuto"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Qualcosa è andato storto"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Ci sono modifiche non salvate."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Ripristina la collezione"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Chiudi set di icone"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Apri set di icone"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Impossibile caricare da API il modello di risorsa"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Ripristina proprietà"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Inserisci un tag lingua valido"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Descrizione"
 
@@ -2853,29 +2853,29 @@ msgstr "nessun titolo"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
-"Errore di convalida \"%s\". Impossibile memorizzare i file col tipo di media"
-" \"%s\"."
+"Errore nella validazione di \"%1$s\". Non è possibile salvare file di tipo "
+"\"%2$s\"."
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
-"Errore di convalida \"%s\". Impossibile memorizzare i file con estensione "
-"risolta \"%s\"."
+"Errore nella validazione di \"%1$s\". Non è possibile salvare file con "
+"estensione \"%2$s\"."
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Errore nello scaricare %s: %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Errore nello scaricamento di %1$s: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Errore nello scaricare %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Errore nello scaricamento di %1$s: %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2914,35 +2914,144 @@ msgstr "Configurazione del fallback della miniatura non valida."
 msgid "Resource template file"
 msgstr "File del modello di risorsa"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
-msgstr ""
-"Un identificatore conciso del vocabolario, usato come abbreviazione dell' "
-"URI spazio nomi."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr "Informazioni di base"
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr "File"
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr "Avanzate"
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr "Inserisci un titolo del vocabolario leggibile da umani"
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr "Inserisci una descrizione del vocabolario leggibile da umani"
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "URI spazio nomi"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+"Inserisci l'URI unica del namespace utilizzato per identificare le classi e "
+"le proprietà del vocabolario"
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr "Prefisso del namespace"
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+"Inserisci un identificativo conciso del vocabolario da utilizzare come forma"
+" breve dell'URI del namespace"
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "File del Vocabolario"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+"Scegli un file di vocabolario RDF. Puoi selezionare un file o inserire un "
+"URL qui sotto"
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "URL del vocabolario"
+
+#: application/src/Form/VocabularyForm.php:106
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
 msgstr ""
-"URI spazio nomi unico utilizzato dal vocabolario per identificare le classi "
-"e le proprietà dei membri locali."
+"Inserisci l'URL di un vocabolario RDF. Devi inserire una URL o selezionare "
+"un file più in alto "
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Un titolo del vocabolario leggibile dall'uomo."
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Formato del file"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr "[Auto-rilevazione]"
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr "JSON-LD (.jsonld)"
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr "N-Triples (.nt)"
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Una descrizione del vocabolario leggibile dall'uomo."
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr "Notation3 (.n3)"
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr "RDF/XML (.rdf)"
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr "Turtle (.ttl)"
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr "Lingua preferita"
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+"Inserisci la lingua preferita per le etichette e i commenti utilizzando un "
+"<a target=\"_blank\" href=\"https://www.w3.org/International/articles"
+"/language-tags/\">tag lingua IETF</a>. Come opzione predefinita, mostra la "
+"prima disponibile."
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr "Proprietà dell'etichetta"
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+"Inserisci la proprietà dell'etichetta. Tipicamente c'è bisogno di fornire "
+"questa informazione solo se il vocabolario utilizza proprietà per le "
+"etichette non convenzionali. Si prega di usare l'URI della proprietà per "
+"intero, racchiudendola in parentesi angolari."
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr "Commento alla proprietà"
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
+"Inserisci un commento alla proprietà. Tipicamente vi è bisogno di fornire "
+"questa informazione solo se il vocabolario utilizza una proprietà non "
+"convenzionale per i commenti. Si prega di usare l'URI della proprietà per "
+"intero, racchiudendola in parentesi angolari."
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2984,7 +3093,7 @@ msgid "Suggested class"
 msgstr "Classi suggerite"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Generale"
 
@@ -3036,12 +3145,12 @@ msgid "Always"
 msgstr "Sempre"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr "Disabilita JSON-LD incorporato"
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3054,7 +3163,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Lingua"
 
@@ -3071,7 +3180,7 @@ msgid "Restrict browse to attached items"
 msgstr "Limita la navigazione ai contenuti allegati"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Risultati per pagina"
 
@@ -3206,12 +3315,12 @@ msgid "Confirm email"
 msgstr "Conferma email"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Titolo dell'installazione"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Fuso Orario"
 
@@ -3282,7 +3391,7 @@ msgid "Confirm"
 msgstr "Conferma"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "Codice lingua globale per tutte le interfacce."
 
@@ -3306,42 +3415,42 @@ msgstr "Conferma la nuova password"
 msgid "New key label"
 msgstr "Etichetta della nuova key"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Email dell'Amministratore"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 "Il numero massimo di risultati per pagina sulle pagine di navigazione."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Informazioni sull'etichetta della proprietà"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 "Le informazioni aggiuntive che accompagnano le etichette sulle pagine delle "
 "risorse."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Nessuno"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Mostra Vocabolario"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "Mostra Termine"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Sito predefinito"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3349,15 +3458,15 @@ msgstr ""
 "Seleziona quale sito dovrebbe apparire quando gli utenti vanno alla prima "
 "pagina dell'installazione."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Nessun sito predefinito (mostra l'indice dei siti)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Attiva le notifiche di versione"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
@@ -3365,11 +3474,11 @@ msgstr ""
 "Abilita le notifiche quando una nuova versione di Omeka S, di moduli o temi "
 "sono disponibili."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr "Visibilità del contenuto predefinita come Privata"
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
@@ -3377,57 +3486,57 @@ msgstr ""
 "Se attivato, tutti i nuovi contenuti, le nuove collezioni e i nuovi siti "
 "avranno la visibilità predefinita impostata come Privata. "
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr "Indicizza per la ricerca su tutto il testo"
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Sicurezza"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Utilizza HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Pulisci l'HTML inserito dall'utente."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Disattiva la convalida dei file"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 "Spunta questa opzione per disabilitare la convalida del tipo e "
 "dell'estensione dei media."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Tipi di media consentiti"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Un elenco separato da virgole dei tipi di media consentiti per il "
 "caricamento dei file."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Estensioni di file consentite"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Un elenco separato da virgole delle estensioni di file consentite per il "
 "caricamento dei file."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "key reCAPTCHA del sito"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "key segreta reCAPTCHA"
 
@@ -3453,8 +3562,8 @@ msgstr "contenere almeno %s cifre."
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
-msgstr "contenere almeno %s simboli: %s"
+msgid "contain at least %1$s symbols: %2$s"
+msgstr "contiene almeno %1$s simboli: %2$s"
 
 #: application/src/Form/Element/PasswordConfirm.php:43
 msgid "Password must:"
@@ -3480,63 +3589,6 @@ msgstr "colore esadecimale a tre o sei cifre, o \"transparent\""
 msgid "Invalid color format"
 msgstr "Formato colore non valido"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "File del Vocabolario"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-"Scegli un file di vocabolario RDF. È necessario scegliere un file o inserire"
-" un URL."
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "URL del vocabolario"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-"Inserisci l'URL di un vocabolario in formato RDF. Devi inserire un URL o "
-"scegliere un file."
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "Formato del file"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr "[Auto-rilevazione]"
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr "JSON-LD (.jsonld)"
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr "N-Triples (.nt)"
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr "Notation3 (.n3)"
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr "RDF/XML (.rdf)"
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr "Turtle (.ttl)"
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-"Inserisci la lingua preferita per etichette e commenti utilizzando il tag "
-"lingua IETF. L'opzione predefinita corrisponde alla prima lingua "
-"disponibile."
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Devi verificare di essere un umano completando il CAPTCHA."
@@ -3602,15 +3654,15 @@ msgstr "Autorizzazioni dell'utente aggiornate con successo"
 msgid "Site theme successfully updated"
 msgstr "Tema del sito aggiornato con successo"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Impostazioni del tema aggiornate con successo"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Sito eliminato con successo"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "sito"
 
@@ -3657,7 +3709,7 @@ msgstr "Creazione della password non riuscita"
 #: application/src/Controller/LoginController.php:168
 msgid "Check your email for instructions on how to reset your password"
 msgstr ""
-"Controlla la tua email per le istruzioni su come reimpostare la tua password"
+"Controlla la tua email per istruzioni su come ripristinare la tua password"
 
 #: application/src/Controller/LoginController.php:171
 msgid "Activation unsuccessful"
@@ -3687,8 +3739,8 @@ msgstr "Modello di risorsa creato con successo. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3723,10 +3775,12 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
-"API key creata con successo.<br><br>Qui di seguito troverai la tua key ID e le credenziali per l'accesso all'API. ATTENZIONE: \"key_credential\" sarà irrecuperabile dopo che uscirai da questa pagina.\n"
-".<br><br>key_identity: <code>%s</code><br>key_credential: <code>%s</code>"
+"Chiave API create con successo. <br><br> Qui c'è l'ID della tua chiave e le "
+"credenziali per accedere alle API. ATTENZIONE: \"key_credential\" delle API "
+"non sarà recuperabile dopo aver abbandonato questa pagina. "
+"<br><br>key_identity: <code>%1$s</code><br>key_credential: <code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3769,51 +3823,51 @@ msgstr "Utenti modificati con successo"
 msgid "Editing users. This may take a while."
 msgstr "Modifica degli utenti. Potrebbe volerci un po' di tempo"
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Collezione creata con successo. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Collezione aggiornata con successo"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Collezione"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Collezione eliminata con successo"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Per eliminare per lotti è necessario selezionare almeno una collezione."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Collezioni eliminate con successo"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Eliminazione delle collezioni. Potrebbe volerci un po' di tempo."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Per una modificazione per lotti è necessario selezionare almeno una "
 "collezione."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Collezioni modificate con successo"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Modifica delle collezioni. Potrebbe volerci un po' di tempo."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "vocabolario"
 
@@ -3822,52 +3876,52 @@ msgstr "vocabolario"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Vocabolario importato con successo. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Rivedi queste modifiche prima di accettarle."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Vocabolario aggiornato con successo"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Modifiche al vocabolario apportate con successo"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Vocabolario eliminato con successo"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Media aggiornato con successo"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Media eliminato con successo"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr "Devi selezionare almeno un media per l'eliminazione per lotti."
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "Media eliminati con successo"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "Eliminazione dei media. Potrebbe volerci un po' di tempo"
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 "Per una modificazione per lotti è necessario selezionare almeno un media."
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "Media modificati con successo."
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "Modifica dei media. Potrebbe volerci un po' di tempo."
 
@@ -3891,25 +3945,25 @@ msgstr "Contenuti eliminati con successo"
 msgid "Deleting items. This may take a while."
 msgstr "Eliminazione di contenuti. Potrebbe volerci un po' di tempo."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Contenuto creato con successo. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Contenuto aggiornato con successo"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 "Per modificare per lotti è necessario selezionare almeno un contenuto."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Contenuto modificato con successo."
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Modifica dei contenuti. Potrebbe volerci un po' di tempo."
 
@@ -4039,19 +4093,19 @@ msgstr "Carica il file"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 "Devi aggiornare Omeka S almeno alla versione 1.0.0 prima di aggiornare alla "
-"versione %s. Stai attualmente utilizzando la versione %s."
+"versione %1$s. Stai attualmente utilizzando la versione %2$s."
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
-"La versione di PHP installata (%s) è troppo bassa. Omeka necessita almeno "
-"della versione %s."
+"La versione di PHP installata (%1$s) è troppo bassa. Omeka ha bisogno almeno"
+" della versione %2$s."
 
 #: application/src/Stdlib/Environment.php:62
 #, php-format
@@ -4061,20 +4115,20 @@ msgstr "Omeka necessita dell'estensione PHP %s, ma questa non è caricata."
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
-"La versione di MySQL installata (%s) è troppo bassa. Omeka necessita almeno "
-"della versione %s."
+"La versione di MySQL installata (%1$s) è troppo bassa. Omeka ha bisogno "
+"almeno della versione %2$s."
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
-"La versione di MariaDB installata (%s) è troppo vecchia. Omeka richiede "
-"versioni uguali o superiori alla %s."
+"La versione di MariaDB installata (%1$s) è troppo bassa. Omeka ha bisogno "
+"almeno della versione %2$s."
 
 #: application/src/Permissions/Acl.php:21
 msgid "Global Administrator"
@@ -4128,55 +4182,63 @@ msgstr "Vetrina contenuti"
 msgid "Item with metadata"
 msgstr "Contenuto con metadati"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Allineamento miniature"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr "Includi media"
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr "Allineamento"
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Sconosciuto [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "Lista dei siti"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "Prima il più vecchio"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "Prima il più recente"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "Numero massimo di siti"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "Un'assenza di valore significa nessun limite."
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "Illimitato"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "Paginazione"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr "Mostra impaginazione (solo se è impostato un limite)"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "Mostra sintesi"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr "Escludi il sito attuale"
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Consulta l'anteprima"
@@ -4286,8 +4348,8 @@ msgstr "Il media deve essere un array."
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "Il template risorsa \"%s\" richiede un valore \"%s\""
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "Il modello di risorsa \"%1$s\" richiede un valore \"%2$s\""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4305,39 +4367,39 @@ msgstr "Un sito deve avere i dati del pool di contenuti."
 msgid "A homepage must belong to its parent site."
 msgstr "Una homepage deve essere parte del sito per il quale viene scelta. "
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "Navigazione non valida: la navigazione deve essere un array"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Navigazione non valida: tipo di link mancante"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Navigazione non valida: dati del link mancanti"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Navigazione non valida: dati del link non validi"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Navigazione non valida: i link alle pagine devono essere unici."
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "Navigazione non valida: i links devono essere un array"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr "Il media deve impostare un ingester."
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr "Il media deve impostare un ingester valido."
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Il media deve appartenere a un contenuto."
 
@@ -6436,10 +6498,6 @@ msgstr "Persona"
 msgid "A person."
 msgstr "Una persona."
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr "Un soggetto (es. persona, gruppo, software o artefatto fisico)."
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Un documento."
@@ -6460,6 +6518,10 @@ msgstr "Gruppo"
 msgid "A class of Agents."
 msgstr "Una classe di Soggetti"
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr "Un soggetto (es. persona, gruppo, software o artefatto fisico)."
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Progetto"
diff --git a/application/language/ja.mo b/application/language/ja.mo
index 7a4d85799e..edec527e5c 100644
Binary files a/application/language/ja.mo and b/application/language/ja.mo differ
diff --git a/application/language/ja.po b/application/language/ja.po
index b0e168645c..77b3b921ee 100644
--- a/application/language/ja.po
+++ b/application/language/ja.po
@@ -6,16 +6,16 @@
 # Translators:
 # Takayuki Ako <ako.t.aa@m.titech.ac.jp>, 2017
 # Souta Ito <soutaito@info-lounge.jp>, 2018
-# Naosuke Okamoto, 2019
+# Naosuke Okamoto, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Naosuke Okamoto, 2019\n"
+"Last-Translator: Naosuke Okamoto, 2020\n"
 "Language-Team: Japanese (https://www.transifex.com/omeka/teams/14184/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,19 +65,19 @@ msgstr "%1$s アダプターは一括削除操作を実装しません。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "「%s」フィールドは エンティティクラス  %s で使用できません。。"
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "「%1$s」フィールドは エンティティクラス  %2$s で使用できません。。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "現在のユーザーが %s する権限 （%sに対する） が拒否されました。"
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "現在のユーザーが %2$sリソースに対し%1$sする権限 が拒否されました。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "%s エンティティ（ %s 基準）が見つかりません"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "%1$s エンティティ（ %2$s 基準）が見つかりません"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -87,7 +87,7 @@ msgstr "ようこそ"
 msgid "Welcome to your new site. This is an example page."
 msgstr "新しいサイトへようこそ。こちらはサンプルページです。"
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "閲覧"
 
@@ -96,7 +96,7 @@ msgstr "閲覧"
 msgid "The API does not support the \"%s\" resource."
 msgstr "APIは \"%s\" リソースをサポートしていません。"
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -111,11 +111,11 @@ msgstr "デフォルト"
 msgid "Asset uploads must be POSTed."
 msgstr "アセットのアップロードはPOSTする必要があります。"
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "別のアイテムを追加しますか？"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "別のアイテムセットを追加しますか？"
 
@@ -198,8 +198,8 @@ msgstr "OpenSeadragonは、JavaScriptが有効になっていない限り利用
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "モジュール \"%s\" は \"%s\"  としてマークされており、有効化できません"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "モジュール \"%1$s\" は \"%2$s\"  としてマークされており、有効化できません"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -208,8 +208,8 @@ msgstr "モジュール  \"%s\" はデータベースにないため有効化で
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "モジュール \"%s\" は \"%s\"  としてマークされており、無効化できません"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "モジュール \"%1$s\" は \"%2$s\"  としてマークされており、無効化できません"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -218,13 +218,13 @@ msgstr "モジュール  \"%s\" はデータベースにないため無効化で
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "モジュール \"%s\" は \"%s\"  としてマークされており、インストールできません"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "モジュール \"%1$s\" は \"%2$s\"  としてマークされており、インストールできません"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "モジュール \"%s\" は \"%s\"  としてマークされており、アンインストールできません"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "モジュール \"%1$s\" は \"%2$s\"  としてマークされており、アンインストールできません"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -233,8 +233,8 @@ msgstr "モジュール  \"%s\" はデータベースにないためアンイン
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "モジュール \"%s\" は \"%s\"  としてマークされており、更新できません"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "モジュール \"%1$s\" は \"%2$s\"  としてマークされており、更新できません"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -243,8 +243,8 @@ msgstr "モジュール  \"%s\" はデータベースにないため更新でき
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "現在のユーザーが %s する権限がありません。： %s モジュール"
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "現在のユーザーは %2$s モジュールを %1$s する権限がありません。"
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -351,27 +351,27 @@ msgstr "キャンセル"
 #: application/src/View/Helper/PasswordRequirements.php:40
 #, php-format
 msgid "Password must be a minimum of %s characters in length."
-msgstr ""
+msgstr "パスワードは最低%s文字である必要があります。"
 
 #: application/src/View/Helper/PasswordRequirements.php:46
 #, php-format
 msgid "Password must contain at least %s lowercase characters."
-msgstr ""
+msgstr "パスワードは%s個の小文字を含む必要があります。"
 
 #: application/src/View/Helper/PasswordRequirements.php:52
 #, php-format
 msgid "Password must contain at least %s uppercase characters."
-msgstr ""
+msgstr "パスワードは%s個の大文字を含む必要があります。"
 
 #: application/src/View/Helper/PasswordRequirements.php:58
 #, php-format
 msgid "Password must contain at least %s numbers."
-msgstr ""
+msgstr "パスワードは%s個の数字を含む必要があります。"
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
-msgstr ""
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr "パスワードは%1$s個の記号を含む必要があります。：<code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -416,7 +416,7 @@ msgstr "値が無い"
 #: application/src/View/Helper/SearchFilters.php:47
 #: application/view/common/advanced-search/fulltext.phtml:6
 msgid "Search full-text"
-msgstr ""
+msgstr "全文検索"
 
 #: application/src/View/Helper/SearchFilters.php:60
 #: application/view/common/linked-resources.phtml:33
@@ -463,8 +463,9 @@ msgid "AND"
 msgstr "AND"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -529,7 +530,7 @@ msgstr "名前"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "役割"
 
@@ -562,8 +563,8 @@ msgstr "サイトの権限あり"
 msgid "The maximum upload size is %s MB."
 msgstr "最大アップロード容量は %s MBです。"
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -583,7 +584,7 @@ msgstr "最大アップロード容量は %s MBです。"
 msgid "Edit"
 msgstr "編集"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -610,7 +611,7 @@ msgstr "これらのアイテムセットのいずれかに割り当てられた
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -622,6 +623,10 @@ msgstr "値を削除"
 msgid "Add new item set"
 msgstr "新規アイテムセットを追加"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr "MIMEタイプから検索"
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr "クエリ（問い合わせ） テキスト"
@@ -731,7 +736,7 @@ msgid "Block to be removed"
 msgstr "削除をブロック"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -739,6 +744,7 @@ msgstr "値の復元"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -749,17 +755,17 @@ msgstr "値の復元"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "アイテムセット"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "削除された値"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -907,10 +913,6 @@ msgstr "アイテムセットをクリックして編集パネルに追加しま
 msgid "Filter item sets"
 msgstr "アイテムセットをフィルター"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "全てのアイテムセット"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -948,7 +950,7 @@ msgstr "全て"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1000,8 +1002,8 @@ msgstr "次"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s / 全%s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s of %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1064,12 +1066,12 @@ msgstr "プロパティをクリックして編集パネルに追加します。
 msgid "Filter properties"
 msgstr "プロパティをフィルター"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "プロパティを追加"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1164,18 +1166,18 @@ msgstr "ログアウト"
 msgid "Log in"
 msgstr "ログイン"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "ユーザーをクリックして編集パネルに追加します。"
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "ユーザーをフィルター"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "全ユーザー (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1184,7 +1186,7 @@ msgstr "Omeka Sの新しいバージョンが利用可能です。 %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "新バージョンを取得"
 
@@ -1206,7 +1208,7 @@ msgid "Details:"
 msgstr "詳細："
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "リソース一覧"
 
@@ -1218,7 +1220,7 @@ msgstr "管理"
 
 #: application/view/layout/layout-admin.phtml:37
 msgid "Skip to main content"
-msgstr ""
+msgstr "メインコンテンツにスキップ"
 
 #: application/view/layout/layout-admin.phtml:42
 msgid "Navigation menu"
@@ -1417,7 +1419,7 @@ msgstr "アイテムセットの一括編集"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1463,7 +1465,7 @@ msgstr "資源識別子／Identifier"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "所有者"
 
@@ -1627,8 +1629,9 @@ msgstr "選択したアイテムセットを削除してもよろしいですか
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
-msgstr "%s: このアクションは %s アイテムセットを完全に削除し、元に戻すことはできません。"
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
+msgstr "%1$s: このアクションは %2$s アイテムセットを完全に削除し、元に戻すことはできません。"
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1791,8 +1794,9 @@ msgstr "選択したアイテムを削除してもよろしいですか？"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
-msgstr "%s: このアクションは %s アイテムを完全に削除し、元に戻すことはできません。"
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
+msgstr "%1$s: このアクションは %2$s アイテムを完全に削除し、元に戻すことはできません。"
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1852,7 +1856,7 @@ msgstr "フィルター検索"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:57
 msgid "Filter by item ID"
-msgstr ""
+msgstr "アイテムIDでフィルター"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:67
 msgid "Quick add"
@@ -1955,8 +1959,8 @@ msgstr "選択したメディアを削除してもよろしいですか？"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
-msgstr "%s：この操作はメディアを永久に削除し%s 、元に戻すことはできません。"
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
+msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2149,11 +2153,11 @@ msgstr "その他のオプション"
 
 #: application/view/omeka/admin/resource-template/form.phtml:72
 msgid "Use for resource title"
-msgstr ""
+msgstr "リソースのタイトルに使用"
 
 #: application/view/omeka/admin/resource-template/form.phtml:78
 msgid "Use for resource description"
-msgstr ""
+msgstr "リソース記述に使用"
 
 #: application/view/omeka/admin/resource-template/form.phtml:84
 msgid "Required"
@@ -2268,7 +2272,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr "あなたは（自分以外の）%s ユーザーを編集しています。"
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "新規ユーザーの追加"
 
@@ -2287,8 +2291,9 @@ msgstr "選択したユーザーを削除してよろしいですか？"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
-msgstr "%s：この操作はユーザーを永久に削除し %s 、元に戻すことはできません。"
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
+msgstr "%1$s：この操作はユーザーを永久に削除し %2$s 、元に戻すことはできません。"
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2299,9 +2304,9 @@ msgstr "この結果のすべてのページのすべてのユーザー（自分
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
-msgstr "%s：この操作は（自分以外の）ユーザーを永久に削除し %s 、元に戻すことはできません。"
+msgstr "%1$s：この操作は（自分以外の）ユーザーを永久に削除し %2$s 、元に戻すことはできません。"
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2388,11 +2393,11 @@ msgstr "名前空間URI："
 msgid "This vocabulary has no classes."
 msgstr "この語彙はクラスがありません。"
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
-msgstr ""
+msgstr "この語彙を新しいバージョンに更新できます。 同意する前に変更を確認できます。"
 
 #: application/view/omeka/admin/vocabulary/import.phtml:7
 msgid "New vocabulary"
@@ -2415,7 +2420,7 @@ msgstr "変更を承認"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2426,8 +2431,8 @@ msgstr "サイト一覧"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "%sするために%sに移動。"
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "%1$sするために%2$sに移動。"
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2478,12 +2483,13 @@ msgid ""
 "The entire site will be down for maintenance until you click the button "
 "below."
 msgstr ""
+"最近のソフトウェアアップグレードがあり、データベースを更新する必要があります。 下のボタンをクリックするまで、サイト全体が保守のために停止します。"
 
 #: application/view/omeka/migrate/index.phtml:10
 msgid ""
 "There are environment errors that must be resolved before you can update the"
 " database."
-msgstr ""
+msgstr "データベースを更新する前に解決する必要がある環境エラーがあります。"
 
 #: application/view/omeka/site-admin/index/add-page.phtml:6
 msgid "New page"
@@ -2505,7 +2511,7 @@ msgid "Theme"
 msgstr "テーマ"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "アイテムプール"
 
@@ -2538,7 +2544,7 @@ msgstr "サイトページのリンク追加"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:28
 msgid "Select a homepage"
-msgstr ""
+msgstr "ホームページを選択"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:32
 msgid "Add a custom link"
@@ -2552,16 +2558,12 @@ msgstr "ページをフィルター"
 msgid "There are no available pages."
 msgstr "ページがありません。"
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "アイテムセットの復元"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "このサイトのプールには現在 %s のアイテムがあります。"
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "このサイトにはアイテムセットが割り当てられていません。"
 
@@ -2600,30 +2602,30 @@ msgstr "現在のテーマは設定オプションがありません"
 msgid "Current theme"
 msgstr "現在のテーマ"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "テーマ設定を編集"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "このテーマの新バージョンが利用可能です。 %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Error: テーマが無効です。"
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "状態： %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2637,16 +2639,11 @@ msgstr "復元"
 msgid "User permissions"
 msgstr "ユーザー権限"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "ユーザーを削除"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr "このサイトにはユーザーはいません。 右側のインターフェースを使用してユーザーを追加します。"
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "ユーザーをクリックしてサイトに追加します。"
 
@@ -2693,22 +2690,22 @@ msgstr "このサイトにはページがありません。"
 #: application/view/omeka/site/index/search.phtml:1
 #, php-format
 msgid "Search results for “%s”"
-msgstr ""
+msgstr "\"%s\" の検索結果"
 
 #: application/view/omeka/site/index/search.phtml:11
 #: application/view/omeka/site/index/search.phtml:32
 #, php-format
 msgid "View all results (%s total)"
-msgstr ""
+msgstr "すべての結果を表示（全%s）"
 
 #: application/view/omeka/site/index/search.phtml:20
 #: application/view/omeka/site/page/browse.phtml:18
 msgid "No pages found"
-msgstr ""
+msgstr "ページがありません"
 
 #: application/view/omeka/site/index/search.phtml:41
 msgid "No items found"
-msgstr ""
+msgstr "アイテムがありません"
 
 #: application/view/omeka/site/item-set/search.phtml:6
 msgid "Advanced item set Search"
@@ -2722,35 +2719,39 @@ msgstr "高度なアイテム検索"
 msgid "Item"
 msgstr "アイテム"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "間違いがあります"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "保存されていない変更があります。"
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "アイテムセットの復元"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "アイコンセットを閉じる"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "アイコンセットを開く"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "APIからのリソーステンプレートの読み込みに失敗しました"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "プロパティを復元"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "有効な言語タグを入力してください"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "内容記述／Description"
 
@@ -2809,25 +2810,25 @@ msgstr "タイトル無し"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
-msgstr "\"%s\"の検証中にエラーが発生しました。 メディアタイプが \"%s\"のファイルは保存できません。"
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
+msgstr "\"%1$s\"の検証中にエラーが発生しました。 メディアタイプが \"%2$s\"のファイルは保存できません。"
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
-msgstr "\"%s\"の検証中にエラーが発生しました。拡張子 \"%s\"のファイルは保存できません。"
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
+msgstr "\"%1$s\"の検証中にエラーが発生しました。拡張子 \"%2$s\"のファイルは保存できません。"
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "%sのダウンロード中にエラーが発生しました: %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "%1$sのダウンロード中にエラーが発生しました: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "%sのダウンロード中にエラーが発生しました: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "%1$sのダウンロード中にエラーが発生しました: %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2865,31 +2866,130 @@ msgstr "サムネイルの代替設定が無効です。"
 msgid "Resource template file"
 msgstr "リソーステンプレートファイル"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
-msgstr "簡潔な語彙の識別子。名前空間URIの省略形プロキシとして使用します。"
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr "基本情報"
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr "ファイル"
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr "詳細"
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr "人が理解できる語彙のタイトルを入力します。"
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr "人が理解できる語彙の内容説明を入力します。"
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "名前空間URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr "語彙のクラスとプロパティを識別するために使用される一意の名前空間URIを入力します。"
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr "名前空間の接頭語"
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr "名前空間URIの省略形として使用される、簡潔な語彙識別子を入力します。"
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "語彙ファイル"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr "RDF語彙ファイルを選択してください。 ファイルを選択するか、以下にURLを入力する必要があります。"
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "語彙URL"
+
+#: application/src/Form/VocabularyForm.php:106
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
-msgstr "ローカルメンバーのクラスとプロパティを識別するために、語彙が使用する一意の名前空間URI。"
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr "RDF語彙URLを入力してください。 URLを入力するか、上記のファイルを選択する必要があります。"
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "ファイルフォーマット"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr "[自動検出]"
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr "JSON-LD (.jsonld)"
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "人が理解できる語彙のタイトル。"
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr "N-Triples (.nt)"
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "人が理解できる語彙の内容説明。"
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr "Notation3 (.n3)"
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr "RDF/XML (.rdf)"
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr "Turtle (.ttl)"
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr "優先する言語"
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+"<a target=\"_blank\" href=\"https://www.w3.org/International/articles"
+"/language-tags/\">IETF言語タグ</a>を使用して、ラベルとコメントの優先言語を入力します。 デフォルトは利用可能な最初のものです。"
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr "ラベルプロパティ／Label Property"
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+"ラベルプロパティを入力します。 これは通常、語彙がラベルに慣例に沿わないプロパティを使用する場合にのみ必要です。 "
+"山括弧で囲まれた完全なプロパティURIを使用してください。"
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr "コメントプロパティ／Comment property"
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
+"コメントプロパティを入力してください。 これは通常、ボキャブラリーがコメントに慣例に沿わないプロパティを使用する場合にのみ必要です。 "
+"山括弧で囲まれた完全なプロパティURIを使用してください。"
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2929,7 +3029,7 @@ msgid "Suggested class"
 msgstr "推奨されるクラス"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "一般"
 
@@ -2955,7 +3055,7 @@ msgstr "アイテムページの埋め込みメディア"
 
 #: application/src/Form/SiteSettingsForm.php:63
 msgid "Show page pagination"
-msgstr ""
+msgstr "ページ付けを表示します"
 
 #: application/src/Form/SiteSettingsForm.php:64
 msgid ""
@@ -2979,12 +3079,12 @@ msgid "Always"
 msgstr "常に"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr "JSON-LDの埋め込みを無効化"
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2996,7 +3096,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "ロケール"
 
@@ -3011,7 +3111,7 @@ msgid "Restrict browse to attached items"
 msgstr "添付されたアイテムへの閲覧を制限する"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "ページ毎の結果"
 
@@ -3034,6 +3134,7 @@ msgid ""
 "Use this property for the heading of each resource on a browse page. Keep "
 "unselected to use the default title property of each resource."
 msgstr ""
+"このプロパティは、参照ページの各リソースの見出しに使用します。 各リソースのデフォルトのタイトルプロパティを使用するには、選択しないでください。"
 
 #: application/src/Form/SiteSettingsForm.php:161
 #: application/src/Form/SiteSettingsForm.php:178
@@ -3049,6 +3150,7 @@ msgid ""
 "Use this property for the body of each resource on a browse page. Keep "
 "unselected to use the default description property of each resource."
 msgstr ""
+"ブラウズページの各リソースの本文にこのプロパティを使用します。 各リソースのデフォルトの説明プロパティを使用するには、選択しないでください。"
 
 #: application/src/Form/SiteSettingsForm.php:195
 msgid "Templates"
@@ -3064,7 +3166,7 @@ msgstr "テンプレートを選択"
 
 #: application/src/Form/SiteSettingsForm.php:209
 msgid "Restrict to templates"
-msgstr ""
+msgstr "テンプレートに制限"
 
 #: application/src/Form/SiteSettingsForm.php:210
 msgid "Restrict search results to resources of the selected templates."
@@ -3137,12 +3239,12 @@ msgid "Confirm email"
 msgstr "Eメールを確認"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "インストールのタイトル"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "タイムゾーン"
 
@@ -3213,7 +3315,7 @@ msgid "Confirm"
 msgstr "確認"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "全インターフェース共通のロケール／言語のコード。"
 
@@ -3237,113 +3339,113 @@ msgstr "新しいパスワードの確認"
 msgid "New key label"
 msgstr "新規キーラベル"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "管理者Eメール"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "ページの1ページあたりの結果の最大数。"
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "プロパティラベル情報"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr "リソースページのラベルに付随する追加情報。"
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "無し"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "語彙を表示"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "用語を表示"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "デフォルトのサイト"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr "ユーザーがインストールの先頭ページに移動するときに表示するサイトを選択します。"
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "デフォルトなし（サイトのインデックスを表示）"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "バージョン通知を有効にする"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr "新しいバージョンのOmeka S、モジュール、またはテーマが利用可能な場合に通知を有効にします。"
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "セキュリティ"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "HTML Purifierを利用する"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "ユーザーが入力したHTMLについて不要タグ除去などきれいにします。"
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "ファイル検証を無効にする"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr "これをチェックすると、ファイルメディアの種類と拡張子の検証を無効にします。"
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "許可されるメディアタイプ"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr "ファイルのアップロードに許可されるメディアタイプのコンマ区切りのリスト。"
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "許可されるファイル拡張子"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr "ファイルアップロードのために許可されるファイル拡張子のコンマ区切りのリスト。"
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "reCAPTCHA サイトキー"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHAシークレットキー"
 
@@ -3369,7 +3471,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3396,56 +3498,6 @@ msgstr "3桁または6桁の16進数の色、または「透明」「transparent
 msgid "Invalid color format"
 msgstr "無効なカラー書式"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "語彙ファイル"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr "RDF語彙ファイルを選択してください。 ファイルを選択するかURLを入力してください。"
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "語彙URL"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr "RDF語彙のURLを入力してください。 URLを入力するかファイルを選択してください。"
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr "ファイルフォーマット"
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr "[自動検出]"
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr "JSON-LD (.jsonld)"
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr "N-Triples (.nt)"
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr "Notation3 (.n3)"
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr "RDF/XML (.rdf)"
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr "Turtle (.ttl)"
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "CAPTCHAを完了し、あなたが人間であることを確認する必要があります。"
@@ -3511,15 +3563,15 @@ msgstr "ユーザー権限を更新しました"
 msgid "Site theme successfully updated"
 msgstr "サイトテーマを更新しました"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "テーマ設定を更新しました"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "サイトを削除しました"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "サイト"
 
@@ -3595,8 +3647,8 @@ msgstr "リソーステンプレートを作成しました。 %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3631,10 +3683,8 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
-"APIキーが正常に作成されました。<br><br>APIにアクセスするためのキーIDと認証情報は次のとおりです。警告：「key_credential」は、このページから移動した後は回復できません。<br><br>"
-" key_identity: <code>%s</code><br>key_credential: <code>%s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3676,48 +3726,48 @@ msgstr "ユーザーを編集しました"
 msgid "Editing users. This may take a while."
 msgstr "ユーザーを編集しています。これには時間がかかる場合があります。"
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "アイテムセットを作成しました。 %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "アイテムセットを更新しました"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "アイテムセット"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "アイテムセットを削除しました"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "一括削除するアイテムセットを少なくとも1つ選択する必要があります。"
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "アイテムセットを削除しました"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "アイテムセットを削除しています。しばらくお待ちください。"
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "一括編集するアイテムセットを少なくとも1つ選択する必要があります。"
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "アイテムセットを編集しました"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "アイテムセットを編集しています。しばらくお待ちください。"
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "語彙"
 
@@ -3726,51 +3776,51 @@ msgstr "語彙"
 msgid "Vocabulary successfully imported. %s"
 msgstr "語彙をインポートしました。 %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "これらの変更を承認する前に確認してください。"
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "語彙を更新しました"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "作成成功した語彙の変更"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "語彙を削除しました"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "メディアを更新しました"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "メディアを削除しました"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr "一括削除するメディアを少なくとも1つ選択する必要があります。"
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "メディアを削除しました"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr "メディアを削除しています。しばらくお待ちください。"
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr "一括編集するメディアを少なくとも1つ選択する必要があります。"
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "メディアを編集しました"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr "メディアを編集しています。しばらくお待ちください。"
 
@@ -3794,24 +3844,24 @@ msgstr "アイテムを削除しました"
 msgid "Deleting items. This may take a while."
 msgstr "アイテムを削除しています。しばらくお待ちください。"
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "アイテムを作成しました。 %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "アイテムを更新しました"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "一括編集するアイテムを少なくとも1つ選択する必要があります。"
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "アイテムを編集しました"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "アイテムを編集しています。しばらくお待ちください。"
 
@@ -3937,14 +3987,14 @@ msgstr "ファイルをアップロード"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3955,15 +4005,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4018,55 +4068,63 @@ msgstr "アイテムのショーケース"
 msgid "Item with metadata"
 msgstr "メタデータを持つアイテム"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "サムネイルの配置"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "不明 [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr "サイトの一覧"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr "アルファベット順"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr "古い順"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr "新しい順"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr "サイトの最大数"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr "空の値は無制限を意味します。"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr "制限無し"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr "ページ数"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr "ページ数を表示（制限が設定されている場合のみ）"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr "要約を表示"
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "プレビューを見る"
@@ -4174,8 +4232,8 @@ msgstr "メディアは配列でなければなりません"
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "\"%s\" リソーステンプレートには \"%s\" 値が必要です"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4193,39 +4251,39 @@ msgstr "サイトにはアイテムプールデータが必要です。"
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "無効なナビゲーション：ナビゲーションは配列でなければなりません"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "無効なナビゲーション：リンクがないタイプ"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "無効なナビゲーション：リンク欠落したデータ"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "無効なナビゲーション：無効なリンクデータ"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "無効なナビゲーション：ページリンクは一意である必要があります"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "無効なナビゲーション：リンクは配列でなければなりません"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr "メディアは受入者をセットする必要があります。"
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr "メディアは有効な受入者をセットする必要があります。"
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "メディアはアイテムに属する必要があります。"
 
@@ -6224,10 +6282,6 @@ msgstr "Person"
 msgid "A person."
 msgstr "人物。存命中、故人、あるいは想像上の人物"
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr "エージェント（例えば、人、グループ、ソフトウェア、または物理的人工物）。"
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "文書／A document."
@@ -6248,6 +6302,10 @@ msgstr "Group"
 msgid "A class of Agents."
 msgstr "Agentのクラス。個々のfoaf:Agentの集合体で、それ自身もfoaf:Agentとみなすことができる"
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr "エージェント（例えば、人、グループ、ソフトウェア、または物理的人工物）。"
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "プロジェクト"
diff --git a/application/language/ko_KR.mo b/application/language/ko_KR.mo
index 57d6b3a199..248e86c6ce 100644
Binary files a/application/language/ko_KR.mo and b/application/language/ko_KR.mo differ
diff --git a/application/language/ko_KR.po b/application/language/ko_KR.po
index 7efaba447f..363edb78cb 100644
--- a/application/language/ko_KR.po
+++ b/application/language/ko_KR.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # ESnark <settimeout1000@gmail.com>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: ESnark <settimeout1000@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/omeka/teams/14184/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,18 +64,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -85,7 +86,7 @@ msgstr "환영"
 msgid "Welcome to your new site. This is an example page."
 msgstr "새 사이트에 오신 것을 환영합니다. 이곳은 예시 페이지입니다."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr ""
 
@@ -94,7 +95,7 @@ msgstr ""
 msgid "The API does not support the \"%s\" resource."
 msgstr ""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr ""
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "다른 item을 추가하시겠습니까?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "다른 item set을 추가하시겠습니까?"
 
@@ -196,7 +197,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -206,7 +207,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -216,12 +217,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -231,7 +232,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -241,7 +242,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -349,7 +350,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -442,8 +443,9 @@ msgid "AND"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -508,7 +510,7 @@ msgstr "이름"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr ""
 
@@ -541,8 +543,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -562,7 +564,7 @@ msgstr ""
 msgid "Edit"
 msgstr "편집"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -589,7 +591,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -601,6 +603,10 @@ msgstr ""
 msgid "Add new item set"
 msgstr ""
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -710,7 +716,7 @@ msgid "Block to be removed"
 msgstr "Block이 삭제됩니다"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -718,6 +724,7 @@ msgstr ""
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -728,17 +735,17 @@ msgstr ""
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Item sets"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "값이 삭제됩니다"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -886,10 +893,6 @@ msgstr "Item set을 클릭해서 편집 패널에 추가하세요"
 msgid "Filter item sets"
 msgstr ""
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr ""
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -927,7 +930,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -979,7 +982,7 @@ msgstr "다음"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
+msgid "%1$s–%2$s of %3$s"
 msgstr ""
 
 #: application/view/common/pagination.phtml:30
@@ -1043,12 +1046,12 @@ msgstr "속성을 클릭해서 편집 패널에 추가하세요"
 msgid "Filter properties"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1141,17 +1144,17 @@ msgstr "로그아웃"
 msgid "Log in"
 msgstr "로그인"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "사용자를 클릭해서 편집 패널에 추가하세요"
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1161,7 +1164,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1183,7 +1186,7 @@ msgid "Details:"
 msgstr ""
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr ""
 
@@ -1394,7 +1397,7 @@ msgstr "Item set 일괄수정"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1440,7 +1443,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "소유자"
 
@@ -1604,7 +1607,8 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1768,7 +1772,8 @@ msgstr ""
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1932,7 +1937,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2245,7 +2250,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "새로운 사용자 추가"
 
@@ -2264,8 +2269,9 @@ msgstr "정말로 선택된 사용자들을 삭제하시겠습니까?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
-msgstr "%s: 이 작업은 %s 사용자를 영구적으로 삭제할 것이며 되돌릴 수 없습니다."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
+msgstr "%1$s: 이 작업은 %2$s 사용자를 영구적으로 삭제할 것이며 되돌릴 수 없습니다."
 
 #: application/view/omeka/admin/user/browse.phtml:167
 msgid ""
@@ -2276,9 +2282,9 @@ msgstr "모든 페이지의 (본인을 제외한) 사용자들을 삭제하는
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
-msgstr "%s: 이 작업은 (본인을 제외한) %s 사용자들을 영구적으로 삭제할 것이며 되돌릴 수 없습니다."
+msgstr "%1$s: 이 작업은 (본인을 제외한) %2$s 사용자들을 영구적으로 삭제할 것이며 되돌릴 수 없습니다."
 
 #: application/view/omeka/admin/user/browse.phtml:208
 msgid "Omeka could not find any users."
@@ -2365,7 +2371,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2392,7 +2398,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2403,7 +2409,7 @@ msgstr ""
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2484,7 +2490,7 @@ msgid "Theme"
 msgstr "테마"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2531,16 +2537,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2579,30 +2581,30 @@ msgstr ""
 msgid "Current theme"
 msgstr "현재 테마"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "테마 설정 수정"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2617,16 +2619,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "사용자가 삭제됩니다"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2702,35 +2699,39 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "설명"
 
@@ -2789,24 +2790,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2845,30 +2846,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2909,7 +3003,7 @@ msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2959,12 +3053,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2974,7 +3068,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -2989,7 +3083,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3115,12 +3209,12 @@ msgid "Confirm email"
 msgstr "이메일 확인"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3191,7 +3285,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3215,113 +3309,113 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "관리자 이메일"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3347,7 +3441,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3374,56 +3468,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3489,15 +3533,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr "사이트 테마가 성공적으로 업데이트 되었습니다"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "테마 설정이 성공적으로 업데이트 되었습니다"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "사이트가 삭제되었습니다"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "사이트"
 
@@ -3573,8 +3617,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3609,7 +3653,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3652,48 +3696,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Item set이 성공적으로 생성되었습니다. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Item set이 성공적으로 업데이트 되었습니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "item set"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Item set이 삭제되었습니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "일괄삭제하려면 하나 이상의 item set을 선택해야 합니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Item set이 삭제되었습니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Item set 삭제 중입니다. 잠시만 기다려주세요."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "일괄수정 하려면 하나 이상의 item set을 선택해야 합니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Item set이 성공적으로 수정되었습니다"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Item set 수정 중입니다. 잠시만 기다려주세요."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3702,51 +3746,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3770,24 +3814,24 @@ msgstr "Item이 삭제되었습니다"
 msgid "Deleting items. This may take a while."
 msgstr "Item 삭제 중입니다. 잠시만 기다려주세요."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Item이 성공적으로 생성되었습니다. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Item이 성공적으로 업데이트 되었습니다"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "일괄수정 하려면 하나 이상의 item을 선택해야 합니다."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Item이 성공적으로 수정되었습니다"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Item 수정 중입니다. 잠시만 기다려주세요."
 
@@ -3913,14 +3957,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3931,15 +3975,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -3994,8 +4038,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4003,46 +4051,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4150,7 +4202,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4169,39 +4221,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6125,10 +6177,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6149,6 +6197,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/lt.mo b/application/language/lt.mo
index 8d2280b88b..a03a1cbd9b 100644
Binary files a/application/language/lt.mo and b/application/language/lt.mo differ
diff --git a/application/language/lt.po b/application/language/lt.po
index b697fc0915..11ba8bc839 100644
--- a/application/language/lt.po
+++ b/application/language/lt.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Juozas Markauskas <juozas@dizi.lt>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Juozas Markauskas <juozas@dizi.lt>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Lithuanian (https://www.transifex.com/omeka/teams/14184/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,18 +64,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -85,7 +86,7 @@ msgstr "Sveiki"
 msgid "Welcome to your new site. This is an example page."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Naršyti"
 
@@ -94,7 +95,7 @@ msgstr "Naršyti"
 msgid "The API does not support the \"%s\" resource."
 msgstr ""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr "Pagal nutylėjimą"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Pridėti naują objektą?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Pridėti naują rinkinį?"
 
@@ -196,7 +197,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -206,7 +207,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -216,12 +217,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -231,7 +232,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -241,7 +242,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -349,7 +350,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -442,8 +443,9 @@ msgid "AND"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -508,7 +510,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rolė"
 
@@ -541,8 +543,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -562,7 +564,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -589,7 +591,7 @@ msgstr "Ieškoti objektų, priskirtų kuriam nors iš šių rinkinių"
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -601,6 +603,10 @@ msgstr ""
 msgid "Add new item set"
 msgstr "Pridėti naują objektų rinkinį."
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -710,7 +716,7 @@ msgid "Block to be removed"
 msgstr ""
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -718,6 +724,7 @@ msgstr ""
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -728,17 +735,17 @@ msgstr ""
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Objektų rinkiniai"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr ""
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -886,10 +893,6 @@ msgstr "Pasirinkite objektų rinkinį norėdami priskirti jam objektą"
 msgid "Filter item sets"
 msgstr "Filtruoti objektų rinkinius"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Visi objektų rinkiniai"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -927,7 +930,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -979,7 +982,7 @@ msgstr ""
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
+msgid "%1$s–%2$s of %3$s"
 msgstr ""
 
 #: application/view/common/pagination.phtml:30
@@ -1043,12 +1046,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1141,17 +1144,17 @@ msgstr "Atsijungti"
 msgid "Log in"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1161,7 +1164,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1183,7 +1186,7 @@ msgid "Details:"
 msgstr "Detalės:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Ištekliai"
 
@@ -1394,7 +1397,7 @@ msgstr "Grupinis objektų rinkinių redagavimas"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1440,7 +1443,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Savininkas"
 
@@ -1604,8 +1607,9 @@ msgstr "Ar jūs tikrai norite panaikinti pasirinktus objektų rinkinius? "
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
-msgstr "%s: šis veiksmas visam laikui panaikins %s objektų rinkinius"
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
+msgstr "%1$s: šis veiksmas visam laikui panaikins %2$s objektų rinkinius"
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1768,8 +1772,9 @@ msgstr "Ar tikrai norite naikinti pasirinktus objektus?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
-msgstr "%s: šis veiksmas visam laiku  panaikins %sobjektus."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
+msgstr "%1$s: šis veiksmas visam laiku  panaikins %2$sobjektus."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1932,7 +1937,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2245,7 +2250,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr ""
 
@@ -2264,7 +2269,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2276,7 +2282,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2365,7 +2371,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2392,7 +2398,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2403,7 +2409,7 @@ msgstr "Svetainės"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2482,7 +2488,7 @@ msgid "Theme"
 msgstr ""
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Objektų rinkinys"
 
@@ -2529,16 +2535,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Atkruti objektų rinkinį"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Šiuo metu svetainės rinkinyje yra %sobjektai(-ų)."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2577,30 +2579,30 @@ msgstr ""
 msgid "Current theme"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2614,16 +2616,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2699,35 +2696,39 @@ msgstr "Išplėstinė objektų paiešką"
 msgid "Item"
 msgstr "Objektas"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Atkruti objektų rinkinį"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr ""
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2786,24 +2787,24 @@ msgstr "be pavadinimo"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2842,30 +2843,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Žodyno failas"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2906,7 +3000,7 @@ msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2956,12 +3050,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2971,7 +3065,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -2986,7 +3080,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3112,12 +3206,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3188,7 +3282,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3212,113 +3306,113 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Rodyti žodyną"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3344,7 +3438,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3371,56 +3465,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Žodyno failas"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3486,15 +3530,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3570,8 +3614,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3606,7 +3650,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3649,49 +3693,49 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Objektų rinkinys sėkmingai sukurtas. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Objektų rinkinys sėkmingai atnaujintas"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Objektų rinkinys "
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Objektų rinkinys sėkmingai panaikintas"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "Turite pasirinkti bent vieną objektą norėdami naikinti grupę"
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Objektų rinkiniai sėkmingai panaikinti"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Naikinami objektų rinkiniai. Tai gali šiek tiek užtrukti."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Turite pasirinkti bent vieną objektą, norėdami vykdyti grupinį redagavimą."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Objektai sėkmingai atnaujinti. "
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Atnaujinami objektų rinkiniai. Tai gali šiek tiek užtrukti. "
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3700,51 +3744,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3769,25 +3813,25 @@ msgstr "Objektai sėkmingai panaikinti"
 msgid "Deleting items. This may take a while."
 msgstr "Naikinami objektai. Tai gali šiek tiek užtrukti."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Objektas sėkmingai sukurtas. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Objektas sėkmingai įkeltas. "
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 "Turite pasirinkti bent vieną objektą, norėdami atlikti grupinį redagavimą."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Objektai sėkmingai atnaujinti."
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Atnaujinami objektai. Tai gali šiek tiek užtrukti."
 
@@ -3913,14 +3957,14 @@ msgstr "Įkelti failą"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3931,15 +3975,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -3994,8 +4038,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr "Objektai su metaduomenimis"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4003,46 +4051,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4150,7 +4202,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4169,39 +4221,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Media turi priklausyti konkrečiam objektui. "
 
@@ -6125,10 +6177,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6149,6 +6197,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/mn.mo b/application/language/mn.mo
new file mode 100644
index 0000000000..c5b52107a3
Binary files /dev/null and b/application/language/mn.mo differ
diff --git a/application/language/mn.po b/application/language/mn.po
new file mode 100644
index 0000000000..b0cc06cb4e
--- /dev/null
+++ b/application/language/mn.po
@@ -0,0 +1,6754 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Jishee Oyutan <jisheelibrary@gmail.com>, 2017
+# Khaidav Tumur <khaidaw@gmail.com>, 2020
+# Khaidav T. <khaidaw@yahoo.com>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
+"PO-Revision-Date: 2017-06-13 18:56+0000\n"
+"Last-Translator: Khaidav T. <khaidaw@yahoo.com>, 2020\n"
+"Language-Team: Mongolian (https://www.transifex.com/omeka/teams/14184/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: application/src/Api/Adapter/AbstractAdapter.php:40
+#, php-format
+msgid "The %1$s adapter does not implement the search operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:50
+#, php-format
+msgid "The %1$s adapter does not implement the create operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:60
+#, php-format
+msgid "The %1$s adapter does not implement the batch create operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:70
+#, php-format
+msgid "The %1$s adapter does not implement the read operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:80
+#, php-format
+msgid "The %1$s adapter does not implement the update operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:90
+#, php-format
+msgid "The %1$s adapter does not implement the batch update operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:111
+#, php-format
+msgid "The %1$s adapter does not implement the delete operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractAdapter.php:121
+#, php-format
+msgid "The %1$s adapter does not implement the batch delete operation."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractEntityAdapter.php:241
+#, php-format
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractEntityAdapter.php:586
+#: application/src/Api/Manager.php:209
+#, php-format
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractEntityAdapter.php:628
+#, php-format
+msgid "%1$s entity with criteria %2$s not found"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:136
+msgid "Welcome"
+msgstr "Тавтай морилно уу."
+
+#: application/src/Api/Adapter/SiteAdapter.php:141
+msgid "Welcome to your new site. This is an example page."
+msgstr "Сайтад тавтай морилно уу. Энэ бол жишээ хуудас."
+
+#: application/src/Api/Adapter/SiteAdapter.php:358
+msgid "Browse"
+msgstr "Тоймлож харах"
+
+#: application/src/Api/Manager.php:201
+#, php-format
+msgid "The API does not support the \"%s\" resource."
+msgstr ""
+
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
+#: application/view/common/block-layout/browse-preview.phtml:15
+#: application/view/omeka/site/item-set/browse.phtml:23
+#: application/view/omeka/site/item/browse.phtml:58
+msgid "[Untitled]"
+msgstr "[Нэргүй]"
+
+#: application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php:105
+msgid "Default"
+msgstr "Үндсэн"
+
+#: application/src/Controller/Admin/AssetController.php:48
+msgid "Asset uploads must be POSTed."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:212
+msgid "Add another item?"
+msgstr "Өөр баримт нэмэх үү?"
+
+#: application/src/Controller/Admin/ItemSetController.php:36
+msgid "Add another item set?"
+msgstr "Өөр баримтын бүрдэл нэмэх үү?"
+
+#: application/src/Controller/Admin/ModuleController.php:69
+#: application/src/Controller/Admin/ModuleController.php:76
+#: application/view/common/advanced-search/users.phtml:47
+msgid "Active"
+msgstr "Идэвхтэй"
+
+#: application/src/Controller/Admin/ModuleController.php:70
+#: application/src/Controller/Admin/ModuleController.php:77
+#: application/view/common/advanced-search/users.phtml:48
+msgid "Not active"
+msgstr "Идэвхгүй"
+
+#: application/src/Controller/Admin/ModuleController.php:71
+#: application/src/Controller/Admin/ModuleController.php:78
+msgid "Not installed"
+msgstr "Суугдаагүй"
+
+#: application/src/Controller/Admin/ModuleController.php:72
+#: application/src/Controller/Admin/ModuleController.php:79
+msgid "Needs upgrade"
+msgstr "Шинэчлэх шаардлагатай"
+
+#: application/src/Controller/Admin/ModuleController.php:73
+msgid "Error"
+msgstr "Алдаа"
+
+#: application/src/Controller/Admin/ModuleController.php:80
+#: application/view/error/404.phtml:4
+msgid "Not found"
+msgstr "Олдсонгүй"
+
+#: application/src/Controller/Admin/ModuleController.php:81
+msgid "Invalid module"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:82
+msgid "Invalid INI"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:83
+msgid "Invalid Omeka S version"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:415
+msgid "Add another resource template?"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:117
+msgid "Add another user?"
+msgstr "Өөр хэрэглэгч нэмэх үү?"
+
+#: application/src/Controller/Admin/VocabularyController.php:92
+msgid "Must provide a vocabulary file or a vocabulary URL"
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:101
+msgid "Import another vocabulary?"
+msgstr ""
+
+#: application/src/DataType/Resource/AbstractResource.php:51
+#, php-format
+msgid "Resource not found with id %s."
+msgstr ""
+
+#: application/src/Db/Migration/Manager.php:112
+msgid "Migration file did not contain the expected class"
+msgstr ""
+
+#: application/src/Media/Ingester/Fallback.php:33
+#: application/view/common/navigation-link-form/fallback.phtml:4
+msgid "Unknown"
+msgstr "Тодорхойгүй"
+
+#: application/src/Media/Renderer/IIIF.php:14
+msgid "OpenSeadragon is not available unless JavaScript is enabled."
+msgstr ""
+
+#: application/src/Module/Manager.php:170
+#, php-format
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr ""
+
+#: application/src/Module/Manager.php:181
+#, php-format
+msgid "Module \"%s\" not in database during activation"
+msgstr ""
+
+#: application/src/Module/Manager.php:202
+#, php-format
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr ""
+
+#: application/src/Module/Manager.php:213
+#, php-format
+msgid "Module \"%s\" not in database during deactivation"
+msgstr ""
+
+#: application/src/Module/Manager.php:233
+#, php-format
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr ""
+
+#: application/src/Module/Manager.php:271
+#, php-format
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr ""
+
+#: application/src/Module/Manager.php:288
+#, php-format
+msgid "Module \"%s\" not found in database during uninstallation"
+msgstr ""
+
+#: application/src/Module/Manager.php:309
+#, php-format
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr ""
+
+#: application/src/Module/Manager.php:331
+#, php-format
+msgid "Module \"%s\" not found in database during upgrade"
+msgstr ""
+
+#: application/src/Module/Manager.php:410
+#, php-format
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr ""
+
+#: application/src/Mvc/MvcListeners.php:436
+#, php-format
+msgid ""
+"Permission denied for the current user to access the %1$s action of the %2$s"
+" controller."
+msgstr ""
+
+#: application/src/Site/BlockLayout/Fallback.php:37
+msgid "This layout is invalid."
+msgstr ""
+
+#: application/src/Site/BlockLayout/ItemShowcase.php:22
+#: application/src/Site/BlockLayout/Media.php:22
+msgid "Options"
+msgstr "Тохиргоо"
+
+#: application/src/Site/BlockLayout/LineBreak.php:43
+msgid "Break type"
+msgstr ""
+
+#: application/src/Site/BlockLayout/TableOfContents.php:28
+msgid "Depth"
+msgstr ""
+
+#: application/src/Site/BlockLayout/TableOfContents.php:29
+msgid "Number of child page levels to display"
+msgstr ""
+
+#: application/src/Site/Navigation/Translator.php:60
+msgid "Home"
+msgstr "Эхлэл"
+
+#: application/src/Stdlib/Mailer.php:171
+#, php-format
+msgid ""
+"Greetings, %1$s!\n"
+"\n"
+"It seems you have forgotten your password for %5$s at %2$s\n"
+"\n"
+"To reset your password, click this link:\n"
+"%3$s\n"
+"\n"
+"Your reset link will expire on %4$s."
+msgstr ""
+
+#: application/src/Stdlib/Mailer.php:193
+#, php-format
+msgid "Reset your password for %s"
+msgstr "Нууц үгийг дахин тохируулах %s"
+
+#: application/src/Stdlib/Mailer.php:209
+#, php-format
+msgid ""
+"Greetings!\n"
+"\n"
+"A user has been created for you on %5$s at %1$s\n"
+"\n"
+"Your username is your email: %2$s\n"
+"\n"
+"Click this link to set a password and begin using Omeka S:\n"
+"%3$s\n"
+"\n"
+"Your activation link will expire on %4$s. If you have not completed the user activation process by the time the link expires, you will need to request another activation email from your site administrator."
+msgstr ""
+
+#: application/src/Stdlib/Mailer.php:233
+#, php-format
+msgid "User activation for %s"
+msgstr ""
+
+#: application/src/View/Helper/BlockShowTitleSelect.php:33
+msgid "Show attachment title"
+msgstr "Хавсаргах гарчиг харуулах"
+
+#: application/src/View/Helper/BlockThumbnailTypeSelect.php:42
+msgid "Thumbnail type"
+msgstr ""
+
+#: application/src/View/Helper/CancelButton.php:14
+#: application/view/omeka/admin/vocabulary/update.phtml:23
+msgid "Cancel"
+msgstr "Болих"
+
+#: application/src/View/Helper/PasswordRequirements.php:40
+#, php-format
+msgid "Password must be a minimum of %s characters in length."
+msgstr "Нууц үг багадаа %s тэмдэгтийн урттай байх ёстой."
+
+#: application/src/View/Helper/PasswordRequirements.php:46
+#, php-format
+msgid "Password must contain at least %s lowercase characters."
+msgstr "Нууц үг багадаа %s жижиг үсэгтэй байх ёстой."
+
+#: application/src/View/Helper/PasswordRequirements.php:52
+#, php-format
+msgid "Password must contain at least %s uppercase characters."
+msgstr "Нууц үг ядаж %s том үсэг агуулж байх ёстой."
+
+#: application/src/View/Helper/PasswordRequirements.php:58
+#, php-format
+msgid "Password must contain at least %s numbers."
+msgstr "Нууц үгэнд багадаа %s тоо орсон байх ёстой."
+
+#: application/src/View/Helper/PasswordRequirements.php:67
+#, php-format
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:32
+#: application/view/common/advanced-search/properties.phtml:65
+msgid "is exactly"
+msgstr "яг адил"
+
+#: application/src/View/Helper/SearchFilters.php:33
+#: application/view/common/advanced-search/properties.phtml:66
+msgid "is not exactly"
+msgstr "яг адил биш"
+
+#: application/src/View/Helper/SearchFilters.php:34
+#: application/view/common/advanced-search/properties.phtml:67
+msgid "contains"
+msgstr "агуулсан"
+
+#: application/src/View/Helper/SearchFilters.php:35
+#: application/view/common/advanced-search/properties.phtml:68
+msgid "does not contain"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:36
+#: application/view/common/advanced-search/properties.phtml:69
+msgid "is resource with ID"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:37
+#: application/view/common/advanced-search/properties.phtml:70
+msgid "is not resource with ID"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:38
+#: application/view/common/advanced-search/properties.phtml:71
+msgid "has any value"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:39
+#: application/view/common/advanced-search/properties.phtml:72
+msgid "has no values"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:47
+#: application/view/common/advanced-search/fulltext.phtml:6
+msgid "Search full-text"
+msgstr "Бүтэн текстээр хайх"
+
+#: application/src/View/Helper/SearchFilters.php:60
+#: application/view/common/linked-resources.phtml:33
+#: application/view/omeka/admin/item-set/browse.phtml:15
+#: application/view/omeka/admin/item-set/browse.phtml:75
+#: application/view/omeka/admin/item-set/show.phtml:40
+#: application/view/omeka/admin/item/browse.phtml:15
+#: application/view/omeka/admin/item/browse.phtml:73
+#: application/view/omeka/admin/item/show.phtml:30
+#: application/view/omeka/admin/job/browse.phtml:11
+#: application/view/omeka/admin/job/browse.phtml:38
+#: application/view/omeka/admin/job/show.phtml:41
+#: application/view/omeka/admin/media/browse.phtml:17
+#: application/view/omeka/admin/media/browse.phtml:81
+#: application/view/omeka/admin/media/show.phtml:23
+#: application/view/omeka/admin/resource-template/browse.phtml:11
+#: application/view/omeka/admin/resource-template/browse.phtml:44
+#: application/view/omeka/admin/resource-template/review-import.phtml:25
+#: application/view/omeka/admin/resource-template/show.phtml:18
+#: application/view/omeka/site/item/browse.phtml:22
+msgid "Class"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:64
+msgid "Unknown class"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:102
+msgid "Unknown property"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:105
+msgid "[Any property]"
+msgstr ""
+
+#: application/src/View/Helper/SearchFilters.php:113
+#: application/view/common/advanced-search/properties.phtml:50
+msgid "OR"
+msgstr "ЭСВЭЛ"
+
+#: application/src/View/Helper/SearchFilters.php:115
+#: application/view/common/advanced-search/properties.phtml:49
+msgid "AND"
+msgstr "БА"
+
+#: application/src/View/Helper/SearchFilters.php:124
+#: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
+#: application/view/layout/layout-admin.phtml:62
+#: application/view/omeka/admin/item-set/search.phtml:13
+#: application/view/omeka/admin/item-set/sidebar-select.phtml:12
+#: application/view/omeka/admin/item/search.phtml:13
+#: application/view/omeka/admin/item/sidebar-select.phtml:24
+#: application/view/omeka/admin/media/search.phtml:13
+#: application/view/omeka/admin/media/sidebar-select.phtml:12
+#: application/view/omeka/admin/user/search.phtml:12
+#: application/view/omeka/site/item-set/search.phtml:13
+#: application/view/omeka/site/item/search.phtml:13
+msgid "Search"
+msgstr "Хайх"
+
+#: application/src/View/Helper/SearchFilters.php:137
+msgid "Template"
+msgstr "Загвар"
+
+#: application/src/View/Helper/SearchFilters.php:141
+msgid "Unknown template"
+msgstr "Тодорхойгүй загвар"
+
+#: application/src/View/Helper/SearchFilters.php:156
+#: application/view/omeka/site/item/browse.phtml:34
+msgid "Item set"
+msgstr "Баримтын бүрдэл"
+
+#: application/src/View/Helper/SearchFilters.php:160
+msgid "Unknown item set"
+msgstr "Тодорхйогүй баримтын бүрдэл"
+
+#: application/src/View/Helper/SearchFilters.php:168
+#: application/view/omeka/site-admin/index/users.phtml:30
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#: application/src/View/Helper/SearchFilters.php:172
+msgid "Unknown user"
+msgstr "Тодорхойгүй хэрэглэгч"
+
+#: application/src/View/Helper/SearchFilters.php:178
+msgid "Site"
+msgstr "Сайт"
+
+#: application/src/View/Helper/SearchFilters.php:182
+#: application/src/View/Helper/SearchUserFilters.php:75
+msgid "Unknown site"
+msgstr "Тодорхойгүй сайт"
+
+#: application/src/View/Helper/SearchUserFilters.php:49
+#: application/view/omeka/admin/user/browse.phtml:10
+#: application/view/omeka/admin/user/browse.phtml:78
+#: application/view/omeka/admin/user/show.phtml:17
+msgid "Email"
+msgstr "имэйл"
+
+#: application/src/View/Helper/SearchUserFilters.php:54
+msgid "Name"
+msgstr "Нэр"
+
+#: application/src/View/Helper/SearchUserFilters.php:59
+#: application/view/omeka/admin/user/browse.phtml:14
+#: application/view/omeka/admin/user/browse.phtml:80
+#: application/view/omeka/admin/user/show.phtml:29
+#: application/view/omeka/site-admin/index/users.phtml:31
+#: application/view/omeka/site-admin/index/users.phtml:46
+msgid "Role"
+msgstr "Үүрэг"
+
+#: application/src/View/Helper/SearchUserFilters.php:62
+msgid "Unknown role"
+msgstr "Тодорхойгүй үүрэг"
+
+#: application/src/View/Helper/SearchUserFilters.php:66
+#: application/view/omeka/admin/user/show.phtml:35
+msgid "Is active"
+msgstr ""
+
+#: application/src/View/Helper/SearchUserFilters.php:67
+#: application/view/omeka/admin/user/show.phtml:37
+msgid "yes"
+msgstr "тийм"
+
+#: application/src/View/Helper/SearchUserFilters.php:67
+#: application/view/omeka/admin/user/show.phtml:37
+msgid "no"
+msgstr "үгүй"
+
+#: application/src/View/Helper/SearchUserFilters.php:71
+#: application/view/common/advanced-search/users.phtml:53
+msgid "Has permission in site"
+msgstr ""
+
+#: application/src/View/Helper/UploadLimit.php:26
+#, php-format
+msgid "The maximum upload size is %s MB."
+msgstr ""
+
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
+#: application/view/omeka/admin/index/browse.phtml:48
+#: application/view/omeka/admin/item-set/browse.phtml:109
+#: application/view/omeka/admin/item-set/edit.phtml:14
+#: application/view/omeka/admin/item/browse.phtml:107
+#: application/view/omeka/admin/item/edit.phtml:14
+#: application/view/omeka/admin/item/manage-media.phtml:44
+#: application/view/omeka/admin/media/browse.phtml:117
+#: application/view/omeka/admin/resource-template/browse.phtml:71
+#: application/view/omeka/admin/user/browse.phtml:101
+#: application/view/omeka/admin/user/edit.phtml:14
+#: application/view/omeka/admin/vocabulary/browse.phtml:59
+#: application/view/omeka/admin/vocabulary/edit.phtml:7
+#: application/view/omeka/site-admin/index/index.phtml:75
+#: application/view/omeka/site-admin/index/show.phtml:15
+#: application/view/omeka/site-admin/page/edit.phtml:11
+#: application/view/omeka/site-admin/page/index.phtml:44
+msgid "Edit"
+msgstr "Засах"
+
+#: application/src/View/Helper/UserBar.php:154
+#: application/view/omeka/site-admin/index/show.phtml:17
+#: application/view/omeka/site-admin/page/edit.phtml:15
+msgid "View"
+msgstr "Харах"
+
+#: application/view/common/advanced-search/item-sets.phtml:15
+msgid "Search by item set"
+msgstr "Баримтын бүрдлээр хайх"
+
+#: application/view/common/advanced-search/item-sets.phtml:16
+#: application/view/common/advanced-search/resource-class.phtml:16
+#: application/view/common/advanced-search/resource-template.phtml:17
+#: application/view/common/form-row.phtml:16
+#: application/view/omeka/admin/item/sidebar-select.phtml:28
+msgid "Expand"
+msgstr "Өргөтгөх"
+
+#: application/view/common/advanced-search/item-sets.phtml:18
+msgid "Searches for items that are assigned to any of these item sets."
+msgstr ""
+
+#: application/view/common/advanced-search/item-sets.phtml:34
+#: application/view/common/advanced-search/properties.phtml:75
+#: application/view/common/advanced-search/resource-class.phtml:31
+#: application/view/common/advanced-search/resource-template.phtml:32
+#: application/view/common/block-layout.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/media-field-wrapper.phtml:13
+#: application/view/omeka/admin/item/manage-media.phtml:49
+msgid "Remove value"
+msgstr ""
+
+#: application/view/common/advanced-search/item-sets.phtml:37
+#: application/view/omeka/admin/index/browse.phtml:23
+#: application/view/omeka/admin/item-set/browse.phtml:42
+msgid "Add new item set"
+msgstr "Баримтын бүрдэл шинээр нэмэх"
+
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:33
+msgid "Query text"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:39
+msgid "Search by value"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:57
+msgid "Property"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:64
+msgid "Query type"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:81
+msgid "Add new value"
+msgstr ""
+
+#: application/view/common/advanced-search/resource-class.phtml:15
+msgid "Search by class"
+msgstr ""
+
+#: application/view/common/advanced-search/resource-class.phtml:18
+msgid "Searches for items that are any of these classes."
+msgstr ""
+
+#: application/view/common/advanced-search/resource-class.phtml:34
+msgid "Add new class"
+msgstr ""
+
+#: application/view/common/advanced-search/resource-template.phtml:16
+msgid "Search by template"
+msgstr "Загвараар хайх"
+
+#: application/view/common/advanced-search/resource-template.phtml:19
+msgid "Searches for items that use any of these templates."
+msgstr ""
+
+#: application/view/common/advanced-search/resource-template.phtml:35
+msgid "Add new template"
+msgstr ""
+
+#: application/view/common/advanced-search/site-pool.phtml:12
+msgid "In site pool"
+msgstr ""
+
+#: application/view/common/advanced-search/users.phtml:17
+msgid "Search by email"
+msgstr "Имэйл хаягаар хайх"
+
+#: application/view/common/advanced-search/users.phtml:25
+msgid "Search by name"
+msgstr "Нэрээр хайх"
+
+#: application/view/common/advanced-search/users.phtml:33
+msgid "Search by role"
+msgstr "Үүргээр хайх"
+
+#: application/view/common/advanced-search/users.phtml:44
+msgid "Search by activity"
+msgstr "Үйл ажиллагаагаар хайх"
+
+#: application/view/common/asset-form.phtml:34
+msgid "[No asset selected]"
+msgstr ""
+
+#: application/view/common/asset-form.phtml:37
+msgid "Select"
+msgstr "Сонгох"
+
+#: application/view/common/asset-form.phtml:40
+msgid "Clear"
+msgstr "Цэвэрлэх"
+
+#: application/view/common/attachments-form.phtml:8
+#: application/view/common/attachments-form.phtml:28
+msgid "No item selected"
+msgstr ""
+
+#: application/view/common/attachments-form.phtml:10
+#: application/view/common/attachments-form.phtml:51
+msgid "Open attachment options"
+msgstr ""
+
+#: application/view/common/attachments-form.phtml:11
+#: application/view/common/attachments-form.phtml:52
+msgid "Delete attachment"
+msgstr "Хавсралтыг устгах"
+
+#: application/view/common/attachments-form.phtml:12
+#: application/view/common/attachments-form.phtml:53
+msgid "Restore attachment"
+msgstr "Хавсралтыг сэргээх"
+
+#: application/view/common/attachments-form.phtml:20
+msgid "Attachments"
+msgstr "Хавсралтууд"
+
+#: application/view/common/attachments-form.phtml:60
+msgid "Add attachment"
+msgstr "Хавсралт нэмэх"
+
+#: application/view/common/block-layout.phtml:10
+msgid "Block to be removed"
+msgstr ""
+
+#: application/view/common/block-layout.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
+#: application/view/omeka/admin/item/manage-media.phtml:53
+#: application/view/omeka/admin/resource-template/show-property-row.phtml:40
+msgid "Restore value"
+msgstr ""
+
+#: application/view/common/block-layout/item-with-metadata.phtml:12
+#: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
+#: application/view/layout/layout-admin.phtml:72
+#: application/view/omeka/admin/item-set/add.phtml:6
+#: application/view/omeka/admin/item-set/browse.phtml:29
+#: application/view/omeka/admin/item-set/edit.phtml:14
+#: application/view/omeka/admin/item-set/search.phtml:5
+#: application/view/omeka/admin/item-set/show.phtml:26
+#: application/view/omeka/admin/item/form.phtml:15
+#: application/view/omeka/admin/item/show-details.phtml:19
+#: application/view/omeka/admin/item/show.phtml:63
+#: application/view/omeka/admin/user/show-details.phtml:17
+#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site/item-set/browse.phtml:8
+#: application/view/omeka/site/item/show.phtml:24
+msgid "Item sets"
+msgstr "баримтын бүрдлүүд"
+
+#: application/view/common/data-type-wrapper.phtml:8
+msgid "Value to be removed"
+msgstr ""
+
+#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/media-field-wrapper.phtml:9
+#: application/view/omeka/admin/item-set/form.phtml:41
+#: application/view/omeka/admin/item/form.phtml:43
+#: application/view/omeka/admin/item/manage-media.phtml:31
+#: application/view/omeka/admin/media/edit.phtml:52
+#: application/view/omeka/site-admin/index/add.phtml:27
+#: application/view/omeka/site-admin/index/edit.phtml:15
+msgid "Make private"
+msgstr ""
+
+#: application/view/common/data-type/literal.phtml:4
+msgid "Set language"
+msgstr "Хэл тохируулах"
+
+#: application/view/common/data-type/literal.phtml:5
+msgid "Language"
+msgstr "Хэл"
+
+#: application/view/common/data-type/resource.phtml:14
+msgid "No resource selected"
+msgstr ""
+
+#: application/view/common/data-type/resource.phtml:22
+#: application/view/layout/layout-admin.phtml:68
+#: application/view/omeka/admin/item-set/show-details.phtml:18
+#: application/view/omeka/admin/item-set/show.phtml:79
+#: application/view/omeka/admin/item/add.phtml:6
+#: application/view/omeka/admin/item/browse.phtml:29
+#: application/view/omeka/admin/item/edit.phtml:14
+#: application/view/omeka/admin/item/search.phtml:5
+#: application/view/omeka/admin/item/show.phtml:18
+#: application/view/omeka/admin/property/show-details.phtml:18
+#: application/view/omeka/admin/resource-class/show-details.phtml:18
+#: application/view/omeka/admin/resource-template/browse.phtml:19
+#: application/view/omeka/admin/resource-template/show-details.phtml:18
+#: application/view/omeka/admin/user/show-details.phtml:12
+#: application/view/omeka/admin/vocabulary/classes.phtml:15
+#: application/view/omeka/site/index/search.phtml:24
+#: application/view/omeka/site/item/browse.phtml:39
+#: application/view/omeka/site/item/browse.phtml:41
+msgid "Items"
+msgstr "Баримтууд"
+
+#: application/view/common/data-type/resource.phtml:36
+#: application/view/layout/layout-admin.phtml:76
+#: application/view/omeka/admin/item/form.phtml:14
+#: application/view/omeka/admin/item/show-details.phtml:27
+#: application/view/omeka/admin/item/show.phtml:79
+#: application/view/omeka/admin/media/browse.phtml:31
+#: application/view/omeka/admin/media/edit.phtml:16
+#: application/view/omeka/admin/media/edit.phtml:24
+#: application/view/omeka/admin/media/search.phtml:5
+#: application/view/omeka/admin/media/show.phtml:11
+#: application/view/omeka/site-admin/page/attachment-item-options.phtml:32
+#: application/view/omeka/site/media/show.phtml:7
+msgid "Media"
+msgstr ""
+
+#: application/view/common/data-type/uri.phtml:6
+#: application/view/common/property-form-batch-edit.phtml:44
+#: application/view/common/resource-form-templates.phtml:24
+msgid "URI"
+msgstr ""
+
+#: application/view/common/data-type/uri.phtml:12
+#: application/view/common/navigation-link-form/browse.phtml:8
+#: application/view/common/navigation-link-form/page.phtml:15
+#: application/view/common/navigation-link-form/url.phtml:8
+#: application/view/common/property-form-batch-edit.phtml:45
+#: application/view/omeka/admin/resource-template/browse.phtml:7
+#: application/view/omeka/admin/resource-template/browse.phtml:43
+#: application/view/omeka/admin/resource-template/form.phtml:55
+#: application/view/omeka/admin/user/edit.phtml:38
+#: application/view/omeka/admin/vocabulary/browse.phtml:7
+#: application/view/omeka/admin/vocabulary/browse.phtml:43
+#: application/view/omeka/admin/vocabulary/classes.phtml:7
+#: application/view/omeka/admin/vocabulary/classes.phtml:37
+#: application/view/omeka/admin/vocabulary/properties.phtml:20
+msgid "Label"
+msgstr ""
+
+#: application/view/common/delete-confirm.phtml:8
+#: application/view/common/item-set-selector.phtml:6
+#: application/view/common/property-selector.phtml:6
+#: application/view/common/resource-select-sidebar.phtml:6
+#: application/view/common/resource-select-sidebar.phtml:12
+#: application/view/common/user-selector.phtml:5
+#: application/view/omeka/admin/asset/sidebar-select.phtml:6
+#: application/view/omeka/admin/item-set/browse.phtml:146
+#: application/view/omeka/admin/item-set/browse.phtml:153
+#: application/view/omeka/admin/item-set/browse.phtml:171
+#: application/view/omeka/admin/item/browse.phtml:144
+#: application/view/omeka/admin/item/browse.phtml:151
+#: application/view/omeka/admin/item/browse.phtml:169
+#: application/view/omeka/admin/item/manage-media.phtml:71
+#: application/view/omeka/admin/media/browse.phtml:154
+#: application/view/omeka/admin/media/browse.phtml:163
+#: application/view/omeka/admin/media/browse.phtml:181
+#: application/view/omeka/admin/module/browse.phtml:159
+#: application/view/omeka/admin/resource-template/browse.phtml:98
+#: application/view/omeka/admin/resource-template/form.phtml:43
+#: application/view/omeka/admin/resource-template/form.phtml:52
+#: application/view/omeka/admin/resource-template/show.phtml:61
+#: application/view/omeka/admin/user/browse.phtml:135
+#: application/view/omeka/admin/user/browse.phtml:144
+#: application/view/omeka/admin/user/browse.phtml:162
+#: application/view/omeka/admin/vocabulary/browse.phtml:92
+#: application/view/omeka/admin/vocabulary/classes.phtml:67
+#: application/view/omeka/admin/vocabulary/properties.phtml:50
+#: application/view/omeka/site-admin/index/index.phtml:101
+#: application/view/omeka/site-admin/index/navigation.phtml:26
+#: application/view/omeka/site-admin/page/edit.phtml:38
+#: application/view/omeka/site-admin/page/index.phtml:65
+msgid "Close"
+msgstr "Хаах"
+
+#: application/view/common/delete-confirm.phtml:12
+#, php-format
+msgid "Delete %s"
+msgstr "Устгах %s"
+
+#: application/view/common/delete-confirm.phtml:13
+#, php-format
+msgid "Are you sure you would like to delete this %s?"
+msgstr ""
+
+#: application/view/common/filter-selector.phtml:6
+msgid "No filter"
+msgstr "Шүүлтүүргүй"
+
+#: application/view/common/filter-selector.phtml:13
+#: application/view/omeka/admin/module/browse.phtml:14
+msgid "Filter"
+msgstr "Шүүлтүүр"
+
+#: application/view/common/form-row.phtml:20
+msgid "Learn more"
+msgstr ""
+
+#: application/view/common/item-set-selector.phtml:7
+msgid "Click on an item set to add it to the edit panel."
+msgstr ""
+
+#: application/view/common/item-set-selector.phtml:8
+msgid "Filter item sets"
+msgstr ""
+
+#: application/view/common/item-set-selector.phtml:17
+#: application/view/omeka/admin/item-set/browse.phtml:93
+#: application/view/omeka/admin/item-set/show.phtml:17
+#: application/view/omeka/admin/item/browse.phtml:91
+#: application/view/omeka/admin/item/manage-item-sets.phtml:21
+#: application/view/omeka/admin/item/show.phtml:8
+#: application/view/omeka/admin/job/browse.phtml:56
+#: application/view/omeka/admin/job/show.phtml:18
+#: application/view/omeka/admin/media/browse.phtml:101
+#: application/view/omeka/admin/resource-template/browse.phtml:61
+#: application/view/omeka/site-admin/index/index.phtml:57
+msgid "[no owner]"
+msgstr "[эзэмшигчгүй]"
+
+#: application/view/common/item-set-selector.phtml:30
+#: application/view/common/property-selector.phtml:33
+msgid "More info"
+msgstr ""
+
+#: application/view/common/linked-resources.phtml:15
+msgid "Filter by property"
+msgstr ""
+
+#: application/view/common/linked-resources.phtml:17
+msgid "All"
+msgstr "Бүгд"
+
+#: application/view/common/linked-resources.phtml:31
+#: application/view/omeka/admin/item-set/browse.phtml:7
+#: application/view/omeka/admin/item-set/browse.phtml:73
+#: application/view/omeka/admin/item/browse.phtml:7
+#: application/view/omeka/admin/item/browse.phtml:72
+#: application/view/omeka/admin/item/manage-item-sets.phtml:9
+#: application/view/omeka/admin/media/browse.phtml:9
+#: application/view/omeka/admin/media/browse.phtml:79
+#: application/view/omeka/site-admin/index/index.phtml:7
+#: application/view/omeka/site-admin/index/index.phtml:39
+#: application/view/omeka/site-admin/index/resources.phtml:61
+#: application/view/omeka/site-admin/index/show.phtml:28
+#: application/view/omeka/site-admin/page/index.phtml:18
+#: application/view/omeka/site/item/browse.phtml:14
+msgid "Title"
+msgstr ""
+
+#: application/view/common/linked-resources.phtml:32
+#: application/view/omeka/admin/resource-template/review-import.phtml:38
+#: application/view/omeka/admin/resource-template/show.phtml:28
+msgid "Alternate label"
+msgstr ""
+
+#: application/view/common/navigation-link-form/browse.phtml:7
+#: application/view/common/navigation-link-form/page.phtml:13
+#: application/view/common/navigation-link-form/url.phtml:7
+msgid "Type"
+msgstr "Төрөл"
+
+#: application/view/common/navigation-link-form/browse.phtml:9
+msgid "Query"
+msgstr ""
+
+#: application/view/common/navigation-link-form/page.phtml:14
+#: application/view/common/pagination.phtml:8
+#: application/view/common/sidebar-pagination.phtml:5
+msgid "Page"
+msgstr "Хуудас"
+
+#: application/view/common/navigation-link-form/url.phtml:9
+msgid "URL"
+msgstr ""
+
+#: application/view/common/pagination.phtml:9
+#: application/view/common/sidebar-pagination.phtml:6
+#, php-format
+msgid "of %s"
+msgstr ""
+
+#: application/view/common/pagination.phtml:13
+#: application/view/common/sidebar-pagination.phtml:9
+msgid "Previous"
+msgstr "Өмнөх"
+
+#: application/view/common/pagination.phtml:19
+#: application/view/common/sidebar-pagination.phtml:15
+#: application/view/common/site-page-pagination.phtml:4
+msgid "Next"
+msgstr "Дараагийн"
+
+#: application/view/common/pagination.phtml:28
+#, php-format
+msgid "%1$s–%2$s of %3$s"
+msgstr ""
+
+#: application/view/common/pagination.phtml:30
+msgid "0 results"
+msgstr "0 үр дүн"
+
+#: application/view/common/property-form-batch-edit.phtml:7
+msgid "Select property"
+msgstr ""
+
+#: application/view/common/property-form-batch-edit.phtml:12
+#: application/view/common/property-form-batch-edit.phtml:76
+msgid "Add text value"
+msgstr ""
+
+#: application/view/common/property-form-batch-edit.phtml:17
+#: application/view/common/property-form-batch-edit.phtml:31
+#: application/view/common/property-form-batch-edit.phtml:46
+#: application/view/common/property-form-batch-edit.phtml:66
+#: application/view/omeka/admin/item-set/show-details.phtml:14
+#: application/view/omeka/admin/item-set/show.phtml:75
+#: application/view/omeka/admin/item/show-details.phtml:14
+#: application/view/omeka/admin/item/show.phtml:58
+#: application/view/omeka/admin/media/show-details.phtml:38
+#: application/view/omeka/admin/media/show.phtml:33
+msgid "Public"
+msgstr "Нийтийн"
+
+#: application/view/common/property-form-batch-edit.phtml:18
+#: application/view/common/property-form-batch-edit.phtml:32
+#: application/view/common/property-form-batch-edit.phtml:47
+#: application/view/common/property-form-batch-edit.phtml:67
+msgid "Not public"
+msgstr "Нийтийн биш"
+
+#: application/view/common/property-form-batch-edit.phtml:20
+#: application/view/common/property-form-batch-edit.phtml:34
+#: application/view/common/property-form-batch-edit.phtml:49
+msgid "Remove"
+msgstr "Хасах"
+
+#: application/view/common/property-form-batch-edit.phtml:26
+#: application/view/common/property-form-batch-edit.phtml:77
+msgid "Add resource value"
+msgstr ""
+
+#: application/view/common/property-form-batch-edit.phtml:30
+msgid "Resource ID"
+msgstr ""
+
+#: application/view/common/property-form-batch-edit.phtml:40
+#: application/view/common/property-form-batch-edit.phtml:78
+msgid "Add URI value"
+msgstr ""
+
+#: application/view/common/property-selector.phtml:10
+msgid "Click on a property to add it to the edit panel."
+msgstr ""
+
+#: application/view/common/property-selector.phtml:12
+msgid "Filter properties"
+msgstr "Шүүлтүүрийн тохиргоо"
+
+#: application/view/common/resource-fields.phtml:34
+#: application/view/omeka/admin/resource-template/form.phtml:32
+msgid "Add property"
+msgstr ""
+
+#: application/view/common/resource-fields.phtml:41
+msgid ""
+"Omeka S automatically selects a thumbnail from among attached media for a "
+"resource. You may use an image of your choice instead by choosing an asset "
+"here."
+msgstr ""
+
+#: application/view/common/resource-form-templates.phtml:10
+#: application/view/omeka/admin/item/sidebar-select.phtml:28
+#: application/view/omeka/site-admin/page/attachment-item-options.phtml:35
+#: application/view/omeka/site-admin/page/edit.phtml:44
+msgid "Collapse"
+msgstr ""
+
+#: application/view/common/resource-form-templates.phtml:13
+msgid "Property term for development use"
+msgstr ""
+
+#: application/view/common/resource-form-templates.phtml:18
+msgid "Select the first value type."
+msgstr ""
+
+#: application/view/common/resource-form-templates.phtml:21
+#: application/view/common/resource-form-templates.phtml:27
+#: application/view/common/resource-form-templates.phtml:28
+msgid "Add value"
+msgstr ""
+
+#: application/view/common/resource-form-templates.phtml:22
+msgid "Text"
+msgstr "Текст"
+
+#: application/view/common/resource-form-templates.phtml:23
+msgid "Omeka resource"
+msgstr "Омека нөөц"
+
+#: application/view/common/resource-select-sidebar.phtml:20
+msgid "Select resource"
+msgstr "Нөөц сонгох"
+
+#: application/view/common/site-page-pagination.phtml:3
+msgid "Prev"
+msgstr "Өмнөх"
+
+#: application/view/common/sort-link.phtml:4
+msgid "Switch to descending order"
+msgstr "Буурахаар эрэмблэхээр солих"
+
+#: application/view/common/sort-link.phtml:6
+msgid "Switch to ascending order"
+msgstr "Өсөхөөр эрэмблэхээр солих"
+
+#: application/view/common/sort-link.phtml:8
+#, php-format
+msgid "Sort by %s"
+msgstr ""
+
+#: application/view/common/sort-selector.phtml:7
+msgid "Sort by"
+msgstr "Эрэмбэлэх"
+
+#: application/view/common/sort-selector.phtml:13
+msgid "Sort order"
+msgstr ""
+
+#: application/view/common/sort-selector.phtml:14
+msgid "Ascending"
+msgstr "Өсөхөөр"
+
+#: application/view/common/sort-selector.phtml:15
+msgid "Descending"
+msgstr "Буурахаар"
+
+#: application/view/common/sort-selector.phtml:17
+msgid "Sort"
+msgstr "Эрэмблэх"
+
+#: application/view/common/user-bar.phtml:22
+#: application/view/layout/layout-admin.phtml:48
+#, php-format
+msgid "Signed in as %s"
+msgstr ""
+
+#: application/view/common/user-bar.phtml:25
+#: application/view/layout/layout-admin.phtml:52
+msgid "Logout"
+msgstr "Гарах"
+
+#: application/view/common/user-bar.phtml:28
+#: application/view/omeka/login/login.phtml:5
+msgid "Log in"
+msgstr "Нэвтрэх"
+
+#: application/view/common/user-selector.phtml:11
+msgid "Click on a user to add it to the edit panel."
+msgstr ""
+
+#: application/view/common/user-selector.phtml:14
+msgid "Filter users"
+msgstr "Хэрэглэгчийн шүүлтүүр"
+
+#: application/view/common/user-selector.phtml:16
+#, php-format
+msgid "Users (%s)"
+msgstr ""
+
+#: application/view/common/version-notification.phtml:8
+#, php-format
+msgid "A new version of Omeka S is available. %s"
+msgstr ""
+
+#: application/view/common/version-notification.phtml:12
+#: application/view/omeka/admin/module/browse.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:55
+msgid "Get the new version."
+msgstr "Шинэ хувилбар татах."
+
+#: application/view/error/403.phtml:4
+msgid "Forbidden"
+msgstr "Мартагдсан"
+
+#: application/view/error/404.phtml:12
+#, php-format
+msgid "Reason: %s"
+msgstr ""
+
+#: application/view/error/index.phtml:4
+msgid "Omeka S encountered an error"
+msgstr ""
+
+#: application/view/error/index.phtml:11
+msgid "Details:"
+msgstr ""
+
+#: application/view/layout/layout-admin.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:20
+msgid "Resources"
+msgstr "Нөөцүүд"
+
+#: application/view/layout/layout-admin.phtml:24
+#: application/view/omeka/site-admin/index/add.phtml:7
+#: application/view/omeka/site-admin/index/users.phtml:12
+msgid "Admin"
+msgstr "Админ"
+
+#: application/view/layout/layout-admin.phtml:37
+msgid "Skip to main content"
+msgstr ""
+
+#: application/view/layout/layout-admin.phtml:42
+msgid "Navigation menu"
+msgstr "Удирдлагын цэс"
+
+#: application/view/layout/layout-admin.phtml:43
+msgid "Search site"
+msgstr "Сайтаас хайх"
+
+#: application/view/layout/layout-admin.phtml:44
+msgid "User menu"
+msgstr "Хэрэглэгчийн цэс"
+
+#: application/view/layout/layout-admin.phtml:54
+msgid "not logged in"
+msgstr "нэвтрээгүй байна"
+
+#: application/view/layout/layout-admin.phtml:61
+msgid "Advanced options"
+msgstr "Ахисан түвшний тохиргоо"
+
+#: application/view/layout/layout-admin.phtml:64
+msgid "Resource type"
+msgstr "Нөөцийн төрөл"
+
+#: application/view/layout/layout-admin.phtml:66
+msgid "Search items"
+msgstr "Баримт хайх"
+
+#: application/view/layout/layout-admin.phtml:70
+msgid "Search item sets"
+msgstr "Баримтын бүрдэл хайх"
+
+#: application/view/layout/layout-admin.phtml:74
+msgid "Search media"
+msgstr ""
+
+#: application/view/layout/layout-admin.phtml:87
+#: application/view/omeka/site-admin/index/index.phtml:70
+msgid "View public site"
+msgstr ""
+
+#: application/view/layout/layout-admin.phtml:93
+#: application/view/omeka/admin/module/browse.phtml:11
+#: application/view/omeka/admin/module/configure.phtml:6
+msgid "Modules"
+msgstr ""
+
+#: application/view/layout/layout-admin.phtml:111
+msgid "Omeka S"
+msgstr "Омека Эс - Omeka S"
+
+#: application/view/layout/layout-admin.phtml:111
+#: application/view/omeka/admin/module/browse.phtml:39
+#: application/view/omeka/site-admin/index/theme-selector.phtml:37
+#: application/view/omeka/site-admin/index/theme.phtml:35
+#, php-format
+msgid "version %s"
+msgstr "хувилбар %s"
+
+#: application/view/layout/layout-admin.phtml:112
+#: application/view/omeka/admin/system-info/browse.phtml:4
+msgid "System information"
+msgstr "Системийн мэдээлэл"
+
+#: application/view/layout/layout-admin.phtml:113
+msgid "User manual"
+msgstr "Хэрэглэгчийн гарын авлага"
+
+#: application/view/layout/layout-admin.phtml:114
+msgid "Support forums"
+msgstr "Дэмжлэг үзүүлэх форум"
+
+#: application/view/layout/layout.phtml:30
+msgid "Powered by Omeka S"
+msgstr "Суурилсан програм - Омека Эс - Omeka S"
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:9
+msgid "Upload new asset"
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:12
+msgid "Upload"
+msgstr "Хуулах-Upload"
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:17
+msgid "Select asset"
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:26
+msgid "No owner"
+msgstr "Эзэмшигчгүй"
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:33
+msgid "Filter by owner"
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:49
+msgid "Delete asset"
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:53
+msgid "Cancel delete"
+msgstr "Устгахыг болиулах"
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:73
+msgid "assets"
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:78
+msgid ""
+"Are you sure you want to delete this asset? It will no longer be available "
+"to any resources currently using it."
+msgstr ""
+
+#: application/view/omeka/admin/asset/sidebar-select.phtml:79
+msgid "Confirm delete"
+msgstr "Устгахыг баталгаажуулах"
+
+#: application/view/omeka/admin/index/browse.phtml:4
+#: application/view/omeka/index/index.phtml:26
+msgid "Admin dashboard"
+msgstr "Админы удирдлагын самбар"
+
+#: application/view/omeka/admin/index/browse.phtml:9
+#, php-format
+msgid "Welcome to the %s admin dashboard!"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:12
+msgid "Manage resources"
+msgstr "Нөөцийг удирдах"
+
+#: application/view/omeka/admin/index/browse.phtml:15
+#, php-format
+msgid "Items (%s)"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:17
+#: application/view/omeka/admin/item/browse.phtml:41
+msgid "Add new item"
+msgstr "Шинэ браимт нэмэх"
+
+#: application/view/omeka/admin/index/browse.phtml:21
+#, php-format
+msgid "Item sets (%s)"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:27
+#, php-format
+msgid "Vocabularies (%s)"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:29
+#: application/view/omeka/admin/vocabulary/browse.phtml:29
+msgid "Import new vocabulary"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:33
+#, php-format
+msgid "Resource templates (%s)"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:35
+#: application/view/omeka/admin/resource-template/browse.phtml:30
+msgid "Add new resource template"
+msgstr ""
+
+#: application/view/omeka/admin/index/browse.phtml:42
+msgid "Manage sites"
+msgstr "Сайт удирдах"
+
+#: application/view/omeka/admin/index/browse.phtml:53
+msgid "Add site"
+msgstr "Сайт нэмэх"
+
+#: application/view/omeka/admin/item-set/add.phtml:6
+msgid "New item set"
+msgstr "Шинэ баримтын бүрдэл"
+
+#: application/view/omeka/admin/item-set/batch-edit.phtml:7
+msgid "Batch edit item sets"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/batch-edit.phtml:19
+#: application/view/omeka/admin/item-set/edit.phtml:20
+#: application/view/omeka/admin/item-set/form.phtml:54
+#: application/view/omeka/admin/item/batch-edit.phtml:19
+#: application/view/omeka/admin/item/edit.phtml:22
+#: application/view/omeka/admin/media/batch-edit.phtml:21
+#: application/view/omeka/admin/media/edit.phtml:66
+#: application/view/omeka/admin/resource-template/edit.phtml:15
+#: application/view/omeka/admin/setting/browse.phtml:11
+#: application/view/omeka/admin/user/batch-edit.phtml:19
+#: application/view/omeka/admin/user/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:13
+#: application/view/omeka/site-admin/index/edit.phtml:29
+#: application/view/omeka/site-admin/index/navigation.phtml:17
+#: application/view/omeka/site-admin/index/resources.phtml:31
+#: application/view/omeka/site-admin/index/settings.phtml:10
+#: application/view/omeka/site-admin/index/theme-settings.phtml:12
+#: application/view/omeka/site-admin/index/theme.phtml:18
+#: application/view/omeka/site-admin/index/users.phtml:23
+#: application/view/omeka/site-admin/page/edit.phtml:18
+msgid "Save"
+msgstr "Хадгалах"
+
+#: application/view/omeka/admin/item-set/batch-edit.phtml:27
+msgid "Affected item sets"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/batch-edit.phtml:29
+#, php-format
+msgid "You are editing the following %s item sets:"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/batch-edit.phtml:36
+#, php-format
+msgid "You are editing %s item sets."
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:11
+#: application/view/omeka/admin/item/browse.phtml:11
+#: application/view/omeka/admin/media/browse.phtml:13
+#: application/view/omeka/site/item/browse.phtml:18
+msgid "Identifier"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:19
+#: application/view/omeka/admin/item-set/browse.phtml:76
+#: application/view/omeka/admin/item-set/show.phtml:70
+#: application/view/omeka/admin/item/browse.phtml:19
+#: application/view/omeka/admin/item/browse.phtml:74
+#: application/view/omeka/admin/item/manage-item-sets.phtml:10
+#: application/view/omeka/admin/item/show.phtml:74
+#: application/view/omeka/admin/job/browse.phtml:19
+#: application/view/omeka/admin/job/browse.phtml:40
+#: application/view/omeka/admin/job/show.phtml:45
+#: application/view/omeka/admin/media/browse.phtml:21
+#: application/view/omeka/admin/media/browse.phtml:82
+#: application/view/omeka/admin/resource-template/browse.phtml:15
+#: application/view/omeka/admin/resource-template/browse.phtml:45
+#: application/view/omeka/site-admin/index/index.phtml:15
+#: application/view/omeka/site-admin/index/index.phtml:41
+#: application/view/omeka/site-admin/index/resources.phtml:62
+msgid "Owner"
+msgstr "Эзэмшигч"
+
+#: application/view/omeka/admin/item-set/browse.phtml:23
+#: application/view/omeka/admin/item-set/browse.phtml:77
+#: application/view/omeka/admin/item-set/show.phtml:66
+#: application/view/omeka/admin/item/browse.phtml:23
+#: application/view/omeka/admin/item/browse.phtml:75
+#: application/view/omeka/admin/item/show.phtml:70
+#: application/view/omeka/admin/media/browse.phtml:25
+#: application/view/omeka/admin/media/browse.phtml:83
+#: application/view/omeka/admin/media/show.phtml:41
+#: application/view/omeka/admin/user/browse.phtml:18
+#: application/view/omeka/admin/user/browse.phtml:81
+#: application/view/omeka/site/item/browse.phtml:26
+msgid "Created"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:35
+#: application/view/omeka/admin/item-set/search.phtml:5
+#: application/view/omeka/admin/item/browse.phtml:35
+#: application/view/omeka/admin/item/search.phtml:5
+#: application/view/omeka/admin/media/browse.phtml:37
+#: application/view/omeka/admin/media/search.phtml:5
+#: application/view/omeka/admin/user/browse.phtml:30
+#: application/view/omeka/admin/user/search.phtml:5
+#: application/view/omeka/site/item-set/browse.phtml:14
+#: application/view/omeka/site/item/browse.phtml:48
+msgid "Advanced search"
+msgstr "Ахисан түвшний хайлт"
+
+#: application/view/omeka/admin/item-set/browse.phtml:51
+#: application/view/omeka/admin/item-set/browse.phtml:52
+#: application/view/omeka/admin/item/browse.phtml:50
+#: application/view/omeka/admin/item/browse.phtml:51
+#: application/view/omeka/admin/media/browse.phtml:46
+#: application/view/omeka/admin/media/browse.phtml:47
+#: application/view/omeka/admin/user/browse.phtml:45
+#: application/view/omeka/admin/user/browse.phtml:46
+msgid "Batch actions"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:53
+#: application/view/omeka/admin/item/browse.phtml:52
+#: application/view/omeka/admin/media/browse.phtml:49
+#: application/view/omeka/admin/user/browse.phtml:48
+msgid "Edit selected"
+msgstr "Сонигосныг засах"
+
+#: application/view/omeka/admin/item-set/browse.phtml:54
+#: application/view/omeka/admin/item/browse.phtml:53
+#: application/view/omeka/admin/media/browse.phtml:50
+#: application/view/omeka/admin/user/browse.phtml:49
+msgid "Edit all"
+msgstr "Бүгдийг засах"
+
+#: application/view/omeka/admin/item-set/browse.phtml:55
+#: application/view/omeka/admin/item/browse.phtml:54
+#: application/view/omeka/admin/media/browse.phtml:53
+#: application/view/omeka/admin/user/browse.phtml:52
+msgid "Delete selected"
+msgstr "Сонгосныг устгах"
+
+#: application/view/omeka/admin/item-set/browse.phtml:56
+#: application/view/omeka/admin/item/browse.phtml:55
+#: application/view/omeka/admin/media/browse.phtml:54
+#: application/view/omeka/admin/user/browse.phtml:53
+msgid "Delete all"
+msgstr "Бүгдийг устгах"
+
+#: application/view/omeka/admin/item-set/browse.phtml:59
+#: application/view/omeka/admin/item-set/browse.phtml:60
+#: application/view/omeka/admin/item-set/browse.phtml:61
+#: application/view/omeka/admin/item-set/browse.phtml:63
+#: application/view/omeka/admin/item-set/browse.phtml:64
+#: application/view/omeka/admin/item/browse.phtml:58
+#: application/view/omeka/admin/item/browse.phtml:59
+#: application/view/omeka/admin/item/browse.phtml:60
+#: application/view/omeka/admin/item/browse.phtml:62
+#: application/view/omeka/admin/item/browse.phtml:63
+#: application/view/omeka/admin/media/browse.phtml:58
+#: application/view/omeka/admin/media/browse.phtml:60
+#: application/view/omeka/admin/media/browse.phtml:61
+#: application/view/omeka/admin/media/browse.phtml:65
+#: application/view/omeka/admin/media/browse.phtml:66
+#: application/view/omeka/admin/user/browse.phtml:57
+#: application/view/omeka/admin/user/browse.phtml:59
+#: application/view/omeka/admin/user/browse.phtml:60
+#: application/view/omeka/admin/user/browse.phtml:64
+#: application/view/omeka/admin/user/browse.phtml:65
+msgid "Go"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:72
+#: application/view/omeka/admin/item/browse.phtml:72
+#: application/view/omeka/admin/media/browse.phtml:77
+msgid "Select all"
+msgstr "Бүгдийг сонгох"
+
+#: application/view/omeka/admin/item-set/browse.phtml:99
+#: application/view/omeka/admin/item-set/sidebar-select.phtml:8
+msgid "Select item set"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:103
+#: application/view/omeka/admin/item-set/show-details.phtml:14
+#: application/view/omeka/admin/item-set/show.phtml:75
+#: application/view/omeka/admin/item/browse.phtml:101
+#: application/view/omeka/admin/item/show-details.phtml:14
+#: application/view/omeka/admin/item/show.phtml:58
+#: application/view/omeka/admin/media/browse.phtml:111
+#: application/view/omeka/admin/media/show-details.phtml:38
+#: application/view/omeka/admin/media/show.phtml:33
+#: application/view/omeka/admin/resource-template/form.phtml:90
+#: application/view/omeka/site-admin/index/index.phtml:64
+msgid "Private"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:117
+#: application/view/omeka/admin/item-set/edit.phtml:6
+#: application/view/omeka/admin/item/browse.phtml:115
+#: application/view/omeka/admin/item/edit.phtml:6
+#: application/view/omeka/admin/media/browse.phtml:125
+#: application/view/omeka/admin/media/edit.phtml:63
+#: application/view/omeka/admin/resource-template/browse.phtml:78
+#: application/view/omeka/admin/resource-template/form.phtml:13
+#: application/view/omeka/admin/user/browse.phtml:108
+#: application/view/omeka/admin/user/edit.phtml:40
+#: application/view/omeka/admin/vocabulary/browse.phtml:66
+#: application/view/omeka/admin/vocabulary/edit.phtml:11
+#: application/view/omeka/site-admin/index/edit.phtml:26
+#: application/view/omeka/site-admin/index/index.phtml:82
+#: application/view/omeka/site-admin/index/users.phtml:7
+#: application/view/omeka/site-admin/page/edit.phtml:16
+msgid "Delete"
+msgstr "Устгах"
+
+#: application/view/omeka/admin/item-set/browse.phtml:124
+#: application/view/omeka/admin/item/browse.phtml:122
+#: application/view/omeka/admin/media/browse.phtml:132
+#: application/view/omeka/admin/resource-template/browse.phtml:84
+#: application/view/omeka/admin/resource-template/show-property-row.phtml:26
+#: application/view/omeka/admin/resource-template/show.phtml:44
+#: application/view/omeka/admin/user/browse.phtml:114
+#: application/view/omeka/admin/vocabulary/browse.phtml:73
+#: application/view/omeka/admin/vocabulary/classes.phtml:52
+#: application/view/omeka/admin/vocabulary/properties.phtml:35
+msgid "Details"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:157
+#: application/view/omeka/admin/item-set/browse.phtml:175
+msgid "Delete item sets"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:158
+msgid "Are you sure you would like to delete the selected item sets?"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:160
+#: application/view/omeka/admin/item-set/browse.phtml:178
+#, php-format
+msgid ""
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:161
+#: application/view/omeka/admin/item-set/browse.phtml:179
+#: application/view/omeka/admin/item/browse.phtml:159
+#: application/view/omeka/admin/item/browse.phtml:177
+#: application/view/omeka/admin/media/browse.phtml:171
+#: application/view/omeka/admin/media/browse.phtml:189
+#: application/view/omeka/admin/user/browse.phtml:152
+#: application/view/omeka/admin/user/browse.phtml:170
+msgid "Warning"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:176
+msgid ""
+"Are you sure you would like to delete all item sets on all pages of this "
+"result?"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:182
+#: application/view/omeka/admin/item/browse.phtml:180
+#: application/view/omeka/admin/media/browse.phtml:192
+#: application/view/omeka/admin/user/browse.phtml:173
+msgid "Are you sure?"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/browse.phtml:216
+msgid "Omeka could not find any item sets."
+msgstr ""
+
+#: application/view/omeka/admin/item-set/form.phtml:12
+#: application/view/omeka/admin/item/form.phtml:13
+#: application/view/omeka/admin/media/edit.phtml:12
+msgid "Values"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/form.phtml:13
+#: application/view/omeka/admin/item/form.phtml:16
+#: application/view/omeka/admin/media/edit.phtml:13
+msgid "Thumbnail"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/form.phtml:27
+msgid "Close item set"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/form.phtml:33
+msgid "Open item set"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/form.phtml:47
+#: application/view/omeka/admin/item/form.phtml:49
+#: application/view/omeka/admin/item/manage-media.phtml:37
+#: application/view/omeka/admin/media/edit.phtml:58
+#: application/view/omeka/site-admin/index/add.phtml:21
+#: application/view/omeka/site-admin/index/edit.phtml:21
+msgid "Make public"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/search.phtml:12
+#: application/view/omeka/admin/item/search.phtml:12
+#: application/view/omeka/admin/media/search.phtml:12
+msgid "Reset"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show-details.phtml:13
+#: application/view/omeka/admin/item-set/show.phtml:74
+#: application/view/omeka/admin/item/show-details.phtml:13
+#: application/view/omeka/admin/item/show.phtml:57
+#: application/view/omeka/admin/media/show-details.phtml:37
+#: application/view/omeka/admin/media/show.phtml:32
+msgid "Visibility"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show-details.phtml:15
+#: application/view/omeka/admin/item-set/show.phtml:76
+msgid "Open to additions"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show-details.phtml:15
+#: application/view/omeka/admin/item-set/show.phtml:76
+msgid "Closed to additions"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:21
+#: application/view/omeka/admin/item/show.phtml:12
+#: application/view/omeka/admin/media/show.phtml:7
+msgid "Metadata"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:22
+#: application/view/omeka/admin/item/show.phtml:13
+#: application/view/omeka/site/item/show.phtml:45
+msgid "Linked resources"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:30
+msgid "Edit item set"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:32
+msgid "View items"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:54
+msgid "The following resources link to this item set:"
+msgstr ""
+
+#: application/view/omeka/admin/item-set/show.phtml:58
+msgid "No resources link to this item set."
+msgstr ""
+
+#: application/view/omeka/admin/item-set/sidebar-select.phtml:39
+msgid "item sets"
+msgstr ""
+
+#: application/view/omeka/admin/item/add.phtml:6
+msgid "New item"
+msgstr ""
+
+#: application/view/omeka/admin/item/add.phtml:13
+#: application/view/omeka/admin/resource-template/add.phtml:14
+#: application/view/omeka/admin/user/add.phtml:13
+#: application/view/omeka/site-admin/index/add-page.phtml:10
+#: application/view/omeka/site-admin/index/add.phtml:32
+msgid "Add"
+msgstr ""
+
+#: application/view/omeka/admin/item/batch-edit.phtml:7
+msgid "Batch edit items"
+msgstr ""
+
+#: application/view/omeka/admin/item/batch-edit.phtml:27
+msgid "Affected items"
+msgstr ""
+
+#: application/view/omeka/admin/item/batch-edit.phtml:29
+#, php-format
+msgid "You are editing the following %s items:"
+msgstr ""
+
+#: application/view/omeka/admin/item/batch-edit.phtml:36
+#, php-format
+msgid "You are editing %s items."
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:97
+#: application/view/omeka/admin/item/sidebar-select.phtml:10
+msgid "Select item"
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:155
+#: application/view/omeka/admin/item/browse.phtml:173
+msgid "Delete items"
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:156
+msgid "Are you sure you would like to delete the selected items?"
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:158
+#: application/view/omeka/admin/item/browse.phtml:176
+#, php-format
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:174
+msgid ""
+"Are you sure you would like to delete all items on all pages of this result?"
+msgstr ""
+
+#: application/view/omeka/admin/item/browse.phtml:214
+msgid "Omeka could not find any items."
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-item-sets.phtml:30
+#: application/view/omeka/admin/item/manage-item-sets.phtml:53
+#: application/view/omeka/site-admin/index/resources.phtml:14
+msgid "Remove item set"
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-item-sets.phtml:40
+msgid ""
+"This item is part of no item sets. Add it to an item set using the interface"
+" to the right."
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-item-sets.phtml:43
+msgid "Add to item set"
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-media.phtml:22
+msgid "Media to be removed"
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-media.phtml:64
+msgid ""
+"This resource has no media.<br>Start adding media using the sidebar to the "
+"right."
+msgstr ""
+
+#: application/view/omeka/admin/item/manage-media.phtml:68
+#: application/view/omeka/admin/item/manage-media.phtml:72
+msgid "Add media"
+msgstr ""
+
+#: application/view/omeka/admin/item/show.phtml:21
+msgid "Edit item"
+msgstr ""
+
+#: application/view/omeka/admin/item/show.phtml:44
+msgid "The following resources link to this item:"
+msgstr ""
+
+#: application/view/omeka/admin/item/show.phtml:48
+msgid "No resources link to this item."
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:28
+msgid "Filter search"
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:57
+msgid "Filter by item ID"
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:67
+msgid "Quick add"
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:98
+msgid "items"
+msgstr ""
+
+#: application/view/omeka/admin/job/browse.phtml:7
+#: application/view/omeka/admin/job/browse.phtml:37
+#: application/view/omeka/admin/user/edit.phtml:39
+msgid "ID"
+msgstr ""
+
+#: application/view/omeka/admin/job/browse.phtml:15
+#: application/view/omeka/admin/job/browse.phtml:39
+#: application/view/omeka/admin/job/show.phtml:29
+msgid "Status"
+msgstr ""
+
+#: application/view/omeka/admin/job/browse.phtml:25
+#: application/view/omeka/admin/job/show.phtml:21
+msgid "Jobs"
+msgstr ""
+
+#: application/view/omeka/admin/job/browse.phtml:78
+msgid "Omeka could not find any jobs."
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:8
+msgid "[not started]"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:13
+msgid "[not ended]"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:33
+msgid "Started"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:37
+msgid "Ended"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:49
+msgid "Args"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:54
+msgid "[no args]"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:58
+msgid "Log"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:61
+msgid "view log"
+msgstr ""
+
+#: application/view/omeka/admin/job/show.phtml:65
+msgid "[no log]"
+msgstr ""
+
+#: application/view/omeka/admin/media/batch-edit.phtml:9
+msgid "Batch edit medias"
+msgstr ""
+
+#: application/view/omeka/admin/media/batch-edit.phtml:29
+msgid "Affected medias"
+msgstr ""
+
+#: application/view/omeka/admin/media/batch-edit.phtml:31
+#, php-format
+msgid "You are editing the following %s medias:"
+msgstr ""
+
+#: application/view/omeka/admin/media/batch-edit.phtml:38
+#, php-format
+msgid "You are editing %s medias."
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:107
+#: application/view/omeka/admin/media/sidebar-select.phtml:8
+msgid "Select media"
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:167
+#: application/view/omeka/admin/media/browse.phtml:185
+msgid "Delete medias"
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:168
+msgid "Are you sure you would like to delete the selected medias?"
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:170
+#: application/view/omeka/admin/media/browse.phtml:188
+#, php-format
+msgid ""
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:186
+msgid ""
+"Are you sure you would like to delete all medias on all pages of this "
+"result?"
+msgstr ""
+
+#: application/view/omeka/admin/media/browse.phtml:227
+msgid "Omeka could not find any medias."
+msgstr ""
+
+#: application/view/omeka/admin/media/show-details.phtml:18
+msgid "Part of Item"
+msgstr ""
+
+#: application/view/omeka/admin/media/show-details.phtml:24
+#: application/view/omeka/admin/media/show.phtml:46
+msgid "MIME type"
+msgstr ""
+
+#: application/view/omeka/admin/media/show-details.phtml:31
+#: application/view/omeka/admin/media/show.phtml:52
+msgid "Size"
+msgstr ""
+
+#: application/view/omeka/admin/media/show-details.phtml:32
+#: application/view/omeka/admin/media/show.phtml:53
+#, php-format
+msgid "%s bytes"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:14
+msgid "Edit media"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:36
+msgid "Part of item"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:57
+msgid "Ingester"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:62
+msgid "Source"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:68
+msgid "File Derivatives"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:70
+msgid "original"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:73
+msgid "large"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:74
+msgid "medium"
+msgstr ""
+
+#: application/view/omeka/admin/media/show.phtml:75
+msgid "square"
+msgstr ""
+
+#: application/view/omeka/admin/media/sidebar-select.phtml:38
+msgid "media"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:15
+msgid "All modules"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:36
+msgid "name not found"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:44
+#: application/view/omeka/admin/module/browse.phtml:46
+#, php-format
+msgid "by %s"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:58
+#, php-format
+msgid "A new version of this module is available. %s"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:75
+#: application/view/omeka/admin/module/browse.phtml:83
+#: application/view/omeka/admin/module/configure.phtml:6
+#: application/view/omeka/site-admin/index/theme-settings.phtml:6
+msgid "Configure"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:127
+msgid "Uninstall"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:144
+msgid "Error: invalid Module.php file"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:146
+msgid "Error: invalid config/module.ini file"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:148
+#, php-format
+msgid "Error: %1$s requires Omeka S %2$s"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:150
+msgid "Error: module in database but not in filesystem"
+msgstr ""
+
+#: application/view/omeka/admin/module/browse.phtml:167
+msgid "Omeka could not find any modules."
+msgstr ""
+
+#: application/view/omeka/admin/module/configure.phtml:10
+msgid "Submit"
+msgstr ""
+
+#: application/view/omeka/admin/module/uninstall-confirm.phtml:5
+msgid "Uninstall module"
+msgstr ""
+
+#: application/view/omeka/admin/module/uninstall-confirm.phtml:6
+msgid "Are you sure you would like to uninstall this module?"
+msgstr ""
+
+#: application/view/omeka/admin/property/show-details.phtml:6
+#: application/view/omeka/admin/resource-class/show-details.phtml:6
+msgid "Vocabulary"
+msgstr ""
+
+#: application/view/omeka/admin/property/show-details.phtml:10
+#: application/view/omeka/admin/resource-class/show-details.phtml:10
+#: application/view/omeka/admin/vocabulary/classes.phtml:11
+#: application/view/omeka/admin/vocabulary/classes.phtml:38
+#: application/view/omeka/admin/vocabulary/properties.phtml:21
+msgid "Term"
+msgstr ""
+
+#: application/view/omeka/admin/property/show-details.phtml:14
+#: application/view/omeka/admin/resource-class/show-details.phtml:14
+#: application/view/omeka/admin/resource-template/form.phtml:62
+msgid "Comment"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/add.phtml:6
+msgid "New resource template"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/add.phtml:6
+#: application/view/omeka/admin/resource-template/browse.phtml:25
+#: application/view/omeka/admin/resource-template/edit.phtml:6
+#: application/view/omeka/admin/resource-template/import.phtml:5
+#: application/view/omeka/admin/resource-template/review-import.phtml:5
+#: application/view/omeka/admin/resource-template/show.phtml:7
+msgid "Resource templates"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/browse.phtml:28
+#: application/view/omeka/admin/resource-template/import.phtml:5
+#: application/view/omeka/admin/vocabulary/import.phtml:12
+msgid "Import"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/browse.phtml:106
+msgid "Omeka could not find any resource templates."
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:56
+#: application/view/omeka/admin/resource-template/form.phtml:63
+msgid "Original"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:58
+#: application/view/omeka/admin/resource-template/form.phtml:65
+msgid "Alternate"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:69
+msgid "Other options"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:72
+msgid "Use for resource title"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:78
+msgid "Use for resource description"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:84
+msgid "Required"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:95
+#: application/view/omeka/admin/resource-template/review-import.phtml:37
+#: application/view/omeka/admin/resource-template/show.phtml:27
+msgid "Data type"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/form.phtml:101
+msgid "Set changes"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/import.phtml:9
+msgid "Review import"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:5
+msgid "Review"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:9
+msgid "Complete import"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:36
+#: application/view/omeka/admin/resource-template/show.phtml:26
+msgid "Original label"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:39
+#: application/view/omeka/admin/resource-template/show.phtml:29
+msgid "Alternate comment"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:40
+#: application/view/omeka/admin/resource-template/show.phtml:30
+msgid "Required?"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:41
+#: application/view/omeka/admin/resource-template/show.phtml:31
+msgid "Private?"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:75
+#: application/view/omeka/admin/resource-template/review-import.phtml:76
+#: application/view/omeka/admin/resource-template/show.phtml:51
+#: application/view/omeka/admin/resource-template/show.phtml:52
+#: application/view/omeka/admin/system-info/browse.phtml:18
+msgid "Yes"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/review-import.phtml:75
+#: application/view/omeka/admin/resource-template/review-import.phtml:76
+#: application/view/omeka/admin/resource-template/show.phtml:51
+#: application/view/omeka/admin/resource-template/show.phtml:52
+#: application/view/omeka/admin/system-info/browse.phtml:18
+msgid "No"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/show-property-row.phtml:32
+msgid "Edit property"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/show-property-row.phtml:36
+msgid "Remove property"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/show.phtml:10
+msgid "Export"
+msgstr ""
+
+#: application/view/omeka/admin/resource-template/show.phtml:12
+msgid "Edit resource template"
+msgstr ""
+
+#: application/view/omeka/admin/setting/browse.phtml:7
+msgid "Global settings"
+msgstr ""
+
+#: application/view/omeka/admin/user/add.phtml:7
+msgid "New user"
+msgstr ""
+
+#: application/view/omeka/admin/user/add.phtml:7
+#: application/view/omeka/admin/user/browse.phtml:24
+#: application/view/omeka/admin/user/edit.phtml:14
+#: application/view/omeka/admin/user/search.phtml:5
+#: application/view/omeka/admin/user/show.phtml:7
+msgid "Users"
+msgstr ""
+
+#: application/view/omeka/admin/user/batch-edit.phtml:7
+msgid "Batch edit users"
+msgstr ""
+
+#: application/view/omeka/admin/user/batch-edit.phtml:26
+msgid "Affected users"
+msgstr ""
+
+#: application/view/omeka/admin/user/batch-edit.phtml:28
+#, php-format
+msgid "You are editing the following %s users:"
+msgstr ""
+
+#: application/view/omeka/admin/user/batch-edit.phtml:35
+#, php-format
+msgid "You are editing %s users (except yourself)."
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:36
+#: application/view/omeka/site-admin/index/users.phtml:70
+msgid "Add new user"
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:95
+msgid "Inactive"
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:148
+#: application/view/omeka/admin/user/browse.phtml:166
+msgid "Delete users"
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:149
+msgid "Are you sure you would like to delete the selected users?"
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:151
+#, php-format
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:167
+msgid ""
+"Are you sure you would like to delete all users (except yourself) on all "
+"pages of this result?"
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:169
+#, php-format
+msgid ""
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
+"cannot be undone."
+msgstr ""
+
+#: application/view/omeka/admin/user/browse.phtml:208
+msgid "Omeka could not find any users."
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:6
+msgid "User information"
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:7
+msgid "User settings"
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:8
+msgid "Password"
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:9
+msgid "API keys"
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:34
+msgid "Keys"
+msgstr ""
+
+#: application/view/omeka/admin/user/edit.phtml:57
+msgid "Add a new key"
+msgstr ""
+
+#: application/view/omeka/admin/user/show-details.phtml:7
+msgid "(inactive)"
+msgstr ""
+
+#: application/view/omeka/admin/user/show.phtml:11
+msgid "Edit user"
+msgstr ""
+
+#: application/view/omeka/admin/user/show.phtml:23
+msgid "Display name"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/browse.phtml:11
+#: application/view/omeka/admin/vocabulary/browse.phtml:44
+msgid "Prefix"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/browse.phtml:15
+#: application/view/omeka/admin/vocabulary/browse.phtml:45
+#: application/view/omeka/admin/vocabulary/classes.phtml:21
+msgid "Classes"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/browse.phtml:19
+#: application/view/omeka/admin/vocabulary/browse.phtml:46
+#: application/view/omeka/admin/vocabulary/properties.phtml:7
+msgid "Properties"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/browse.phtml:25
+#: application/view/omeka/admin/vocabulary/classes.phtml:21
+#: application/view/omeka/admin/vocabulary/edit.phtml:7
+#: application/view/omeka/admin/vocabulary/import.phtml:7
+#: application/view/omeka/admin/vocabulary/properties.phtml:7
+#: application/view/omeka/admin/vocabulary/update.phtml:20
+msgid "Vocabularies"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/browse.phtml:100
+msgid "Omeka could not find any vocabularies."
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/classes.phtml:24
+#: application/view/omeka/admin/vocabulary/properties.phtml:10
+msgid "Prefix:"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/classes.phtml:25
+#: application/view/omeka/admin/vocabulary/properties.phtml:11
+#: application/view/omeka/admin/vocabulary/show-details.phtml:7
+msgid "Namespace URI:"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/classes.phtml:75
+msgid "This vocabulary has no classes."
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
+msgid ""
+"You may update this vocabulary to a newer version. You will be able to "
+"review the changes before you accept."
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/import.phtml:7
+msgid "New vocabulary"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/properties.phtml:58
+msgid "This vocabulary has no properties."
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/update.phtml:20
+msgid "Update"
+msgstr ""
+
+#: application/view/omeka/admin/vocabulary/update.phtml:24
+msgid "Accept changes"
+msgstr ""
+
+#: application/view/omeka/index/index.phtml:6
+#: application/view/omeka/site-admin/index/add.phtml:13
+#: application/view/omeka/site-admin/index/edit.phtml:7
+#: application/view/omeka/site-admin/index/index.phtml:21
+#: application/view/omeka/site-admin/index/navigation.phtml:10
+#: application/view/omeka/site-admin/index/resources.phtml:20
+#: application/view/omeka/site-admin/index/settings.phtml:6
+#: application/view/omeka/site-admin/index/show.phtml:11
+#: application/view/omeka/site-admin/index/theme.phtml:11
+#: application/view/omeka/site-admin/index/users.phtml:16
+#: application/view/omeka/site-admin/page/index.phtml:7
+msgid "Sites"
+msgstr ""
+
+#: application/view/omeka/index/index.phtml:25
+#, php-format
+msgid "Go to the %1$s to start working with %2$s."
+msgstr ""
+
+#: application/view/omeka/install/index.phtml:11
+msgid "Install Omeka S"
+msgstr ""
+
+#: application/view/omeka/install/index.phtml:14
+msgid "Some installation requirements were not satisfied."
+msgstr ""
+
+#: application/view/omeka/login/create-password.phtml:6
+msgid "Create a new password"
+msgstr ""
+
+#: application/view/omeka/login/create-password.phtml:11
+msgid "Activate"
+msgstr ""
+
+#: application/view/omeka/login/forgot-password.phtml:6
+msgid "Forgot password"
+msgstr ""
+
+#: application/view/omeka/login/forgot-password.phtml:11
+msgid "Send password reset email"
+msgstr ""
+
+#: application/view/omeka/login/login.phtml:7
+msgid "Forgot password?"
+msgstr ""
+
+#: application/view/omeka/maintenance/index.phtml:4
+msgid "Site under maintenance"
+msgstr ""
+
+#: application/view/omeka/maintenance/index.phtml:5
+msgid ""
+"This site is down for maintenance. Please contact the site administrator for\n"
+"more information."
+msgstr ""
+
+#: application/view/omeka/migrate/index.phtml:4
+#: application/view/omeka/migrate/index.phtml:7
+msgid "Update database"
+msgstr ""
+
+#: application/view/omeka/migrate/index.phtml:5
+msgid ""
+"There was a recent software upgrade and the database needs to be updated. "
+"The entire site will be down for maintenance until you click the button "
+"below."
+msgstr ""
+
+#: application/view/omeka/migrate/index.phtml:10
+msgid ""
+"There are environment errors that must be resolved before you can update the"
+" database."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/add-page.phtml:6
+msgid "New page"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/add-page.phtml:6
+#: application/view/omeka/site-admin/page/edit.phtml:11
+#: application/view/omeka/site-admin/page/index.phtml:7
+#: application/view/omeka/site/index/search.phtml:3
+#: application/view/omeka/site/page/browse.phtml:5
+msgid "Pages"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/add.phtml:8
+#: application/view/omeka/site-admin/index/show.phtml:32
+#: application/view/omeka/site-admin/index/theme-settings.phtml:6
+#: application/view/omeka/site-admin/index/theme.phtml:11
+msgid "Theme"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/add.phtml:9
+#: application/view/omeka/site-admin/index/resources.phtml:22
+msgid "Item pool"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/add.phtml:13
+msgid "New site"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/index.phtml:11
+#: application/view/omeka/site-admin/index/index.phtml:40
+#: application/view/omeka/site-admin/index/show.phtml:24
+msgid "URL slug"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/index.phtml:25
+msgid "Add new site"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/index.phtml:109
+msgid "Omeka could not find any sites."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:10
+msgid "Navigation"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:24
+#: application/view/omeka/site-admin/index/navigation.phtml:44
+msgid "Add a link to a site page"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:28
+msgid "Select a homepage"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:32
+msgid "Add a custom link"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:46
+msgid "Filter pages"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/navigation.phtml:60
+msgid "There are no available pages."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/resources.phtml:36
+#, php-format
+msgid "There are currently %s items in this site’s pool."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/resources.phtml:68
+msgid "No item sets are assigned to this site."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/show.phtml:6
+#: application/view/omeka/site-admin/index/users.phtml:10
+msgid "Viewer"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/show.phtml:7
+#: application/view/omeka/site-admin/index/users.phtml:11
+msgid "Editor"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/show.phtml:20
+msgid "Back to site list"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/show.phtml:40
+msgid "Summary"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme-selector.phtml:26
+msgid "Invalid theme.ini file"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme-selector.phtml:28
+#, php-format
+msgid "This theme requires Omeka S %s"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme-settings.phtml:17
+msgid "The current theme has no configuration options."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:27
+msgid "Current theme"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:44
+msgid "Edit theme settings"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:51
+#, php-format
+msgid "A new version of this theme is available. %s"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:61
+msgid "Error: this theme is invalid."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:63
+#, php-format
+msgid "ID: %s"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:64
+#, php-format
+msgid "Status: %s"
+msgstr ""
+
+#: application/view/omeka/site-admin/index/theme.phtml:66
+msgid ""
+"Please contact the Omeka S administrator. This site will not be publicly "
+"available until the problem is resolved or you select another theme below."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/users.phtml:8
+msgid "Restore"
+msgstr "Сэргээх"
+
+#: application/view/omeka/site-admin/index/users.phtml:16
+msgid "User permissions"
+msgstr "Хэрэглэгчийн зөвшөөрөгдөх эрх"
+
+#: application/view/omeka/site-admin/index/users.phtml:68
+msgid "This site has no users. Add users using the interface to the right."
+msgstr ""
+
+#: application/view/omeka/site-admin/index/users.phtml:71
+msgid "Click on a user to add them to the site."
+msgstr ""
+
+#: application/view/omeka/site-admin/page/attachment-item-options.phtml:17
+msgid "Change item"
+msgstr "Баримтыг өөрчлөх"
+
+#: application/view/omeka/site-admin/page/attachment-item-options.phtml:59
+msgid "No item selected."
+msgstr "Баримт сонгогдоогүй байна."
+
+#: application/view/omeka/site-admin/page/edit.phtml:28
+msgid "Add new block"
+msgstr "Шинэ блок нэмэх"
+
+#: application/view/omeka/site-admin/page/edit.phtml:41
+msgid "Caption"
+msgstr ""
+
+#: application/view/omeka/site-admin/page/edit.phtml:52
+msgid "Apply changes"
+msgstr "Өөрчлөлтийг хадгалах"
+
+#: application/view/omeka/site-admin/page/index.phtml:11
+msgid "Add new page"
+msgstr "Шинэ хуудас нэмэх"
+
+#: application/view/omeka/site-admin/page/index.phtml:19
+msgid "Slug"
+msgstr ""
+
+#: application/view/omeka/site-admin/page/index.phtml:39
+msgid "View public page"
+msgstr "Нийтэд зориулсан хуудас харах"
+
+#: application/view/omeka/site-admin/page/index.phtml:50
+msgid "Delete page"
+msgstr "Хуудас устгах"
+
+#: application/view/omeka/site/index/index.phtml:4
+msgid "This site has no pages."
+msgstr "Энэ сайтад ямар нэг хуудас алга"
+
+#: application/view/omeka/site/index/search.phtml:1
+#, php-format
+msgid "Search results for “%s”"
+msgstr "“%s” Хайлтын үр дүн"
+
+#: application/view/omeka/site/index/search.phtml:11
+#: application/view/omeka/site/index/search.phtml:32
+#, php-format
+msgid "View all results (%s total)"
+msgstr ""
+
+#: application/view/omeka/site/index/search.phtml:20
+#: application/view/omeka/site/page/browse.phtml:18
+msgid "No pages found"
+msgstr "Хуудас олдсонгүй"
+
+#: application/view/omeka/site/index/search.phtml:41
+msgid "No items found"
+msgstr "Баримт олдсонгүй"
+
+#: application/view/omeka/site/item-set/search.phtml:6
+msgid "Advanced item set Search"
+msgstr "Баримтын бүрдлийг ахисан түвшинд хайх"
+
+#: application/view/omeka/site/item/search.phtml:6
+msgid "Advanced item search"
+msgstr "Баримтыг ахисан түвшинд хайх"
+
+#: application/view/omeka/site/item/show.phtml:10
+msgid "Item"
+msgstr "Баримт"
+
+#: application/config/module.config.php:617
+msgid "Something went wrong"
+msgstr "Ямар нэг зүйл буруу байна"
+
+#: application/config/module.config.php:622
+msgid "You have unsaved changes."
+msgstr "Та өөрчлөлтийг хадгалаагүй байна."
+
+#: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Баримтын бүрдлийг сэргээх"
+
+#: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr "Айконы бүрдлийг хаах"
+
+#: application/config/module.config.php:625
+msgid "Open icon set"
+msgstr "Айконы бүрддийг нээх"
+
+#: application/config/module.config.php:627
+msgid "Failed loading resource template from API"
+msgstr ""
+
+#: application/config/module.config.php:628
+msgid "Restore property"
+msgstr ""
+
+#: application/config/module.config.php:630
+msgid "Please enter a valid language tag"
+msgstr ""
+
+#: application/config/module.config.php:632
+msgid "Description"
+msgstr ""
+
+#: application/config/navigation.config.php:181
+#: application/config/navigation.config.php:250
+#: application/src/Form/InstallationForm.php:26
+msgid "Settings"
+msgstr "Тохиргоо"
+
+#: application/config/navigation.config.php:192
+msgid "Site info"
+msgstr "Сайтын мэдээлэл"
+
+#: application/src/View/Helper/ResourceClassSelect.php:39
+msgid "Select class…"
+msgstr ""
+
+#: application/src/View/Helper/SiteSelect.php:39
+msgid "Select site…"
+msgstr "Сайт сонгох"
+
+#: application/src/View/Helper/RoleSelect.php:39
+#: application/src/Service/Form/Element/RoleSelectFactory.php:16
+#: application/src/Form/UserBatchUpdateForm.php:27
+#: application/src/Form/UserForm.php:97
+msgid "Select role…"
+msgstr "Эрх үүрэг сонгох..."
+
+#: application/src/View/Helper/UserSelect.php:39
+msgid "Select user…"
+msgstr "Хэрэглэгч сонгох..."
+
+#: application/src/View/Helper/PropertySelect.php:39
+msgid "Select property…"
+msgstr ""
+
+#: application/src/View/Helper/ItemSetSelect.php:39
+msgid "Select item set…"
+msgstr "Баримтын бүрдэл сонгох"
+
+#: application/src/View/Helper/ResourceTemplateSelect.php:39
+msgid "Select template…"
+msgstr "Загвар сонгох"
+
+#: application/src/View/Helper/BlockShowTitleSelect.php:24
+msgid "item title"
+msgstr "Баримтын нэр"
+
+#: application/src/View/Helper/BlockShowTitleSelect.php:25
+msgid "media title"
+msgstr "медиагийн нэр"
+
+#: application/src/View/Helper/BlockShowTitleSelect.php:26
+msgid "no title"
+msgstr "нэргүй"
+
+#: application/src/File/Validator.php:65
+#, php-format
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
+msgstr ""
+
+#: application/src/File/Validator.php:78
+#, php-format
+msgid ""
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
+msgstr ""
+
+#: application/src/File/Downloader.php:71
+#, php-format
+msgid "Error downloading %1$s: %2$s"
+msgstr ""
+
+#: application/src/File/Downloader.php:83
+#, php-format
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:102
+msgid "Missing thumbnail configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:106
+msgid "Missing thumbnail types configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:109
+msgid "Missing the large, medium, or square thumbnail type configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:113
+msgid "Missing constraint for a thumbnail type configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:117
+msgid "Missing thumbnail fallbacks configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:120
+msgid "Missing default thumbnail fallback configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:123
+msgid "Missing thumbnail fallback configuration."
+msgstr ""
+
+#: application/src/File/ThumbnailManager.php:127
+msgid "Invalid thumbnail fallback configuration."
+msgstr ""
+
+#: application/src/Form/ResourceTemplateImportForm.php:14
+msgid "Resource template file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr "Энгийн мэдээлэл"
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr "Файл"
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
+msgid "Namespace URI"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Файлын формат"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/ResourceForm.php:30
+#: application/src/Form/ResourceBatchUpdateForm.php:69
+#: application/src/Form/UserForm.php:144
+msgid "Select a template"
+msgstr ""
+
+#: application/src/Form/ResourceForm.php:34
+msgid "Resource template"
+msgstr ""
+
+#: application/src/Form/ResourceForm.php:35
+msgid "A pre-defined template for resource creation."
+msgstr ""
+
+#: application/src/Form/ResourceForm.php:53
+#: application/src/Form/ResourceBatchUpdateForm.php:92
+msgid "Select a class"
+msgstr ""
+
+#: application/src/Form/ResourceForm.php:57
+msgid ""
+"A type for the resource. Different types have different default properties "
+"attached to them."
+msgstr ""
+
+#: application/src/Form/Initializer/Csrf.php:35
+msgid "Invalid or missing CSRF token"
+msgstr ""
+
+#: application/src/Form/SitePageForm.php:39
+msgid "Add to navigation"
+msgstr ""
+
+#: application/src/Form/ResourceTemplateForm.php:27
+msgid "Suggested class"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:28
+#: application/src/Form/SettingForm.php:109
+msgid "General"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:36
+msgid "Attachment link type"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:38
+msgid "Item page"
+msgstr "Баримтын хуудас"
+
+#: application/src/Form/SiteSettingsForm.php:39
+msgid "Media page"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:40
+msgid "Direct link to file"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:52
+msgid "Embed media on item pages"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:63
+msgid "Show page pagination"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:64
+msgid ""
+"Show pagination that helps users follow a linear narrative through a site."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:75
+msgid "Show user bar on public views"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:77
+msgid "Never"
+msgstr "Хэзээ ч"
+
+#: application/src/Form/SiteSettingsForm.php:78
+msgid "When logged in"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:79
+msgid "Always"
+msgstr "Үргэлж"
+
+#: application/src/Form/SiteSettingsForm.php:90
+#: application/src/Form/SettingForm.php:236
+msgid "Disable JSON-LD embed"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:91
+#: application/src/Form/SettingForm.php:237
+msgid ""
+"By default, Omeka embeds JSON-LD in resource browse and show pages for the "
+"purpose of machine-readable metadata discovery. Check this to disable "
+"embedding."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:103
+#: application/src/Form/InstallationForm.php:112
+#: application/src/Form/UserForm.php:129
+#: application/src/Form/SettingForm.php:209
+msgid "Locale"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:104
+msgid ""
+"Locale/language code for this site. Leave blank to use the global locale "
+"setting."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:126
+msgid "Restrict browse to attached items"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:137
+#: application/src/Form/SettingForm.php:160
+msgid "Results per page"
+msgstr "Нэг хуудсанд харуулах үр дүн"
+
+#: application/src/Form/SiteSettingsForm.php:138
+msgid ""
+"The maximum number of results per page on browse pages. Leave blank to use "
+"the global setting."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:144
+msgid "Use global setting"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:152
+msgid "Browse heading property"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:153
+msgid ""
+"Use this property for the heading of each resource on a browse page. Keep "
+"unselected to use the default title property of each resource."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:161
+#: application/src/Form/SiteSettingsForm.php:178
+msgid "Select a property"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:169
+msgid "Browse body property"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:170
+msgid ""
+"Use this property for the body of each resource on a browse page. Keep "
+"unselected to use the default description property of each resource."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:195
+msgid "Templates"
+msgstr "Загвар"
+
+#: application/src/Form/SiteSettingsForm.php:196
+msgid "Select which templates to apply to the advanced search form."
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:201
+msgid "Select templates"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:209
+msgid "Restrict to templates"
+msgstr ""
+
+#: application/src/Form/SiteSettingsForm.php:210
+msgid "Restrict search results to resources of the selected templates."
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:30
+msgid "Set role"
+msgstr "Үүрэг тохируулах"
+
+#: application/src/Form/UserBatchUpdateForm.php:31
+#: application/src/Form/UserBatchUpdateForm.php:43
+#: application/src/Form/UserBatchUpdateForm.php:60
+#: application/src/Form/UserBatchUpdateForm.php:77
+#: application/src/Form/UserBatchUpdateForm.php:92
+#: application/src/Form/ResourceBatchUpdateForm.php:37
+#: application/src/Form/ResourceBatchUpdateForm.php:54
+#: application/src/Form/ResourceBatchUpdateForm.php:74
+#: application/src/Form/ResourceBatchUpdateForm.php:97
+msgid "[No change]"
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:39
+msgid "Set activity"
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:55
+#: application/src/Form/UserBatchUpdateForm.php:72
+msgid "Select sites…"
+msgstr "Сайт сонгох"
+
+#: application/src/Form/UserBatchUpdateForm.php:59
+msgid "Remove from site permission"
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:61
+#: application/src/Form/UserBatchUpdateForm.php:78
+msgid "[All sites]"
+msgstr "[Бүх сайт]"
+
+#: application/src/Form/UserBatchUpdateForm.php:76
+msgid "Add to site permission"
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:87
+msgid "Select permission…"
+msgstr ""
+
+#: application/src/Form/UserBatchUpdateForm.php:91
+msgid "Add to site permission as"
+msgstr ""
+
+#: application/src/Form/ModuleStateChangeForm.php:37
+msgid "Install"
+msgstr "Суулгах"
+
+#: application/src/Form/ModuleStateChangeForm.php:55
+msgid "Deactivate"
+msgstr ""
+
+#: application/src/Form/ModuleStateChangeForm.php:64
+msgid "Upgrade"
+msgstr "Шинэчлэх"
+
+#: application/src/Form/InstallationForm.php:19
+msgid "Create the first user"
+msgstr ""
+
+#: application/src/Form/InstallationForm.php:52
+msgid "Confirm email"
+msgstr "Имэйл баталгаажуулах"
+
+#: application/src/Form/InstallationForm.php:80
+#: application/src/Form/SettingForm.php:131
+msgid "Installation title"
+msgstr ""
+
+#: application/src/Form/InstallationForm.php:98
+#: application/src/Form/SettingForm.php:146
+msgid "Time zone"
+msgstr "Цагийн бүс"
+
+#: application/src/Form/InstallationForm.php:128
+msgid "The emails did not match"
+msgstr "Имэйл тохирохгүй байна"
+
+#: application/src/Form/ResourceBatchUpdateForm.php:33
+msgid "Set visibility"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:50
+msgid "Set openness"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:52
+msgid "Open"
+msgstr "Нээх"
+
+#: application/src/Form/ResourceBatchUpdateForm.php:53
+msgid "Not open"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:73
+msgid "Set template"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:75
+msgid "[Unset template]"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:95
+msgid "Set class"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:96
+msgid "[Unset class]"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:110
+#: application/src/Form/ResourceBatchUpdateForm.php:124
+msgid "Select item sets"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:113
+msgid "Add to item sets"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:127
+msgid "Remove from item sets"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:137
+msgid "Clear language"
+msgstr "Хэл цэвэрлэх"
+
+#: application/src/Form/ResourceBatchUpdateForm.php:161
+#: application/view/common/property-form-batch-edit.phtml:63
+msgid "Select properties"
+msgstr ""
+
+#: application/src/Form/ResourceBatchUpdateForm.php:164
+msgid "Clear property values"
+msgstr ""
+
+#: application/src/Form/ConfirmForm.php:17
+msgid "Confirm"
+msgstr "Баталгаажуулах"
+
+#: application/src/Form/UserForm.php:130
+#: application/src/Form/SettingForm.php:210
+msgid "Global locale/language code for all interfaces."
+msgstr ""
+
+#: application/src/Form/UserForm.php:148
+msgid "Default resource template"
+msgstr ""
+
+#: application/src/Form/UserForm.php:166
+msgid "Current password"
+msgstr "Одоогийн нууц үг"
+
+#: application/src/Form/UserForm.php:178
+msgid "New password"
+msgstr "Шинэ нууц үг"
+
+#: application/src/Form/UserForm.php:179
+msgid "Confirm new password"
+msgstr "Нууц үгийг баталгаажуулах"
+
+#: application/src/Form/UserForm.php:188
+msgid "New key label"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:118
+msgid "Administrator email"
+msgstr "Удирдагчийн имэйл"
+
+#: application/src/Form/SettingForm.php:161
+msgid "The maximum number of results per page on browse pages."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:174
+msgid "Property label information"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:175
+msgid "The additional information that accompanies labels on resource pages."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:177
+msgid "None"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:178
+msgid "Show Vocabulary"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:179
+msgid "Show Term"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:192
+msgid "Default site"
+msgstr "Үндсэн сайт"
+
+#: application/src/Form/SettingForm.php:193
+msgid ""
+"Select which site should appear when users go to the front page of the "
+"installation."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:198
+msgid "No default (show index of sites)"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:223
+msgid "Enable version notifications"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:224
+msgid ""
+"Enable notifications when a new version of Omeka S, modules, or themes are "
+"available."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:249
+msgid "Default content visibility to Private"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:250
+msgid ""
+"If checked, all items, item sets and sites newly created will have their "
+"visibility set to private by default."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:262
+msgid "Index full-text search"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:276
+msgid "Security"
+msgstr "Хамгаалалт"
+
+#: application/src/Form/SettingForm.php:285
+msgid "Use HTMLPurifier"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:286
+msgid "Clean up user-entered HTML."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:298
+msgid "Disable file validation"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:299
+msgid "Check this to disable file media type and extension validation."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:308
+msgid "Allowed media types"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:309
+msgid "A comma-separated list of allowed media types for file uploads."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:321
+msgid "Allowed file extensions"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:322
+msgid "A comma-separated list of allowed file extensions for file uploads."
+msgstr ""
+
+#: application/src/Form/SettingForm.php:336
+msgid "reCAPTCHA site key"
+msgstr ""
+
+#: application/src/Form/SettingForm.php:347
+msgid "reCAPTCHA secret key"
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:20
+#, php-format
+msgid "be a minimum of %s characters in length."
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:24
+#, php-format
+msgid "contain at least %s lowercase characters."
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:28
+#, php-format
+msgid "contain at least %s uppercase characters."
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:32
+#, php-format
+msgid "contain at least %s numbers."
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:39
+#, php-format
+msgid "contain at least %1$s symbols: %2$s"
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:43
+msgid "Password must:"
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:66
+msgid "Confirm password"
+msgstr "Нууц үг баталгаажуулах"
+
+#: application/src/Form/Element/PasswordConfirm.php:85
+msgid "The password is invalid"
+msgstr ""
+
+#: application/src/Form/Element/PasswordConfirm.php:100
+msgid "The passwords did not match"
+msgstr ""
+
+#: application/src/Form/Element/ColorPicker.php:10
+msgid "three- or six-digit hexadecimal color, or \"transparent\""
+msgstr ""
+
+#: application/src/Form/Element/ColorPicker.php:29
+msgid "Invalid color format"
+msgstr ""
+
+#: application/src/Form/Element/Recaptcha.php:99
+msgid "You must verify that you are human by completing the CAPTCHA."
+msgstr ""
+
+#: application/src/Form/Element/Recaptcha.php:108
+msgid "Could not verify that you are a human."
+msgstr ""
+
+#: application/src/Controller/MigrateController.php:40
+msgid "Migration successful"
+msgstr ""
+
+#: application/src/Controller/InstallController.php:52
+msgid "Installation successful. Please log in."
+msgstr ""
+
+#: application/src/Controller/InstallController.php:56
+msgid "There were errors during installation."
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:66
+msgid "Site successfully created"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:92
+msgid "Site successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:115
+msgid "User does not have permission to edit site settings"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:136
+#: application/src/Controller/Admin/SettingController.php:35
+msgid "Settings successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:172
+msgid "Page successfully created"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:201
+msgid "Homepage"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:207
+msgid "First page in navigation"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:223
+msgid "Navigation successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:256
+msgid "Site resources successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:297
+msgid "User permissions successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:329
+msgid "Site theme successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:403
+msgid "Theme settings successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:420
+msgid "Site successfully deleted"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/IndexController.php:443
+msgid "site"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/PageController.php:28
+msgid "Page successfully updated"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/PageController.php:81
+msgid "page"
+msgstr ""
+
+#: application/src/Controller/SiteAdmin/PageController.php:98
+msgid "Page successfully deleted"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:56
+msgid "Successfully logged in"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:65
+msgid "Email or password is invalid"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:88
+msgid "Successfully logged out"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:104
+msgid "Invalid password creation key."
+msgstr ""
+
+#: application/src/Controller/LoginController.php:113
+msgid "Password creation key expired."
+msgstr ""
+
+#: application/src/Controller/LoginController.php:129
+msgid "Successfully created your password. Please log in."
+msgstr ""
+
+#: application/src/Controller/LoginController.php:132
+msgid "Password creation unsuccessful"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:168
+msgid "Check your email for instructions on how to reset your password"
+msgstr ""
+
+#: application/src/Controller/LoginController.php:171
+msgid "Activation unsuccessful"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:338
+msgid "resource template"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:351
+msgid "Resource template successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:353
+#: application/src/Controller/Admin/ResourceTemplateController.php:356
+msgid "Resource template could not be deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:408
+msgid "Resource template successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/ResourceTemplateController.php:411
+#, php-format
+msgid "Resource template successfully created. %s"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:44
+#: application/src/Controller/Admin/UserController.php:49
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
+#: application/src/Controller/Admin/MediaController.php:27
+#: application/src/Controller/Admin/MediaController.php:32
+#: application/src/Controller/Admin/ItemController.php:42
+#: application/src/Controller/Admin/ItemController.php:47
+msgid "Confirm Delete"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:113
+#, php-format
+msgid "User successfully created. %s"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:187
+msgid "User successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:202
+msgid "The current password entered was invalid"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:206
+msgid "Password successfully changed"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:234
+msgid "Key(s) successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:242
+#, php-format
+msgid ""
+"API key successfully created.<br><br>Here is your key ID and credential for "
+"access to the API. WARNING: \"key_credential\" will be unretrievable after "
+"you navigate away from this page.<br><br>key_identity: "
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:268
+msgid "user"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:281
+msgid "User successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:303
+msgid "You must select at least one user to batch delete."
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:310
+msgid "You can’t delete yourself."
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:319
+msgid "Users successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:345
+msgid "Deleting users. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:364
+msgid "You must select at least one user to batch edit."
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:371
+msgid "For security reasons, you can’t batch edit yourself."
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:391
+msgid "Users successfully edited"
+msgstr ""
+
+#: application/src/Controller/Admin/UserController.php:444
+msgid "Editing users. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:32
+#, php-format
+msgid "Item set successfully created. %s"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:69
+msgid "Item set successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:155
+msgid "item set"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:170
+msgid "Item set successfully deleted"
+msgstr "Баримтын бүрдэл устгагдлаа"
+
+#: application/src/Controller/Admin/ItemSetController.php:191
+msgid "You must select at least one item set to batch delete."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:200
+msgid "Item sets successfully deleted"
+msgstr "Баримтын бүрдэл устгагдлаа"
+
+#: application/src/Controller/Admin/ItemSetController.php:226
+msgid "Deleting item sets. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:244
+msgid "You must select at least one item set to batch edit."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:264
+msgid "Item sets successfully edited"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemSetController.php:316
+msgid "Editing item sets. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:59
+msgid "vocabulary"
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:97
+#, php-format
+msgid "Vocabulary successfully imported. %s"
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:176
+msgid "Please review these changes before you accept them."
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:184
+msgid "Vocabulary successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:204
+msgid "Changes to the vocabulary successfully made"
+msgstr ""
+
+#: application/src/Controller/Admin/VocabularyController.php:220
+msgid "Vocabulary successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:59
+msgid "Media successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:125
+msgid "Media successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:159
+msgid "You must select at least one media to batch delete."
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:168
+msgid "Medias successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:194
+msgid "Deleting medias. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:212
+msgid "You must select at least one media to batch edit."
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:232
+msgid "Medias successfully edited"
+msgstr ""
+
+#: application/src/Controller/Admin/MediaController.php:284
+msgid "Editing medias. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:114
+msgid "item"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:130
+msgid "Item successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:151
+msgid "You must select at least one item to batch delete."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:160
+msgid "Items successfully deleted"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:186
+msgid "Deleting items. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:208
+#, php-format
+msgid "Item successfully created. %s"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:245
+msgid "Item successfully updated"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:272
+msgid "You must select at least one item to batch edit."
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:292
+msgid "Items successfully edited"
+msgstr ""
+
+#: application/src/Controller/Admin/ItemController.php:344
+msgid "Editing items. This may take a while."
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:121
+msgid "The module was successfully installed"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:143
+msgid "Confirm uninstall"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:172
+msgid "The module was successfully uninstalled"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:198
+msgid "The module was successfully activated"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:224
+msgid "The module was successfully deactivated"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:250
+msgid "The module was successfully upgraded"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:273
+msgid "The module was successfully configured"
+msgstr ""
+
+#: application/src/Controller/Admin/ModuleController.php:276
+msgid "There was a problem during configuration"
+msgstr ""
+
+#: application/src/Controller/Admin/JobController.php:27
+msgid "Attempt Stop"
+msgstr ""
+
+#: application/src/Controller/Admin/JobController.php:56
+msgid "Attempting to stop the job."
+msgstr ""
+
+#: application/src/Controller/Admin/JobController.php:58
+msgid "The job could not be stopped."
+msgstr ""
+
+#: application/src/Media/Ingester/Html.php:36
+#: application/src/Media/Ingester/Html.php:79
+#: application/src/Site/BlockLayout/Html.php:27
+msgid "HTML"
+msgstr ""
+
+#: application/src/Media/Ingester/Html.php:80
+msgid "HTML or plain text."
+msgstr ""
+
+#: application/src/Media/Ingester/OEmbed.php:41
+msgid "oEmbed"
+msgstr ""
+
+#: application/src/Media/Ingester/OEmbed.php:114
+msgid "oEmbed URL"
+msgstr ""
+
+#: application/src/Media/Ingester/OEmbed.php:115
+msgid "URL for the media to embed."
+msgstr ""
+
+#: application/src/Media/Ingester/IIIF.php:33
+msgid "IIIF image"
+msgstr ""
+
+#: application/src/Media/Ingester/IIIF.php:101
+msgid "IIIF image URL"
+msgstr ""
+
+#: application/src/Media/Ingester/IIIF.php:102
+msgid "URL for the image to embed."
+msgstr ""
+
+#: application/src/Media/Ingester/Url.php:80
+msgid "A URL to the media."
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:27
+msgid "YouTube"
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:90
+msgid "Video URL"
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:91
+msgid "URL for the video to embed."
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:99
+msgid "Start"
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:100
+msgid ""
+"Begin playing the video at the given number of seconds from the start of the"
+" video."
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:104
+msgid "End"
+msgstr ""
+
+#: application/src/Media/Ingester/Youtube.php:105
+msgid ""
+"End playing the video at the given number of seconds from the start of the "
+"video."
+msgstr ""
+
+#: application/src/Media/Ingester/Upload.php:69
+msgid "Upload file"
+msgstr ""
+
+#: application/src/Stdlib/Environment.php:47
+#, php-format
+msgid ""
+"You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
+"version %1$s. You are currently on version %2$s."
+msgstr ""
+
+#: application/src/Stdlib/Environment.php:54
+#, php-format
+msgid ""
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
+msgstr ""
+
+#: application/src/Stdlib/Environment.php:62
+#, php-format
+msgid "Omeka requires the PHP extension %s, but it is not loaded."
+msgstr ""
+
+#: application/src/Stdlib/Environment.php:81
+#, php-format
+msgid ""
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
+msgstr ""
+
+#: application/src/Stdlib/Environment.php:89
+#, php-format
+msgid ""
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
+msgstr ""
+
+#: application/src/Permissions/Acl.php:21
+msgid "Global Administrator"
+msgstr ""
+
+#: application/src/Permissions/Acl.php:22
+msgid "Site Administrator"
+msgstr ""
+
+#: application/src/Permissions/Acl.php:24
+msgid "Reviewer"
+msgstr ""
+
+#: application/src/Permissions/Acl.php:25
+msgid "Author"
+msgstr ""
+
+#: application/src/Permissions/Acl.php:26
+msgid "Researcher"
+msgstr ""
+
+#: application/src/Site/Navigation/Link/BrowseItemSets.php:11
+msgid "Browse item sets"
+msgstr ""
+
+#: application/src/Site/Navigation/Link/Url.php:11
+msgid "Custom URL"
+msgstr ""
+
+#: application/src/Site/BlockLayout/TableOfContents.php:15
+msgid "Table of contents"
+msgstr ""
+
+#: application/src/Site/BlockLayout/LineBreak.php:14
+msgid "Line break"
+msgstr ""
+
+#: application/src/Site/BlockLayout/LineBreak.php:34
+msgid "Transparent"
+msgstr ""
+
+#: application/src/Site/BlockLayout/LineBreak.php:35
+msgid "Opaque"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ItemShowcase.php:13
+msgid "Item showcase"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ItemWithMetadata.php:13
+msgid "Item with metadata"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Fallback.php:28
+#, php-format
+msgid "Unknown [%s]"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:23
+msgid "List of sites"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:38
+msgid "Alphabetical"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:39
+msgid "Oldest first"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:40
+msgid "Newest first"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:51
+msgid "Max number of sites"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:52
+msgid "An empty value means no limit."
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:56
+msgid "Unlimited"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:64
+msgid "Pagination"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:65
+msgid "Show pagination (only if a limit is set)"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:75
+msgid "Show summaries"
+msgstr ""
+
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:15
+msgid "Browse preview"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:26
+msgid "Browse all"
+msgstr "Бүгдийг тоймлож харах"
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:49
+msgid "Display resources using this search query"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:57
+msgid "Limit"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:58
+msgid "Maximum number of resources to display in the preview."
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:65
+msgid "Preview title"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:66
+msgid "Heading above resource list, if any."
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:73
+msgid "Link text"
+msgstr ""
+
+#: application/src/Site/BlockLayout/BrowsePreview.php:74
+msgid "Text for link to full browse view, if any."
+msgstr ""
+
+#: application/src/Site/BlockLayout/PageTitle.php:13
+msgid "Page title"
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceClassAdapter.php:137
+#: application/src/Api/Adapter/PropertyAdapter.php:147
+msgid "The local name cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceClassAdapter.php:142
+#: application/src/Api/Adapter/PropertyAdapter.php:152
+#: application/src/Api/Adapter/ResourceTemplateAdapter.php:89
+#: application/src/Api/Adapter/VocabularyAdapter.php:214
+msgid "The label cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceClassAdapter.php:155
+#: application/src/Api/Adapter/PropertyAdapter.php:165
+#: application/src/Api/Adapter/VocabularyAdapter.php:222
+#: application/src/Api/Adapter/VocabularyAdapter.php:235
+#, php-format
+msgid "The local name \"%s\" is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceClassAdapter.php:161
+#: application/src/Api/Adapter/PropertyAdapter.php:171
+msgid "A vocabulary must be set."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:101
+msgid "A page must belong to a site."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:106
+msgid "A page must have a title."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:111
+#: application/src/Api/Adapter/SiteAdapter.php:234
+msgid "The slug cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:114
+#: application/src/Api/Adapter/SiteAdapter.php:237
+msgid "A slug can only contain letters, numbers, underscores, and hyphens."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:122
+#: application/src/Api/Adapter/SiteAdapter.php:241
+#, php-format
+msgid "The slug \"%s\" is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:166
+msgid "All blocks must have a layout."
+msgstr ""
+
+#: application/src/Api/Adapter/SitePageAdapter.php:170
+msgid "Block data must not be a scalar value."
+msgstr ""
+
+#: application/src/Api/Adapter/ItemAdapter.php:107
+msgid "Item sets must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/ItemAdapter.php:113
+msgid "Media must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
+#, php-format
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:230
+msgid "A site must have a title."
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:247
+msgid "A site must have a theme."
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:252
+msgid "A site must have item pool data."
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:257
+msgid "A homepage must belong to its parent site."
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:304
+msgid "Invalid navigation: navigation must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:313
+msgid "Invalid navigation: link missing type"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:317
+msgid "Invalid navigation: link missing data"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:321
+msgid "Invalid navigation: invalid link data"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:326
+msgid "Invalid navigation: page links must be unique"
+msgstr ""
+
+#: application/src/Api/Adapter/SiteAdapter.php:333
+msgid "Invalid navigation: links must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/MediaAdapter.php:97
+msgid "Media must set an ingester."
+msgstr ""
+
+#: application/src/Api/Adapter/MediaAdapter.php:119
+msgid "Media must set a valid ingester."
+msgstr ""
+
+#: application/src/Api/Adapter/MediaAdapter.php:155
+msgid "Media must belong to an item."
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceTemplateAdapter.php:75
+#, php-format
+msgid "Attempting to add duplicate property with ID %s"
+msgstr ""
+
+#: application/src/Api/Adapter/ResourceTemplateAdapter.php:92
+msgid "The label is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/UserAdapter.php:120
+msgid "The name cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/UserAdapter.php:130
+#, php-format
+msgid "The email %s is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/UserAdapter.php:136
+msgid "Users must have a role."
+msgstr ""
+
+#: application/src/Api/Adapter/UserAdapter.php:169
+#, php-format
+msgid "The current user #%d was removed from the batch process."
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:59
+msgid "Classes must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:65
+msgid "Properties must be an array"
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:182
+msgid "The namespace URI cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:186
+#, php-format
+msgid "The namespace URI \"%s\" is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:194
+msgid "The prefix cannot be empty."
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:198
+#, php-format
+msgid "The prefix \"%s\" is already taken."
+msgstr ""
+
+#: application/src/Api/Adapter/VocabularyAdapter.php:205
+#, php-format
+msgid "The prefix \"%s\" is reserved."
+msgstr ""
+
+#: application/src/Api/Representation/JobRepresentation.php:12
+msgid "Starting"
+msgstr ""
+
+#: application/src/Api/Representation/JobRepresentation.php:13
+msgid "Stopping"
+msgstr ""
+
+#: application/src/Api/Representation/JobRepresentation.php:14
+msgid "In Progress"
+msgstr ""
+
+#: application/src/Api/Representation/JobRepresentation.php:15
+msgid "Completed"
+msgstr ""
+
+#: application/src/Api/Representation/JobRepresentation.php:16
+msgid "Stopped"
+msgstr ""
+
+#: application/src/Entity/Job.php:23
+msgid "starting"
+msgstr ""
+
+#: application/src/Entity/Job.php:24
+msgid "stopping"
+msgstr ""
+
+#: application/src/Entity/Job.php:25
+msgid "in_progress"
+msgstr ""
+
+#: application/src/Entity/Job.php:26
+msgid "completed"
+msgstr ""
+
+#: application/src/Entity/Job.php:27
+msgid "stopped"
+msgstr ""
+
+#: application/src/Entity/Job.php:28
+msgid "error"
+msgstr ""
+
+#: application/src/Mvc/MvcListeners.php:325
+#, php-format
+msgid "The current theme is not active. Its current state is \"%s\"."
+msgstr ""
+
+#: application/src/DataType/Resource/AbstractResource.php:16
+msgid "Resource"
+msgstr ""
+
+#: application/src/DataType/Resource/AbstractResource.php:59
+msgid "A value resource cannot be Media."
+msgstr ""
+
+#: application/src/DataType/Resource/ItemSet.php:13
+msgid "Item Set"
+msgstr ""
+
+#: application/view/common/advanced-search/properties.phtml:60
+msgid "[Any Property]"
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:41
+msgid "Filter by class"
+msgstr ""
+
+#: application/view/omeka/admin/item/sidebar-select.phtml:53
+msgid "Filter by item set"
+msgstr ""
+
+#. Vocabulary label for Dublin Core
+msgid "Dublin Core"
+msgstr ""
+
+#. Vocabulary comment for Dublin Core
+msgid "Basic resource metadata (DCMI Metadata Terms)"
+msgstr ""
+
+#. Class label for Dublin Core:Agent
+#. Class label for Friend of a Friend:Agent
+msgid "Agent"
+msgstr ""
+
+#. Class comment for Dublin Core:Agent
+msgid "A resource that acts or has the power to act."
+msgstr ""
+
+#. Class label for Dublin Core:AgentClass
+msgid "Agent Class"
+msgstr ""
+
+#. Class comment for Dublin Core:AgentClass
+msgid "A group of agents."
+msgstr ""
+
+#. Class label for Dublin Core:BibliographicResource
+msgid "Bibliographic Resource"
+msgstr ""
+
+#. Class comment for Dublin Core:BibliographicResource
+msgid "A book, article, or other documentary resource."
+msgstr ""
+
+#. Class label for Dublin Core:FileFormat
+msgid "File Format"
+msgstr ""
+
+#. Class comment for Dublin Core:FileFormat
+msgid "A digital resource format."
+msgstr ""
+
+#. Class label for Dublin Core:Frequency
+msgid "Frequency"
+msgstr ""
+
+#. Class comment for Dublin Core:Frequency
+msgid "A rate at which something recurs."
+msgstr ""
+
+#. Class label for Dublin Core:Jurisdiction
+msgid "Jurisdiction"
+msgstr ""
+
+#. Class comment for Dublin Core:Jurisdiction
+msgid "The extent or range of judicial, law enforcement, or other authority."
+msgstr ""
+
+#. Class label for Dublin Core:LicenseDocument
+msgid "License Document"
+msgstr ""
+
+#. Class comment for Dublin Core:LicenseDocument
+msgid ""
+"A legal document giving official permission to do something with a Resource."
+msgstr ""
+
+#. Class label for Dublin Core:LinguisticSystem
+msgid "Linguistic System"
+msgstr ""
+
+#. Class comment for Dublin Core:LinguisticSystem
+msgid ""
+"A system of signs, symbols, sounds, gestures, or rules used in "
+"communication."
+msgstr ""
+
+#. Class label for Dublin Core:Location
+msgid "Location"
+msgstr ""
+
+#. Class comment for Dublin Core:Location
+msgid "A spatial region or named place."
+msgstr ""
+
+#. Class label for Dublin Core:LocationPeriodOrJurisdiction
+msgid "Location, Period, or Jurisdiction"
+msgstr ""
+
+#. Class comment for Dublin Core:LocationPeriodOrJurisdiction
+msgid "A location, period of time, or jurisdiction."
+msgstr ""
+
+#. Class label for Dublin Core:MediaType
+msgid "Media Type"
+msgstr ""
+
+#. Class comment for Dublin Core:MediaType
+msgid "A file format or physical medium."
+msgstr ""
+
+#. Class label for Dublin Core:MediaTypeOrExtent
+msgid "Media Type or Extent"
+msgstr ""
+
+#. Class comment for Dublin Core:MediaTypeOrExtent
+msgid "A media type or extent."
+msgstr ""
+
+#. Class label for Dublin Core:MethodOfInstruction
+msgid "Method of Instruction"
+msgstr ""
+
+#. Class comment for Dublin Core:MethodOfInstruction
+msgid "A process that is used to engender knowledge, attitudes, and skills."
+msgstr ""
+
+#. Class label for Dublin Core:MethodOfAccrual
+msgid "Method of Accrual"
+msgstr ""
+
+#. Class comment for Dublin Core:MethodOfAccrual
+msgid "A method by which resources are added to a collection."
+msgstr ""
+
+#. Class label for Dublin Core:PeriodOfTime
+msgid "Period of Time"
+msgstr ""
+
+#. Class comment for Dublin Core:PeriodOfTime
+msgid ""
+"An interval of time that is named or defined by its start and end dates."
+msgstr ""
+
+#. Class label for Dublin Core:PhysicalMedium
+msgid "Physical Medium"
+msgstr ""
+
+#. Class comment for Dublin Core:PhysicalMedium
+msgid "A physical material or carrier."
+msgstr ""
+
+#. Class label for Dublin Core:PhysicalResource
+msgid "Physical Resource"
+msgstr ""
+
+#. Class comment for Dublin Core:PhysicalResource
+msgid "A material thing."
+msgstr ""
+
+#. Class label for Dublin Core:Policy
+msgid "Policy"
+msgstr ""
+
+#. Class comment for Dublin Core:Policy
+msgid ""
+"A plan or course of action by an authority, intended to influence and "
+"determine decisions, actions, and other matters."
+msgstr ""
+
+#. Class label for Dublin Core:ProvenanceStatement
+msgid "Provenance Statement"
+msgstr ""
+
+#. Class comment for Dublin Core:ProvenanceStatement
+msgid ""
+"A statement of any changes in ownership and custody of a resource since its "
+"creation that are significant for its authenticity, integrity, and "
+"interpretation."
+msgstr ""
+
+#. Class label for Dublin Core:RightsStatement
+msgid "Rights Statement"
+msgstr ""
+
+#. Class comment for Dublin Core:RightsStatement
+msgid ""
+"A statement about the intellectual property rights (IPR) held in or over a "
+"Resource, a legal document giving official permission to do something with a"
+" resource, or a statement about access rights."
+msgstr ""
+
+#. Class label for Dublin Core:SizeOrDuration
+msgid "Size or Duration"
+msgstr ""
+
+#. Class comment for Dublin Core:SizeOrDuration
+msgid "A dimension or extent, or a time taken to play or execute."
+msgstr ""
+
+#. Class label for Dublin Core:Standard
+#. Class label for Bibliographic Ontology:Standard
+msgid "Standard"
+msgstr ""
+
+#. Class comment for Dublin Core:Standard
+msgid ""
+"A basis for comparison; a reference point against which other things can be "
+"evaluated."
+msgstr ""
+
+#. Property comment for Dublin Core:title
+msgid "A name given to the resource."
+msgstr ""
+
+#. Property label for Dublin Core:creator
+msgid "Creator"
+msgstr ""
+
+#. Property comment for Dublin Core:creator
+msgid "An entity primarily responsible for making the resource."
+msgstr ""
+
+#. Property label for Dublin Core:subject
+msgid "Subject"
+msgstr ""
+
+#. Property comment for Dublin Core:subject
+msgid "The topic of the resource."
+msgstr ""
+
+#. Property comment for Dublin Core:description
+msgid "An account of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:publisher
+msgid "Publisher"
+msgstr ""
+
+#. Property comment for Dublin Core:publisher
+msgid "An entity responsible for making the resource available."
+msgstr ""
+
+#. Property label for Dublin Core:contributor
+msgid "Contributor"
+msgstr ""
+
+#. Property comment for Dublin Core:contributor
+msgid "An entity responsible for making contributions to the resource."
+msgstr ""
+
+#. Property label for Dublin Core:date
+msgid "Date"
+msgstr ""
+
+#. Property comment for Dublin Core:date
+msgid ""
+"A point or period of time associated with an event in the lifecycle of the "
+"resource."
+msgstr ""
+
+#. Property comment for Dublin Core:type
+msgid "The nature or genre of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:format
+msgid "Format"
+msgstr ""
+
+#. Property comment for Dublin Core:format
+msgid "The file format, physical medium, or dimensions of the resource."
+msgstr ""
+
+#. Property comment for Dublin Core:identifier
+msgid "An unambiguous reference to the resource within a given context."
+msgstr ""
+
+#. Property comment for Dublin Core:source
+msgid "A related resource from which the described resource is derived."
+msgstr ""
+
+#. Property comment for Dublin Core:language
+msgid "A language of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:relation
+msgid "Relation"
+msgstr ""
+
+#. Property comment for Dublin Core:relation
+msgid "A related resource."
+msgstr ""
+
+#. Property label for Dublin Core:coverage
+msgid "Coverage"
+msgstr ""
+
+#. Property comment for Dublin Core:coverage
+msgid ""
+"The spatial or temporal topic of the resource, the spatial applicability of "
+"the resource, or the jurisdiction under which the resource is relevant."
+msgstr ""
+
+#. Property label for Dublin Core:rights
+msgid "Rights"
+msgstr ""
+
+#. Property comment for Dublin Core:rights
+msgid "Information about rights held in and over the resource."
+msgstr ""
+
+#. Property label for Dublin Core:audience
+msgid "Audience"
+msgstr ""
+
+#. Property comment for Dublin Core:audience
+msgid "A class of entity for whom the resource is intended or useful."
+msgstr ""
+
+#. Property label for Dublin Core:alternative
+msgid "Alternative Title"
+msgstr ""
+
+#. Property comment for Dublin Core:alternative
+msgid "An alternative name for the resource."
+msgstr ""
+
+#. Property label for Dublin Core:tableOfContents
+msgid "Table Of Contents"
+msgstr ""
+
+#. Property comment for Dublin Core:tableOfContents
+msgid "A list of subunits of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:abstract
+msgid "Abstract"
+msgstr ""
+
+#. Property comment for Dublin Core:abstract
+#. Property comment for Bibliographic Ontology:abstract
+msgid "A summary of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:created
+msgid "Date Created"
+msgstr "Үүсгэгдсэн огноо"
+
+#. Property comment for Dublin Core:created
+msgid "Date of creation of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:valid
+msgid "Date Valid"
+msgstr ""
+
+#. Property comment for Dublin Core:valid
+msgid "Date (often a range) of validity of a resource."
+msgstr ""
+
+#. Property label for Dublin Core:available
+msgid "Date Available"
+msgstr ""
+
+#. Property comment for Dublin Core:available
+msgid ""
+"Date (often a range) that the resource became or will become available."
+msgstr ""
+
+#. Property label for Dublin Core:issued
+msgid "Date Issued"
+msgstr ""
+
+#. Property comment for Dublin Core:issued
+msgid "Date of formal issuance (e.g., publication) of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:modified
+msgid "Date Modified"
+msgstr ""
+
+#. Property comment for Dublin Core:modified
+msgid "Date on which the resource was changed."
+msgstr ""
+
+#. Property label for Dublin Core:extent
+msgid "Extent"
+msgstr ""
+
+#. Property comment for Dublin Core:extent
+msgid "The size or duration of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:medium
+msgid "Medium"
+msgstr ""
+
+#. Property comment for Dublin Core:medium
+msgid "The material or physical carrier of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:isVersionOf
+msgid "Is Version Of"
+msgstr ""
+
+#. Property comment for Dublin Core:isVersionOf
+msgid ""
+"A related resource of which the described resource is a version, edition, or"
+" adaptation."
+msgstr ""
+
+#. Property label for Dublin Core:hasVersion
+msgid "Has Version"
+msgstr ""
+
+#. Property comment for Dublin Core:hasVersion
+msgid ""
+"A related resource that is a version, edition, or adaptation of the "
+"described resource."
+msgstr ""
+
+#. Property label for Dublin Core:isReplacedBy
+msgid "Is Replaced By"
+msgstr ""
+
+#. Property comment for Dublin Core:isReplacedBy
+msgid ""
+"A related resource that supplants, displaces, or supersedes the described "
+"resource."
+msgstr ""
+
+#. Property label for Dublin Core:replaces
+msgid "Replaces"
+msgstr ""
+
+#. Property comment for Dublin Core:replaces
+msgid ""
+"A related resource that is supplanted, displaced, or superseded by the "
+"described resource."
+msgstr ""
+
+#. Property label for Dublin Core:isRequiredBy
+msgid "Is Required By"
+msgstr ""
+
+#. Property comment for Dublin Core:isRequiredBy
+msgid ""
+"A related resource that requires the described resource to support its "
+"function, delivery, or coherence."
+msgstr ""
+
+#. Property label for Dublin Core:requires
+msgid "Requires"
+msgstr ""
+
+#. Property comment for Dublin Core:requires
+msgid ""
+"A related resource that is required by the described resource to support its"
+" function, delivery, or coherence."
+msgstr ""
+
+#. Property label for Dublin Core:isPartOf
+msgid "Is Part Of"
+msgstr ""
+
+#. Property comment for Dublin Core:isPartOf
+msgid ""
+"A related resource in which the described resource is physically or "
+"logically included."
+msgstr ""
+
+#. Property label for Dublin Core:hasPart
+msgid "Has Part"
+msgstr ""
+
+#. Property comment for Dublin Core:hasPart
+msgid ""
+"A related resource that is included either physically or logically in the "
+"described resource."
+msgstr ""
+
+#. Property label for Dublin Core:isReferencedBy
+msgid "Is Referenced By"
+msgstr ""
+
+#. Property comment for Dublin Core:isReferencedBy
+msgid ""
+"A related resource that references, cites, or otherwise points to the "
+"described resource."
+msgstr ""
+
+#. Property label for Dublin Core:references
+msgid "References"
+msgstr ""
+
+#. Property comment for Dublin Core:references
+msgid ""
+"A related resource that is referenced, cited, or otherwise pointed to by the"
+" described resource."
+msgstr ""
+
+#. Property label for Dublin Core:isFormatOf
+msgid "Is Format Of"
+msgstr ""
+
+#. Property comment for Dublin Core:isFormatOf
+msgid ""
+"A related resource that is substantially the same as the described resource,"
+" but in another format."
+msgstr ""
+
+#. Property label for Dublin Core:hasFormat
+msgid "Has Format"
+msgstr ""
+
+#. Property comment for Dublin Core:hasFormat
+msgid ""
+"A related resource that is substantially the same as the pre-existing "
+"described resource, but in another format."
+msgstr ""
+
+#. Property label for Dublin Core:conformsTo
+msgid "Conforms To"
+msgstr ""
+
+#. Property comment for Dublin Core:conformsTo
+msgid "An established standard to which the described resource conforms."
+msgstr ""
+
+#. Property label for Dublin Core:spatial
+msgid "Spatial Coverage"
+msgstr ""
+
+#. Property comment for Dublin Core:spatial
+msgid "Spatial characteristics of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:temporal
+msgid "Temporal Coverage"
+msgstr ""
+
+#. Property comment for Dublin Core:temporal
+msgid "Temporal characteristics of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:mediator
+msgid "Mediator"
+msgstr ""
+
+#. Property comment for Dublin Core:mediator
+msgid ""
+"An entity that mediates access to the resource and for whom the resource is "
+"intended or useful."
+msgstr ""
+
+#. Property label for Dublin Core:dateAccepted
+msgid "Date Accepted"
+msgstr ""
+
+#. Property comment for Dublin Core:dateAccepted
+msgid "Date of acceptance of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:dateCopyrighted
+msgid "Date Copyrighted"
+msgstr "Зохиогчийн эрх авсан огноо"
+
+#. Property comment for Dublin Core:dateCopyrighted
+msgid "Date of copyright."
+msgstr "Зохиогчийн эрхийн огноо."
+
+#. Property label for Dublin Core:dateSubmitted
+msgid "Date Submitted"
+msgstr ""
+
+#. Property comment for Dublin Core:dateSubmitted
+msgid "Date of submission of the resource."
+msgstr ""
+
+#. Property label for Dublin Core:educationLevel
+msgid "Audience Education Level"
+msgstr ""
+
+#. Property comment for Dublin Core:educationLevel
+msgid ""
+"A class of entity, defined in terms of progression through an educational or"
+" training context, for which the described resource is intended."
+msgstr ""
+
+#. Property label for Dublin Core:accessRights
+msgid "Access Rights"
+msgstr "Хандалтын эрх"
+
+#. Property comment for Dublin Core:accessRights
+msgid ""
+"Information about who can access the resource or an indication of its "
+"security status."
+msgstr ""
+
+#. Property label for Dublin Core:bibliographicCitation
+msgid "Bibliographic Citation"
+msgstr ""
+
+#. Property comment for Dublin Core:bibliographicCitation
+msgid "A bibliographic reference for the resource."
+msgstr ""
+
+#. Property label for Dublin Core:license
+msgid "License"
+msgstr "Лиценз"
+
+#. Property comment for Dublin Core:license
+msgid ""
+"A legal document giving official permission to do something with the "
+"resource."
+msgstr ""
+
+#. Property label for Dublin Core:rightsHolder
+msgid "Rights Holder"
+msgstr "Эрх эзэмшигч"
+
+#. Property comment for Dublin Core:rightsHolder
+msgid "A person or organization owning or managing rights over the resource."
+msgstr ""
+
+#. Property label for Dublin Core:provenance
+msgid "Provenance"
+msgstr ""
+
+#. Property comment for Dublin Core:provenance
+msgid ""
+"A statement of any changes in ownership and custody of the resource since "
+"its creation that are significant for its authenticity, integrity, and "
+"interpretation."
+msgstr ""
+
+#. Property label for Dublin Core:instructionalMethod
+msgid "Instructional Method"
+msgstr ""
+
+#. Property comment for Dublin Core:instructionalMethod
+msgid ""
+"A process, used to engender knowledge, attitudes and skills, that the "
+"described resource is designed to support."
+msgstr ""
+
+#. Property label for Dublin Core:accrualMethod
+msgid "Accrual Method"
+msgstr ""
+
+#. Property comment for Dublin Core:accrualMethod
+msgid "The method by which items are added to a collection."
+msgstr ""
+
+#. Property label for Dublin Core:accrualPeriodicity
+msgid "Accrual Periodicity"
+msgstr ""
+
+#. Property comment for Dublin Core:accrualPeriodicity
+msgid "The frequency with which items are added to a collection."
+msgstr ""
+
+#. Property label for Dublin Core:accrualPolicy
+msgid "Accrual Policy"
+msgstr ""
+
+#. Property comment for Dublin Core:accrualPolicy
+msgid "The policy governing the addition of items to a collection."
+msgstr ""
+
+#. Vocabulary label for Dublin Core Type
+msgid "Dublin Core Type"
+msgstr ""
+
+#. Vocabulary comment for Dublin Core Type
+msgid "Basic resource types (DCMI Type Vocabulary)"
+msgstr ""
+
+#. Class label for Dublin Core Type:Collection
+#. Class label for Bibliographic Ontology:Collection
+msgid "Collection"
+msgstr "Сан хөмрөг"
+
+#. Class comment for Dublin Core Type:Collection
+msgid "An aggregation of resources."
+msgstr ""
+
+#. Class label for Dublin Core Type:Dataset
+msgid "Dataset"
+msgstr ""
+
+#. Class comment for Dublin Core Type:Dataset
+msgid "Data encoded in a defined structure."
+msgstr ""
+
+#. Class label for Dublin Core Type:Event
+#. Class label for Bibliographic Ontology:Event
+msgid "Event"
+msgstr ""
+
+#. Class comment for Dublin Core Type:Event
+msgid "A non-persistent, time-based occurrence."
+msgstr ""
+
+#. Class label for Dublin Core Type:Image
+#. Class label for Bibliographic Ontology:Image
+#. Class label for Friend of a Friend:Image
+msgid "Image"
+msgstr "Зураг"
+
+#. Class comment for Dublin Core Type:Image
+msgid "A visual representation other than text."
+msgstr ""
+
+#. Class label for Dublin Core Type:InteractiveResource
+msgid "Interactive Resource"
+msgstr ""
+
+#. Class comment for Dublin Core Type:InteractiveResource
+msgid ""
+"A resource requiring interaction from the user to be understood, executed, "
+"or experienced."
+msgstr ""
+
+#. Class label for Dublin Core Type:Service
+msgid "Service"
+msgstr "Үйлчилгээ"
+
+#. Class comment for Dublin Core Type:Service
+msgid "A system that provides one or more functions."
+msgstr ""
+
+#. Class label for Dublin Core Type:Software
+msgid "Software"
+msgstr "Программ хангамж"
+
+#. Class comment for Dublin Core Type:Software
+msgid "A computer program in source or compiled form."
+msgstr ""
+
+#. Class label for Dublin Core Type:Sound
+msgid "Sound"
+msgstr ""
+
+#. Class comment for Dublin Core Type:Sound
+msgid "A resource primarily intended to be heard."
+msgstr ""
+
+#. Class comment for Dublin Core Type:Text
+msgid "A resource consisting primarily of words for reading."
+msgstr ""
+
+#. Class label for Dublin Core Type:PhysicalObject
+msgid "Physical Object"
+msgstr ""
+
+#. Class comment for Dublin Core Type:PhysicalObject
+msgid "An inanimate, three-dimensional object or substance."
+msgstr ""
+
+#. Class label for Dublin Core Type:StillImage
+msgid "Still Image"
+msgstr ""
+
+#. Class comment for Dublin Core Type:StillImage
+msgid "A static visual representation."
+msgstr ""
+
+#. Class label for Dublin Core Type:MovingImage
+msgid "Moving Image"
+msgstr "Хөдөлгөөнт зураг"
+
+#. Class comment for Dublin Core Type:MovingImage
+msgid ""
+"A series of visual representations imparting an impression of motion when "
+"shown in succession."
+msgstr ""
+
+#. Vocabulary label for Bibliographic Ontology
+msgid "Bibliographic Ontology"
+msgstr ""
+
+#. Vocabulary comment for Bibliographic Ontology
+msgid "Bibliographic metadata (BIBO)"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:AcademicArticle
+msgid "Academic Article"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:AcademicArticle
+msgid "A scholarly academic article, typically published in a journal."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Article
+msgid "Article"
+msgstr "Өгүүлэл"
+
+#. Class comment for Bibliographic Ontology:Article
+msgid ""
+"A written composition in prose, usually nonfiction, on a specific topic, "
+"forming an independent part of a book or other publication, as a newspaper "
+"or magazine."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:AudioDocument
+msgid "audio document"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:AudioDocument
+msgid "An audio document; aka record."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:AudioVisualDocument
+msgid "audio-visual document"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:AudioVisualDocument
+msgid "An audio-visual document; film, video, and so forth."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Bill
+msgid "Bill"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Bill
+msgid "Draft legislation presented for discussion to a legal body."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Book
+msgid "Book"
+msgstr "Ном"
+
+#. Class comment for Bibliographic Ontology:Book
+msgid ""
+"A written or printed work of fiction or nonfiction, usually on sheets of "
+"paper fastened or bound together within covers."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:BookSection
+msgid "Book Section"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:BookSection
+msgid "A section of a book."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Brief
+msgid "Brief"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Brief
+msgid "A written argument submitted to a court."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Chapter
+msgid "Chapter"
+msgstr "Бүлэг"
+
+#. Class comment for Bibliographic Ontology:Chapter
+msgid "A chapter of a book."
+msgstr "Номын бүлэг"
+
+#. Class label for Bibliographic Ontology:Code
+msgid "Code"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Code
+msgid "A collection of statutes."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:CollectedDocument
+msgid "Collected Document"
+msgstr "Цуглуулсан баримт"
+
+#. Class comment for Bibliographic Ontology:CollectedDocument
+msgid "A document that simultaneously contains other documents."
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Collection
+msgid "A collection of Documents or Collections"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Conference
+msgid "Conference"
+msgstr "Хурал"
+
+#. Class comment for Bibliographic Ontology:Conference
+msgid "A meeting for consultation or discussion."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:CourtReporter
+msgid "Court Reporter"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:CourtReporter
+msgid "A collection of legal cases."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Document
+#. Class label for Friend of a Friend:Document
+msgid "Document"
+msgstr "Баримт бичиг"
+
+#. Class comment for Bibliographic Ontology:Document
+msgid ""
+"A document (noun) is a bounded physical representation of body of "
+"information designed with the capacity (and usually intent) to communicate. "
+"A document may manifest symbolic, diagrammatic or sensory-representational "
+"information."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:DocumentPart
+msgid "document part"
+msgstr "Баримт бичгийн хэсэг"
+
+#. Class comment for Bibliographic Ontology:DocumentPart
+msgid "a distinct part of a larger document or collected document."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:DocumentStatus
+msgid "Document Status"
+msgstr "Баримт бичгийн статус"
+
+#. Class comment for Bibliographic Ontology:DocumentStatus
+msgid "The status of the publication of a document."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:EditedBook
+msgid "Edited Book"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:EditedBook
+msgid "An edited book."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Email
+msgid "EMail"
+msgstr "Имэйл"
+
+#. Class comment for Bibliographic Ontology:Email
+msgid ""
+"A written communication addressed to a person or organization and "
+"transmitted electronically."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Excerpt
+msgid "Excerpt"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Excerpt
+msgid "A passage selected from a larger work."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Film
+msgid "Film"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Film
+msgid "aka movie."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Hearing
+msgid "Hearing"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Hearing
+msgid ""
+"An instance or a session in which testimony and arguments are presented, "
+"esp. before an official, as a judge in a lawsuit."
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Image
+msgid "A document that presents visual or diagrammatic information."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Interview
+msgid "Interview"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Interview
+msgid "A formalized discussion between two or more people."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Issue
+msgid "Issue"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Issue
+msgid ""
+"something that is printed or published and distributed, esp. a given number "
+"of a periodical"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Journal
+msgid "Journal"
+msgstr "Сэтгүүл"
+
+#. Class comment for Bibliographic Ontology:Journal
+msgid "A periodical of scholarly journal Articles."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:LegalCaseDocument
+msgid "Legal Case Document"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:LegalCaseDocument
+msgid "A document accompanying a legal case."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:LegalDecision
+msgid "Decision"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:LegalDecision
+msgid ""
+"A document containing an authoritative determination (as a decree or "
+"judgment) made after consideration of facts or law."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:LegalDocument
+msgid "Legal Document"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:LegalDocument
+msgid ""
+"A legal document; for example, a court decision, a brief, and so forth."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Legislation
+msgid "Legislation"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Legislation
+msgid "A legal document proposing or enacting a law or a group of laws."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Letter
+msgid "Letter"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Letter
+msgid ""
+"A written or printed communication addressed to a person or organization and"
+" usually transmitted by mail."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Magazine
+msgid "Magazine"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Magazine
+msgid ""
+"A periodical of magazine Articles. A magazine is a publication that is "
+"issued periodically, usually bound in a paper cover, and typically contains "
+"essays, stories, poems, etc., by many writers, and often photographs and "
+"drawings, frequently specializing in a particular subject or area, as "
+"hobbies, news, or sports."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Manual
+msgid "Manual"
+msgstr "Гарын авлага"
+
+#. Class comment for Bibliographic Ontology:Manual
+msgid "A small reference book, especially one giving instructions."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Manuscript
+msgid "Manuscript"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Manuscript
+msgid ""
+"An unpublished Document, which may also be submitted to a publisher for "
+"publication."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Map
+msgid "Map"
+msgstr "Газрын зураг"
+
+#. Class comment for Bibliographic Ontology:Map
+msgid "A graphical depiction of geographic features."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:MultiVolumeBook
+msgid "Multivolume Book"
+msgstr "Олон ботит ном"
+
+#. Class comment for Bibliographic Ontology:MultiVolumeBook
+#. Class comment for Bibliographic Ontology:Series
+msgid "A loose, thematic, collection of Documents, often Books."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Newspaper
+msgid "Newspaper"
+msgstr "Сонин"
+
+#. Class comment for Bibliographic Ontology:Newspaper
+msgid ""
+"A periodical of documents, usually issued daily or weekly, containing "
+"current news, editorials, feature articles, and usually advertising."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Note
+msgid "Note"
+msgstr "Тайлбар"
+
+#. Class comment for Bibliographic Ontology:Note
+msgid "Notes or annotations about a resource."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Patent
+msgid "Patent"
+msgstr "Патент"
+
+#. Class comment for Bibliographic Ontology:Patent
+msgid ""
+"A document describing the exclusive right granted by a government to an "
+"inventor to manufacture, use, or sell an invention for a certain number of "
+"years."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Performance
+msgid "Performance"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Performance
+msgid "A public performance."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Periodical
+msgid "Periodical"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Periodical
+msgid "A group of related documents issued at regular intervals."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:PersonalCommunication
+msgid "Personal Communication"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:PersonalCommunication
+msgid "A communication between an agent and one or more specific recipients."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:PersonalCommunicationDocument
+msgid "Personal Communication Document"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:PersonalCommunicationDocument
+msgid "A personal communication manifested in some document."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Proceedings
+msgid "Proceedings"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Proceedings
+msgid ""
+"A compilation of documents published from an event, such as a conference."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Quote
+msgid "Quote"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Quote
+msgid "An excerpted collection of words."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:ReferenceSource
+msgid "Reference Source"
+msgstr "Лавлагааны эх сурвалж"
+
+#. Class comment for Bibliographic Ontology:ReferenceSource
+msgid ""
+"A document that presents authoritative reference information, such as a "
+"dictionary or encylopedia ."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Report
+msgid "Report"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Report
+msgid ""
+"A document describing an account or statement describing in detail an event,"
+" situation, or the like, usually as the result of observation, inquiry, "
+"etc.."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Series
+msgid "Series"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Slide
+msgid "Slide"
+msgstr "Слайд"
+
+#. Class comment for Bibliographic Ontology:Slide
+msgid "A slide in a slideshow"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Slideshow
+msgid "Slideshow"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Slideshow
+msgid ""
+"A presentation of a series of slides, usually presented in front of an "
+"audience with written text and images."
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Standard
+msgid "A document describing a standard"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Statute
+msgid "Statute"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Statute
+msgid "A bill enacted into law."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Thesis
+msgid "Thesis"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Thesis
+msgid ""
+"A document created to summarize research findings associated with the "
+"completion of an academic degree."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:ThesisDegree
+msgid "Thesis degree"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:ThesisDegree
+msgid "The academic degree of a Thesis"
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Webpage
+msgid "Webpage"
+msgstr "Вэб хуудас"
+
+#. Class comment for Bibliographic Ontology:Webpage
+msgid ""
+"A web page is an online document available (at least initially) on the world"
+" wide web. A web page is written first and foremost to appear on the web, as"
+" distinct from other online resources such as books, manuscripts or audio "
+"documents which use the web primarily as a distribution mechanism alongside "
+"other more traditional methods such as print."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Website
+msgid "Website"
+msgstr "Вэб сайт"
+
+#. Class comment for Bibliographic Ontology:Website
+msgid "A group of Webpages accessible on the Web."
+msgstr ""
+
+#. Class label for Bibliographic Ontology:Workshop
+msgid "Workshop"
+msgstr ""
+
+#. Class comment for Bibliographic Ontology:Workshop
+msgid ""
+"A seminar, discussion group, or the like, that emphasizes zxchange of ideas "
+"and the demonstration and application of techniques, skills, etc."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:affirmedBy
+msgid "affirmedBy"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:affirmedBy
+msgid "A legal decision that affirms a ruling."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:annotates
+msgid "annotates"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:annotates
+msgid "Critical or explanatory note for a Document."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:authorList
+msgid "list of authors"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:authorList
+msgid ""
+"An ordered list of authors. Normally, this list is seen as a priority list "
+"that order authors by importance."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:citedBy
+msgid "cited by"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:citedBy
+msgid ""
+"Relates a document to another document that cites the\n"
+"first document."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:cites
+msgid "cites"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:cites
+msgid ""
+"Relates a document to another document that is cited\n"
+"by the first document as reference, comment, review, quotation or for\n"
+"another purpose."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:contributorList
+msgid "list of contributors"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:contributorList
+msgid ""
+"An ordered list of contributors. Normally, this list is seen as a priority "
+"list that order contributors by importance."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:court
+msgid "court"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:court
+msgid ""
+"A court associated with a legal document; for example, that which issues a "
+"decision."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:degree
+msgid "degree"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:degree
+msgid "The thesis degree."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:director
+msgid "director"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:director
+msgid "A Film director."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:distributor
+msgid "distributor"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:distributor
+msgid "Distributor of a document or a collection of documents."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:editor
+msgid "editor"
+msgstr "редактор"
+
+#. Property comment for Bibliographic Ontology:editor
+msgid ""
+"A person having managerial and sometimes policy-making responsibility for "
+"the editorial part of a publishing firm or of a newspaper, magazine, or "
+"other publication."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:editorList
+msgid "list of editors"
+msgstr "редакторын жагсаалт"
+
+#. Property comment for Bibliographic Ontology:editorList
+msgid ""
+"An ordered list of editors. Normally, this list is seen as a priority list "
+"that order editors by importance."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:interviewee
+msgid "interviewee"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:interviewee
+msgid "An agent that is interviewed by another agent."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:interviewer
+msgid "interviewer"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:interviewer
+msgid "An agent that interview another agent."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:issuer
+msgid "issuer"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:issuer
+msgid ""
+"An entity responsible for issuing often informally published documents such "
+"as press releases, reports, etc."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:organizer
+msgid "organizer"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:organizer
+msgid ""
+"The organizer of an event; includes conference organizers, but also "
+"government agencies or other bodies that are responsible for conducting "
+"hearings."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:owner
+msgid "owner"
+msgstr "эзэмшигч"
+
+#. Property comment for Bibliographic Ontology:owner
+msgid "Owner of a document or a collection of documents."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:performer
+msgid "performer"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:presentedAt
+msgid "presented at"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:presentedAt
+msgid "Relates a document to an event; for example, a paper to a conference."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:presents
+msgid "presents"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:presents
+msgid ""
+"Relates an event to associated documents; for example, conference to a "
+"paper."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:producer
+msgid "producer"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:producer
+msgid "Producer of a document or a collection of documents."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:recipient
+msgid "recipient"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:recipient
+msgid "An agent that receives a communication document."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:reproducedIn
+msgid "reproducedIn"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:reproducedIn
+msgid "The resource in which another resource is reproduced."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:reversedBy
+msgid "reversedBy"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:reversedBy
+msgid "A legal decision that reverses a ruling."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:reviewOf
+msgid "review of"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:reviewOf
+msgid "Relates a review document to a reviewed thing (resource, item, etc.)."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:status
+#. Property label for Friend of a Friend:status
+msgid "status"
+msgstr "статус"
+
+#. Property comment for Bibliographic Ontology:status
+msgid "The publication status of (typically academic) content."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:subsequentLegalDecision
+msgid "subsequentLegalDecision"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:subsequentLegalDecision
+msgid ""
+"A legal decision on appeal that takes action on a case (affirming it, "
+"reversing it, etc.)."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:transcriptOf
+msgid "transcript of"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:transcriptOf
+msgid "Relates a document to some transcribed original."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:translationOf
+msgid "translation of"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:translationOf
+msgid "Relates a translated document to the original document."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:translator
+msgid "translator"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:translator
+msgid "A person who translates written document from one language to another."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:abstract
+msgid "abstract"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:argued
+msgid "date argued"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:argued
+msgid ""
+"The date on which a legal case is argued before a court. Date is of format "
+"xsd:date"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:asin
+msgid "asin"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:chapter
+msgid "chapter"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:chapter
+msgid "An chapter number"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:coden
+msgid "coden"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:content
+msgid "content"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:content
+msgid ""
+"This property is for a plain-text rendering of the content of a Document. "
+"While the plain-text content of an entire document could be described by "
+"this property."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:doi
+msgid "doi"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:eanucc13
+msgid "eanucc13"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:edition
+msgid "edition"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:edition
+msgid ""
+"The name defining a special edition of a document. Normally its a literal "
+"value composed of a version number and words."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:eissn
+msgid "eissn"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:gtin14
+msgid "gtin14"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:handle
+msgid "handle"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:identifier
+msgid "identifier"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:isbn
+msgid "isbn"
+msgstr "isbn"
+
+#. Property label for Bibliographic Ontology:isbn10
+msgid "isbn10"
+msgstr "isbn10"
+
+#. Property label for Bibliographic Ontology:isbn13
+msgid "isbn13"
+msgstr "isbn13"
+
+#. Property label for Bibliographic Ontology:issn
+msgid "issn"
+msgstr "issn"
+
+#. Property label for Bibliographic Ontology:issue
+msgid "issue"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:issue
+msgid "An issue number"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:lccn
+msgid "lccn"
+msgstr "lccn"
+
+#. Property label for Bibliographic Ontology:locator
+msgid "locator"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:locator
+msgid ""
+"A description (often numeric) that locates an item within a containing "
+"document or collection."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:numPages
+msgid "number of pages"
+msgstr "хуудасны дугаар"
+
+#. Property comment for Bibliographic Ontology:numPages
+msgid "The number of pages contained in a document"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:numVolumes
+msgid "number of volumes"
+msgstr "ботийн дугаар"
+
+#. Property comment for Bibliographic Ontology:numVolumes
+msgid ""
+"The number of volumes contained in a collection of documents (usually a "
+"series, periodical, etc.)."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:number
+msgid "number"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:number
+msgid ""
+"A generic item or document number. Not to be confused with issue number."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:oclcnum
+msgid "oclcnum"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:pageEnd
+msgid "page end"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:pageEnd
+msgid "Ending page number within a continuous page range."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:pageStart
+msgid "page start"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:pageStart
+msgid "Starting page number within a continuous page range."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:pages
+msgid "pages"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:pages
+msgid ""
+"A string of non-contiguous page spans that locate a Document within a "
+"Collection. Example: 23-25, 34, 54-56. For continuous page ranges, use the "
+"pageStart and pageEnd properties."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:pmid
+msgid "pmid"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:prefixName
+msgid "prefix name"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:prefixName
+msgid "The prefix of a name"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:section
+msgid "section"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:section
+msgid "A section number"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:shortDescription
+msgid "shortDescription"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:shortTitle
+msgid "short title"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:shortTitle
+msgid "The abbreviation of a title."
+msgstr ""
+
+#. Property label for Bibliographic Ontology:sici
+msgid "sici"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:suffixName
+msgid "suffix name"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:suffixName
+msgid "The suffix of a name"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:upc
+msgid "upc"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:uri
+msgid "uri"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:uri
+msgid "Universal Resource Identifier of a document"
+msgstr ""
+
+#. Property label for Bibliographic Ontology:volume
+msgid "volume"
+msgstr ""
+
+#. Property comment for Bibliographic Ontology:volume
+msgid "A volume number"
+msgstr ""
+
+#. Vocabulary label for Friend of a Friend
+msgid "Friend of a Friend"
+msgstr ""
+
+#. Vocabulary comment for Friend of a Friend
+msgid "Relationships between people and organizations (FOAF)"
+msgstr ""
+
+#. Class label for Friend of a Friend:LabelProperty
+msgid "Label Property"
+msgstr ""
+
+#. Class comment for Friend of a Friend:LabelProperty
+msgid ""
+"A foaf:LabelProperty is any RDF property with texual values that serve as "
+"labels."
+msgstr ""
+
+#. Class label for Friend of a Friend:Person
+msgid "Person"
+msgstr ""
+
+#. Class comment for Friend of a Friend:Person
+msgid "A person."
+msgstr ""
+
+#. Class comment for Friend of a Friend:Document
+msgid "A document."
+msgstr ""
+
+#. Class label for Friend of a Friend:Organization
+msgid "Organization"
+msgstr ""
+
+#. Class comment for Friend of a Friend:Organization
+msgid "An organization."
+msgstr ""
+
+#. Class label for Friend of a Friend:Group
+msgid "Group"
+msgstr ""
+
+#. Class comment for Friend of a Friend:Group
+msgid "A class of Agents."
+msgstr ""
+
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
+#. Class label for Friend of a Friend:Project
+msgid "Project"
+msgstr ""
+
+#. Class comment for Friend of a Friend:Project
+msgid "A project (a collective endeavour of some kind)."
+msgstr ""
+
+#. Class comment for Friend of a Friend:Image
+msgid "An image."
+msgstr ""
+
+#. Class label for Friend of a Friend:PersonalProfileDocument
+msgid "PersonalProfileDocument"
+msgstr ""
+
+#. Class comment for Friend of a Friend:PersonalProfileDocument
+msgid "A personal profile RDF document."
+msgstr ""
+
+#. Class label for Friend of a Friend:OnlineAccount
+msgid "Online Account"
+msgstr ""
+
+#. Class comment for Friend of a Friend:OnlineAccount
+msgid "An online account."
+msgstr ""
+
+#. Class label for Friend of a Friend:OnlineGamingAccount
+msgid "Online Gaming Account"
+msgstr ""
+
+#. Class comment for Friend of a Friend:OnlineGamingAccount
+msgid "An online gaming account."
+msgstr ""
+
+#. Class label for Friend of a Friend:OnlineEcommerceAccount
+msgid "Online E-commerce Account"
+msgstr ""
+
+#. Class comment for Friend of a Friend:OnlineEcommerceAccount
+msgid "An online e-commerce account."
+msgstr ""
+
+#. Class label for Friend of a Friend:OnlineChatAccount
+msgid "Online Chat Account"
+msgstr ""
+
+#. Class comment for Friend of a Friend:OnlineChatAccount
+msgid "An online chat account."
+msgstr ""
+
+#. Property label for Friend of a Friend:mbox
+msgid "personal mailbox"
+msgstr ""
+
+#. Property comment for Friend of a Friend:mbox
+msgid ""
+"A  personal mailbox, ie. an Internet mailbox associated with exactly one "
+"owner, the first owner of this mailbox. This is a 'static inverse functional"
+" property', in that  there is (across time and change) at most one "
+"individual that ever has any particular value for foaf:mbox."
+msgstr ""
+
+#. Property label for Friend of a Friend:mbox_sha1sum
+msgid "sha1sum of a personal mailbox URI name"
+msgstr ""
+
+#. Property comment for Friend of a Friend:mbox_sha1sum
+msgid ""
+"The sha1sum of the URI of an Internet mailbox associated with exactly one "
+"owner, the  first owner of the mailbox."
+msgstr ""
+
+#. Property label for Friend of a Friend:gender
+msgid "gender"
+msgstr "хүйс"
+
+#. Property comment for Friend of a Friend:gender
+msgid ""
+"The gender of this Agent (typically but not necessarily 'male' or 'female')."
+msgstr ""
+
+#. Property label for Friend of a Friend:geekcode
+msgid "geekcode"
+msgstr ""
+
+#. Property comment for Friend of a Friend:geekcode
+msgid ""
+"A textual geekcode for this person, see http://www.geekcode.com/geek.html"
+msgstr ""
+
+#. Property label for Friend of a Friend:dnaChecksum
+msgid "DNA checksum"
+msgstr ""
+
+#. Property comment for Friend of a Friend:dnaChecksum
+msgid "A checksum for the DNA of some thing. Joke."
+msgstr ""
+
+#. Property label for Friend of a Friend:sha1
+msgid "sha1sum (hex)"
+msgstr ""
+
+#. Property comment for Friend of a Friend:sha1
+msgid "A sha1sum hash, in hex."
+msgstr ""
+
+#. Property label for Friend of a Friend:based_near
+msgid "based near"
+msgstr ""
+
+#. Property comment for Friend of a Friend:based_near
+msgid ""
+"A location that something is based near, for some broadly human notion of "
+"near."
+msgstr ""
+
+#. Property label for Friend of a Friend:title
+msgid "title"
+msgstr ""
+
+#. Property comment for Friend of a Friend:title
+msgid "Title (Mr, Mrs, Ms, Dr. etc)"
+msgstr ""
+
+#. Property label for Friend of a Friend:nick
+msgid "nickname"
+msgstr ""
+
+#. Property comment for Friend of a Friend:nick
+msgid ""
+"A short informal nickname characterising an agent (includes login "
+"identifiers, IRC and other chat nicknames)."
+msgstr ""
+
+#. Property label for Friend of a Friend:jabberID
+msgid "jabber ID"
+msgstr "jabber ID"
+
+#. Property comment for Friend of a Friend:jabberID
+msgid "A jabber ID for something."
+msgstr ""
+
+#. Property label for Friend of a Friend:aimChatID
+msgid "AIM chat ID"
+msgstr "AIM chat ID"
+
+#. Property comment for Friend of a Friend:aimChatID
+msgid "An AIM chat ID"
+msgstr "An AIM chat ID"
+
+#. Property label for Friend of a Friend:skypeID
+msgid "Skype ID"
+msgstr "Skype ID"
+
+#. Property comment for Friend of a Friend:skypeID
+msgid "A Skype ID"
+msgstr "A Skype ID"
+
+#. Property label for Friend of a Friend:icqChatID
+msgid "ICQ chat ID"
+msgstr "ICQ chat ID"
+
+#. Property comment for Friend of a Friend:icqChatID
+msgid "An ICQ chat ID"
+msgstr "An ICQ chat ID"
+
+#. Property label for Friend of a Friend:yahooChatID
+msgid "Yahoo chat ID"
+msgstr "Yahoo chat ID"
+
+#. Property comment for Friend of a Friend:yahooChatID
+msgid "A Yahoo chat ID"
+msgstr "A Yahoo chat ID"
+
+#. Property label for Friend of a Friend:msnChatID
+msgid "MSN chat ID"
+msgstr "MSN chat ID"
+
+#. Property comment for Friend of a Friend:msnChatID
+msgid "An MSN chat ID"
+msgstr "An MSN chat ID"
+
+#. Property label for Friend of a Friend:name
+msgid "name"
+msgstr "нэр"
+
+#. Property comment for Friend of a Friend:name
+msgid "A name for some thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:firstName
+msgid "firstName"
+msgstr "өөрийн нэр"
+
+#. Property comment for Friend of a Friend:firstName
+msgid "The first name of a person."
+msgstr ""
+
+#. Property label for Friend of a Friend:lastName
+msgid "lastName"
+msgstr ""
+
+#. Property comment for Friend of a Friend:lastName
+msgid "The last name of a person."
+msgstr ""
+
+#. Property label for Friend of a Friend:givenName
+#. Property label for Friend of a Friend:givenname
+msgid "Given name"
+msgstr ""
+
+#. Property comment for Friend of a Friend:givenName
+#. Property comment for Friend of a Friend:givenname
+msgid "The given name of some person."
+msgstr ""
+
+#. Property label for Friend of a Friend:surname
+msgid "Surname"
+msgstr ""
+
+#. Property comment for Friend of a Friend:surname
+msgid "The surname of some person."
+msgstr ""
+
+#. Property label for Friend of a Friend:family_name
+msgid "family_name"
+msgstr ""
+
+#. Property comment for Friend of a Friend:family_name
+#. Property comment for Friend of a Friend:familyName
+msgid "The family name of some person."
+msgstr ""
+
+#. Property label for Friend of a Friend:familyName
+msgid "familyName"
+msgstr ""
+
+#. Property label for Friend of a Friend:phone
+msgid "phone"
+msgstr ""
+
+#. Property comment for Friend of a Friend:phone
+msgid ""
+"A phone,  specified using fully qualified tel: URI scheme (refs: "
+"http://www.w3.org/Addressing/schemes.html#tel)."
+msgstr ""
+
+#. Property label for Friend of a Friend:homepage
+msgid "homepage"
+msgstr ""
+
+#. Property comment for Friend of a Friend:homepage
+msgid "A homepage for some thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:weblog
+msgid "weblog"
+msgstr ""
+
+#. Property comment for Friend of a Friend:weblog
+msgid "A weblog of some thing (whether person, group, company etc.)."
+msgstr ""
+
+#. Property label for Friend of a Friend:openid
+msgid "openid"
+msgstr ""
+
+#. Property comment for Friend of a Friend:openid
+msgid "An OpenID for an Agent."
+msgstr ""
+
+#. Property label for Friend of a Friend:tipjar
+msgid "tipjar"
+msgstr ""
+
+#. Property comment for Friend of a Friend:tipjar
+msgid ""
+"A tipjar document for this agent, describing means for payment and reward."
+msgstr ""
+
+#. Property label for Friend of a Friend:plan
+msgid "plan"
+msgstr ""
+
+#. Property comment for Friend of a Friend:plan
+msgid "A .plan comment, in the tradition of finger and '.plan' files."
+msgstr ""
+
+#. Property label for Friend of a Friend:made
+msgid "made"
+msgstr ""
+
+#. Property comment for Friend of a Friend:made
+msgid "Something that was made by this agent."
+msgstr ""
+
+#. Property label for Friend of a Friend:maker
+msgid "maker"
+msgstr ""
+
+#. Property comment for Friend of a Friend:maker
+msgid "An agent that  made this thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:img
+msgid "image"
+msgstr ""
+
+#. Property comment for Friend of a Friend:img
+msgid ""
+"An image that can be used to represent some thing (ie. those depictions "
+"which are particularly representative of something, eg. one's photo on a "
+"homepage)."
+msgstr ""
+
+#. Property label for Friend of a Friend:depiction
+msgid "depiction"
+msgstr ""
+
+#. Property comment for Friend of a Friend:depiction
+msgid "A depiction of some thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:depicts
+msgid "depicts"
+msgstr ""
+
+#. Property comment for Friend of a Friend:depicts
+msgid "A thing depicted in this representation."
+msgstr ""
+
+#. Property label for Friend of a Friend:thumbnail
+msgid "thumbnail"
+msgstr ""
+
+#. Property comment for Friend of a Friend:thumbnail
+msgid "A derived thumbnail image."
+msgstr ""
+
+#. Property label for Friend of a Friend:myersBriggs
+msgid "myersBriggs"
+msgstr ""
+
+#. Property comment for Friend of a Friend:myersBriggs
+msgid "A Myers Briggs (MBTI) personality classification."
+msgstr ""
+
+#. Property label for Friend of a Friend:workplaceHomepage
+msgid "workplace homepage"
+msgstr ""
+
+#. Property comment for Friend of a Friend:workplaceHomepage
+msgid ""
+"A workplace homepage of some person; the homepage of an organization they "
+"work for."
+msgstr ""
+
+#. Property label for Friend of a Friend:workInfoHomepage
+msgid "work info homepage"
+msgstr ""
+
+#. Property comment for Friend of a Friend:workInfoHomepage
+msgid ""
+"A work info homepage of some person; a page about their work for some "
+"organization."
+msgstr ""
+
+#. Property label for Friend of a Friend:schoolHomepage
+msgid "schoolHomepage"
+msgstr ""
+
+#. Property comment for Friend of a Friend:schoolHomepage
+msgid "A homepage of a school attended by the person."
+msgstr ""
+
+#. Property label for Friend of a Friend:knows
+msgid "knows"
+msgstr ""
+
+#. Property comment for Friend of a Friend:knows
+msgid ""
+"A person known by this person (indicating some level of reciprocated "
+"interaction between the parties)."
+msgstr ""
+
+#. Property label for Friend of a Friend:interest
+msgid "interest"
+msgstr ""
+
+#. Property comment for Friend of a Friend:interest
+msgid "A page about a topic of interest to this person."
+msgstr ""
+
+#. Property label for Friend of a Friend:topic_interest
+msgid "topic_interest"
+msgstr ""
+
+#. Property comment for Friend of a Friend:topic_interest
+msgid "A thing of interest to this person."
+msgstr ""
+
+#. Property label for Friend of a Friend:publications
+msgid "publications"
+msgstr ""
+
+#. Property comment for Friend of a Friend:publications
+msgid "A link to the publications of this person."
+msgstr ""
+
+#. Property label for Friend of a Friend:currentProject
+msgid "current project"
+msgstr ""
+
+#. Property comment for Friend of a Friend:currentProject
+msgid "A current project this person works on."
+msgstr ""
+
+#. Property label for Friend of a Friend:pastProject
+msgid "past project"
+msgstr ""
+
+#. Property comment for Friend of a Friend:pastProject
+msgid "A project this person has previously worked on."
+msgstr ""
+
+#. Property label for Friend of a Friend:fundedBy
+msgid "funded by"
+msgstr ""
+
+#. Property comment for Friend of a Friend:fundedBy
+msgid "An organization funding a project or person."
+msgstr ""
+
+#. Property label for Friend of a Friend:logo
+msgid "logo"
+msgstr ""
+
+#. Property comment for Friend of a Friend:logo
+msgid "A logo representing some thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:topic
+msgid "topic"
+msgstr ""
+
+#. Property comment for Friend of a Friend:topic
+msgid "A topic of some page or document."
+msgstr ""
+
+#. Property label for Friend of a Friend:primaryTopic
+msgid "primary topic"
+msgstr ""
+
+#. Property comment for Friend of a Friend:primaryTopic
+msgid "The primary topic of some page or document."
+msgstr ""
+
+#. Property label for Friend of a Friend:focus
+msgid "focus"
+msgstr ""
+
+#. Property comment for Friend of a Friend:focus
+msgid ""
+"The underlying or 'focal' entity associated with some SKOS-described "
+"concept."
+msgstr ""
+
+#. Property label for Friend of a Friend:isPrimaryTopicOf
+msgid "is primary topic of"
+msgstr ""
+
+#. Property comment for Friend of a Friend:isPrimaryTopicOf
+msgid "A document that this thing is the primary topic of."
+msgstr ""
+
+#. Property comment for Friend of a Friend:page
+msgid "A page or document about this thing."
+msgstr ""
+
+#. Property label for Friend of a Friend:theme
+msgid "theme"
+msgstr ""
+
+#. Property comment for Friend of a Friend:theme
+msgid "A theme."
+msgstr ""
+
+#. Property label for Friend of a Friend:account
+#. Property label for Friend of a Friend:holdsAccount
+msgid "account"
+msgstr ""
+
+#. Property comment for Friend of a Friend:account
+#. Property comment for Friend of a Friend:holdsAccount
+msgid "Indicates an account held by this agent."
+msgstr ""
+
+#. Property label for Friend of a Friend:accountServiceHomepage
+msgid "account service homepage"
+msgstr ""
+
+#. Property comment for Friend of a Friend:accountServiceHomepage
+msgid "Indicates a homepage of the service provide for this online account."
+msgstr ""
+
+#. Property label for Friend of a Friend:accountName
+msgid "account name"
+msgstr ""
+
+#. Property comment for Friend of a Friend:accountName
+msgid "Indicates the name (identifier) associated with this online account."
+msgstr ""
+
+#. Property label for Friend of a Friend:member
+msgid "member"
+msgstr ""
+
+#. Property comment for Friend of a Friend:member
+msgid "Indicates a member of a Group"
+msgstr ""
+
+#. Property label for Friend of a Friend:membershipClass
+msgid "membershipClass"
+msgstr ""
+
+#. Property comment for Friend of a Friend:membershipClass
+msgid "Indicates the class of individuals that are a member of a Group"
+msgstr ""
+
+#. Property label for Friend of a Friend:birthday
+msgid "birthday"
+msgstr ""
+
+#. Property comment for Friend of a Friend:birthday
+msgid ""
+"The birthday of this Agent, represented in mm-dd string form, eg. '12-31'."
+msgstr ""
+
+#. Property label for Friend of a Friend:age
+msgid "age"
+msgstr ""
+
+#. Property comment for Friend of a Friend:age
+msgid "The age in years of some agent."
+msgstr ""
+
+#. Property comment for Friend of a Friend:status
+msgid ""
+"A string expressing what the user is happy for the general public (normally)"
+" to know about their current activity."
+msgstr ""
diff --git a/application/language/nl_NL.mo b/application/language/nl_NL.mo
index 4f6c04b630..3ca6603897 100644
Binary files a/application/language/nl_NL.mo and b/application/language/nl_NL.mo differ
diff --git a/application/language/nl_NL.po b/application/language/nl_NL.po
index 1ecff32b6e..ea560c9092 100644
--- a/application/language/nl_NL.po
+++ b/application/language/nl_NL.po
@@ -5,15 +5,17 @@
 # 
 # Translators:
 # PaddoInWonderland <martijnrichardk@gmail.com>, 2018
+# Blair Kneppers <blair.kneppers@gmail.com>, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: PaddoInWonderland <martijnrichardk@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/omeka/teams/14184/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,20 +65,20 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
-"Machtigingen voor de huidige gebruiker voor %s het  object %s geweigerd."
+"Machtigingen voor de huidige gebruiker voor %1$s het  object %2$s geweigerd."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "%s niet gevonden met de criteria %s"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "%1$s niet gevonden met de criteria %2$s"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -86,7 +88,7 @@ msgstr "Welkom"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Welkom op je nieuwe site. Dit is een voorbeeld pagina."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Bladeren"
 
@@ -95,7 +97,7 @@ msgstr "Bladeren"
 msgid "The API does not support the \"%s\" resource."
 msgstr "De API ondersteunt het object \"%s\" niet."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +112,11 @@ msgstr "Standaard"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Nog een object toevoegen?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Nog een collectie toevoegen?"
 
@@ -197,8 +199,8 @@ msgstr "OpenSeadragon is niet beschikbaar tenzij Javascript is ingeschakeld."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Module \"%s\" is gemarkeerd als \"%s\" en kan niet worden geactiveerd"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Module \"%1$s\" is gemarkeerd als \"%2$s\" en kan niet worden geactiveerd"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -207,8 +209,8 @@ msgstr "Module \"%s\" niet in de database als het is ingeschakeld"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Module \"%s\" is gemarkeerd als \"%s\" en kan niet worden uigeschakeld"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Module \"%1$s\" is gemarkeerd als \"%2$s\" en kan niet worden uigeschakeld"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -217,13 +219,13 @@ msgstr "Module \"%s\" niet in de database als het is uitgeschakeld"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Module \"%s\" is gemarkeerd als \"%s\" en kan niet worden geïnstalleerd"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Module \"%1$s\" is gemarkeerd als \"%2$s\" en kan niet worden geïnstalleerd"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Module \"%s\" is gemarkeerd als \"%s\" en kan niet worden verwijdert"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Module \"%1$s\" is gemarkeerd als \"%2$s\" en kan niet worden verwijdert"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -232,8 +234,8 @@ msgstr "Module \"%s\" niet gevonden in de database tijdens het de-installeren"
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Module \"%s\" is gemarkeerd als \"%s\" en kan niet worden geüpgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "Module \"%1$s\" is gemarkeerd als \"%2$s\" en kan niet worden geüpgraded"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -242,9 +244,9 @@ msgstr "Module \"%s\" niet gevonden in de database tijdens het upgraden"
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
-"Onvoldoende machtigingen voor de huidige gebruiker om %s de %s module."
+"Onvoldoende machtigingen voor de huidige gebruiker om %1$s de %2$s module."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -342,7 +344,7 @@ msgstr "Toon titel van de bijlage"
 
 #: application/src/View/Helper/BlockThumbnailTypeSelect.php:42
 msgid "Thumbnail type"
-msgstr ""
+msgstr "Miniatuur type"
 
 #: application/src/View/Helper/CancelButton.php:14
 #: application/view/omeka/admin/vocabulary/update.phtml:23
@@ -352,27 +354,28 @@ msgstr "Annuleer"
 #: application/src/View/Helper/PasswordRequirements.php:40
 #, php-format
 msgid "Password must be a minimum of %s characters in length."
-msgstr ""
+msgstr "Wachtwoord moet minstens %s karakters bevatten."
 
 #: application/src/View/Helper/PasswordRequirements.php:46
 #, php-format
 msgid "Password must contain at least %s lowercase characters."
-msgstr ""
+msgstr "Wachtwoord moet minstens %s kleine letters bevatten."
 
 #: application/src/View/Helper/PasswordRequirements.php:52
 #, php-format
 msgid "Password must contain at least %s uppercase characters."
-msgstr ""
+msgstr "Wachtwoord moet minstens %s hoofdletters bevatten."
 
 #: application/src/View/Helper/PasswordRequirements.php:58
 #, php-format
 msgid "Password must contain at least %s numbers."
-msgstr ""
+msgstr "Wachtwoord moet minstens %s getallen bevatten."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
+"Wachtwoord moet minstens %1$s speciale tekens bevatten: <code>%2$s</code>"
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
@@ -397,12 +400,12 @@ msgstr "bevat niet"
 #: application/src/View/Helper/SearchFilters.php:36
 #: application/view/common/advanced-search/properties.phtml:69
 msgid "is resource with ID"
-msgstr ""
+msgstr "is object met ID"
 
 #: application/src/View/Helper/SearchFilters.php:37
 #: application/view/common/advanced-search/properties.phtml:70
 msgid "is not resource with ID"
-msgstr ""
+msgstr "is geen object met ID"
 
 #: application/src/View/Helper/SearchFilters.php:38
 #: application/view/common/advanced-search/properties.phtml:71
@@ -417,7 +420,7 @@ msgstr "heeft geen waardes"
 #: application/src/View/Helper/SearchFilters.php:47
 #: application/view/common/advanced-search/fulltext.phtml:6
 msgid "Search full-text"
-msgstr ""
+msgstr "Zoek full-text"
 
 #: application/src/View/Helper/SearchFilters.php:60
 #: application/view/common/linked-resources.phtml:33
@@ -464,8 +467,9 @@ msgid "AND"
 msgstr "EN"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -481,11 +485,11 @@ msgstr "Zoeken"
 
 #: application/src/View/Helper/SearchFilters.php:137
 msgid "Template"
-msgstr ""
+msgstr "Sjabloon"
 
 #: application/src/View/Helper/SearchFilters.php:141
 msgid "Unknown template"
-msgstr ""
+msgstr "Onbekend sjabloon"
 
 #: application/src/View/Helper/SearchFilters.php:156
 #: application/view/omeka/site/item/browse.phtml:34
@@ -523,48 +527,48 @@ msgstr "Email"
 
 #: application/src/View/Helper/SearchUserFilters.php:54
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #: application/src/View/Helper/SearchUserFilters.php:59
 #: application/view/omeka/admin/user/browse.phtml:14
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rol"
 
 #: application/src/View/Helper/SearchUserFilters.php:62
 msgid "Unknown role"
-msgstr ""
+msgstr "Onbekende rol"
 
 #: application/src/View/Helper/SearchUserFilters.php:66
 #: application/view/omeka/admin/user/show.phtml:35
 msgid "Is active"
-msgstr ""
+msgstr "Is actief"
 
 #: application/src/View/Helper/SearchUserFilters.php:67
 #: application/view/omeka/admin/user/show.phtml:37
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 #: application/src/View/Helper/SearchUserFilters.php:67
 #: application/view/omeka/admin/user/show.phtml:37
 msgid "no"
-msgstr ""
+msgstr "nee"
 
 #: application/src/View/Helper/SearchUserFilters.php:71
 #: application/view/common/advanced-search/users.phtml:53
 msgid "Has permission in site"
-msgstr ""
+msgstr "Is gemachtigd in site"
 
 #: application/src/View/Helper/UploadLimit.php:26
 #, php-format
 msgid "The maximum upload size is %s MB."
 msgstr "De maximum uploadgrootte is %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -584,7 +588,7 @@ msgstr "De maximum uploadgrootte is %s MB."
 msgid "Edit"
 msgstr "Bewerk"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -611,7 +615,7 @@ msgstr "Zoekt voor objecten die zijn toegewezen op elk van deze collecties."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -623,9 +627,13 @@ msgstr "Verwijder waarde"
 msgid "Add new item set"
 msgstr "Nieuwe collectie"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
-msgstr ""
+msgstr "Zoekopdracht tekst"
 
 #: application/view/common/advanced-search/properties.phtml:39
 msgid "Search by value"
@@ -633,11 +641,11 @@ msgstr "Zoek op waarde"
 
 #: application/view/common/advanced-search/properties.phtml:57
 msgid "Property"
-msgstr ""
+msgstr "Eigenschap"
 
 #: application/view/common/advanced-search/properties.phtml:64
 msgid "Query type"
-msgstr ""
+msgstr "Zoekopdracht type"
 
 #: application/view/common/advanced-search/properties.phtml:81
 msgid "Add new value"
@@ -649,23 +657,23 @@ msgstr "Zoek op klasse"
 
 #: application/view/common/advanced-search/resource-class.phtml:18
 msgid "Searches for items that are any of these classes."
-msgstr ""
+msgstr "Zoekt voor objecten die van elk van deze klassen zijn."
 
 #: application/view/common/advanced-search/resource-class.phtml:34
 msgid "Add new class"
-msgstr ""
+msgstr "Nieuwe klasse toevoegen"
 
 #: application/view/common/advanced-search/resource-template.phtml:16
 msgid "Search by template"
-msgstr ""
+msgstr "Zoek op sjabloon"
 
 #: application/view/common/advanced-search/resource-template.phtml:19
 msgid "Searches for items that use any of these templates."
-msgstr ""
+msgstr "Zoekt voor objecten die een van deze sjablonen gebruiken."
 
 #: application/view/common/advanced-search/resource-template.phtml:35
 msgid "Add new template"
-msgstr ""
+msgstr "Nieuw sjabloon toevoegen"
 
 #: application/view/common/advanced-search/site-pool.phtml:12
 msgid "In site pool"
@@ -673,19 +681,19 @@ msgstr "In site pool"
 
 #: application/view/common/advanced-search/users.phtml:17
 msgid "Search by email"
-msgstr ""
+msgstr "Zoek op mailadres"
 
 #: application/view/common/advanced-search/users.phtml:25
 msgid "Search by name"
-msgstr ""
+msgstr "Zoek op naam"
 
 #: application/view/common/advanced-search/users.phtml:33
 msgid "Search by role"
-msgstr ""
+msgstr "Zoek op rol"
 
 #: application/view/common/advanced-search/users.phtml:44
 msgid "Search by activity"
-msgstr ""
+msgstr "Zoek op activiteit"
 
 #: application/view/common/asset-form.phtml:34
 msgid "[No asset selected]"
@@ -732,7 +740,7 @@ msgid "Block to be removed"
 msgstr "Te verwijderen block"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -740,6 +748,7 @@ msgstr "Waarde herstellen"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -750,17 +759,17 @@ msgstr "Waarde herstellen"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Collecties"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Te verwijderen waarde"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -777,7 +786,7 @@ msgstr "Verander taal"
 
 #: application/view/common/data-type/literal.phtml:5
 msgid "Language"
-msgstr ""
+msgstr "Taal"
 
 #: application/view/common/data-type/resource.phtml:14
 msgid "No resource selected"
@@ -889,16 +898,16 @@ msgstr "Weet je zeker dat je %s wil verwijderen?"
 
 #: application/view/common/filter-selector.phtml:6
 msgid "No filter"
-msgstr ""
+msgstr "Geen filter"
 
 #: application/view/common/filter-selector.phtml:13
 #: application/view/omeka/admin/module/browse.phtml:14
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: application/view/common/form-row.phtml:20
 msgid "Learn more"
-msgstr ""
+msgstr "Meer informatie"
 
 #: application/view/common/item-set-selector.phtml:7
 msgid "Click on an item set to add it to the edit panel."
@@ -908,10 +917,6 @@ msgstr "Klik op een collectie om deze toe te voegen aan het bewerkingspaneel."
 msgid "Filter item sets"
 msgstr "Sorteer collecties"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Alle collecties"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -933,11 +938,11 @@ msgstr "Meer informatie"
 
 #: application/view/common/linked-resources.phtml:15
 msgid "Filter by property"
-msgstr ""
+msgstr "Filter op eigenschap"
 
 #: application/view/common/linked-resources.phtml:17
 msgid "All"
-msgstr ""
+msgstr "Alle"
 
 #: application/view/common/linked-resources.phtml:31
 #: application/view/omeka/admin/item-set/browse.phtml:7
@@ -949,7 +954,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1001,8 +1006,8 @@ msgstr "Volgende"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s van %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s van %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1066,17 +1071,20 @@ msgstr ""
 msgid "Filter properties"
 msgstr "Sorteer eigenschappen"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Eigenschap toevoegen"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
 "here."
 msgstr ""
+"Omeka S selecteert automatisch een miniatuur uit bijgevoegde media voor een "
+"object. U kunt in plaats daarvan een andere afbeelding gebruiken door hier "
+"een item te kiezen."
 
 #: application/view/common/resource-form-templates.phtml:10
 #: application/view/omeka/admin/item/sidebar-select.phtml:28
@@ -1130,11 +1138,11 @@ msgstr "Sorteer op %s"
 
 #: application/view/common/sort-selector.phtml:7
 msgid "Sort by"
-msgstr ""
+msgstr "Sorteer op"
 
 #: application/view/common/sort-selector.phtml:13
 msgid "Sort order"
-msgstr ""
+msgstr "Sorteervolgorde"
 
 #: application/view/common/sort-selector.phtml:14
 msgid "Ascending"
@@ -1164,29 +1172,29 @@ msgstr "Uitloggen"
 msgid "Log in"
 msgstr "Inloggen"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
-msgstr ""
+msgstr "Klik op een gebruiker om deze toe te voegen aan het bewerkingspaneel."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filter gebruikers"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
 msgid "A new version of Omeka S is available. %s"
-msgstr ""
+msgstr "Er is een nieuwe versie van Omeka S beschikbaar. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
-msgstr ""
+msgstr "Klik hier voor de nieuwe versie."
 
 #: application/view/error/403.phtml:4
 msgid "Forbidden"
@@ -1206,7 +1214,7 @@ msgid "Details:"
 msgstr "Details:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Objecten"
 
@@ -1218,7 +1226,7 @@ msgstr "Admin"
 
 #: application/view/layout/layout-admin.phtml:37
 msgid "Skip to main content"
-msgstr ""
+msgstr "Naar hoofdinhoud"
 
 #: application/view/layout/layout-admin.phtml:42
 msgid "Navigation menu"
@@ -1286,15 +1294,15 @@ msgstr "Systeeminformatie"
 
 #: application/view/layout/layout-admin.phtml:113
 msgid "User manual"
-msgstr ""
+msgstr "Handleiding"
 
 #: application/view/layout/layout-admin.phtml:114
 msgid "Support forums"
-msgstr ""
+msgstr "Ondersteuningsfora"
 
 #: application/view/layout/layout.phtml:30
 msgid "Powered by Omeka S"
-msgstr "Medemogelijk gemaakt door Omeka S"
+msgstr "Mede mogelijk gemaakt door Omeka S"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:9
 msgid "Upload new asset"
@@ -1310,11 +1318,11 @@ msgstr "Selecteer asset"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:26
 msgid "No owner"
-msgstr ""
+msgstr "Geen eigenaar"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:33
 msgid "Filter by owner"
-msgstr ""
+msgstr "Filter op eigenaar"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:49
 msgid "Delete asset"
@@ -1333,6 +1341,8 @@ msgid ""
 "Are you sure you want to delete this asset? It will no longer be available "
 "to any resources currently using it."
 msgstr ""
+"Weet je zeker dat je deze asset wil verwijderen? Het kan hierna niet meer "
+"worden gebruikt door objecten."
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:79
 msgid "Confirm delete"
@@ -1417,7 +1427,7 @@ msgstr "Bewerk collecties in batch"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1445,7 +1455,7 @@ msgstr "Je bewerkt %s collecties."
 #: application/view/omeka/admin/media/browse.phtml:13
 #: application/view/omeka/site/item/browse.phtml:18
 msgid "Identifier"
-msgstr ""
+msgstr "Identifier"
 
 #: application/view/omeka/admin/item-set/browse.phtml:19
 #: application/view/omeka/admin/item-set/browse.phtml:76
@@ -1463,7 +1473,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -1480,7 +1490,7 @@ msgstr "Eigenaar"
 #: application/view/omeka/admin/user/browse.phtml:81
 #: application/view/omeka/site/item/browse.phtml:26
 msgid "Created"
-msgstr ""
+msgstr "Aangemaakt"
 
 #: application/view/omeka/admin/item-set/browse.phtml:35
 #: application/view/omeka/admin/item-set/search.phtml:5
@@ -1561,7 +1571,7 @@ msgstr "Ga"
 #: application/view/omeka/admin/item/browse.phtml:72
 #: application/view/omeka/admin/media/browse.phtml:77
 msgid "Select all"
-msgstr ""
+msgstr "Alles selecteren"
 
 #: application/view/omeka/admin/item-set/browse.phtml:99
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:8
@@ -1627,9 +1637,10 @@ msgstr "Weet je zeker dat je de geselecteerde collectie wil verwijderen?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: deze actie zal permanent %s collectie en kan niet worden ongedaan "
+"%1$s: deze actie zal permanent %2$s collectie en kan niet worden ongedaan "
 "gemaakt."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1672,7 +1683,7 @@ msgstr "Waarden"
 #: application/view/omeka/admin/item/form.phtml:16
 #: application/view/omeka/admin/media/edit.phtml:13
 msgid "Thumbnail"
-msgstr ""
+msgstr "Miniatuur"
 
 #: application/view/omeka/admin/item-set/form.phtml:27
 msgid "Close item set"
@@ -1695,7 +1706,7 @@ msgstr "Maak publiekelijk"
 #: application/view/omeka/admin/item/search.phtml:12
 #: application/view/omeka/admin/media/search.phtml:12
 msgid "Reset"
-msgstr ""
+msgstr "Resetten"
 
 #: application/view/omeka/admin/item-set/show-details.phtml:13
 #: application/view/omeka/admin/item-set/show.phtml:74
@@ -1738,11 +1749,11 @@ msgstr "Bekijk objecten"
 
 #: application/view/omeka/admin/item-set/show.phtml:54
 msgid "The following resources link to this item set:"
-msgstr ""
+msgstr "De volgende objecten zijn aan deze collectie gelinkt:"
 
 #: application/view/omeka/admin/item-set/show.phtml:58
 msgid "No resources link to this item set."
-msgstr ""
+msgstr "Er zijn geen objecten aan deze collectie gelinkt."
 
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:39
 msgid "item sets"
@@ -1795,10 +1806,11 @@ msgstr "Weet je zeker dat je de geselecteerde objecten wil verwijderen?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: deze actie zal permanent %s objecten verwijderen en kan niet ongedaan "
-"worden gemaakt."
+"%1$s: deze actie zal permanent %2$s objecten verwijderen en kan niet "
+"ongedaan worden gemaakt."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1848,11 +1860,11 @@ msgstr "Bewerk object"
 
 #: application/view/omeka/admin/item/show.phtml:44
 msgid "The following resources link to this item:"
-msgstr ""
+msgstr "De volgende objecten zijn aan dit object gelinkt:"
 
 #: application/view/omeka/admin/item/show.phtml:48
 msgid "No resources link to this item."
-msgstr ""
+msgstr "Er zijn geen objecten aan dit object gelinkt."
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:28
 msgid "Filter search"
@@ -1860,7 +1872,7 @@ msgstr "Zoeken met filter"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:57
 msgid "Filter by item ID"
-msgstr ""
+msgstr "Filter op object ID"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:67
 msgid "Quick add"
@@ -1929,21 +1941,21 @@ msgstr "[geen logbestand]"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:9
 msgid "Batch edit medias"
-msgstr ""
+msgstr "Bewerk media in batch"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:29
 msgid "Affected medias"
-msgstr ""
+msgstr "Getroffen media"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:31
 #, php-format
 msgid "You are editing the following %s medias:"
-msgstr ""
+msgstr "Je bewerkt de volgende %s media:"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:38
 #, php-format
 msgid "You are editing %s medias."
-msgstr ""
+msgstr "Je bewerkt %s media."
 
 #: application/view/omeka/admin/media/browse.phtml:107
 #: application/view/omeka/admin/media/sidebar-select.phtml:8
@@ -1953,17 +1965,17 @@ msgstr "Selecteer media"
 #: application/view/omeka/admin/media/browse.phtml:167
 #: application/view/omeka/admin/media/browse.phtml:185
 msgid "Delete medias"
-msgstr ""
+msgstr "Verwijder media"
 
 #: application/view/omeka/admin/media/browse.phtml:168
 msgid "Are you sure you would like to delete the selected medias?"
-msgstr ""
+msgstr "Weet je zeker dat je de geselecteerde media wil verwijderen?"
 
 #: application/view/omeka/admin/media/browse.phtml:170
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -1971,10 +1983,12 @@ msgid ""
 "Are you sure you would like to delete all medias on all pages of this "
 "result?"
 msgstr ""
+"Weet je zeker dat je alle meida op alle pagina's met dit resultaat wilt "
+"verwijderen?"
 
 #: application/view/omeka/admin/media/browse.phtml:227
 msgid "Omeka could not find any medias."
-msgstr ""
+msgstr "Omeka heeft geen media kunnen vinden."
 
 #: application/view/omeka/admin/media/show-details.phtml:18
 msgid "Part of Item"
@@ -1988,13 +2002,13 @@ msgstr "MIME type"
 #: application/view/omeka/admin/media/show-details.phtml:31
 #: application/view/omeka/admin/media/show.phtml:52
 msgid "Size"
-msgstr ""
+msgstr "Grootte"
 
 #: application/view/omeka/admin/media/show-details.phtml:32
 #: application/view/omeka/admin/media/show.phtml:53
 #, php-format
 msgid "%s bytes"
-msgstr ""
+msgstr "%s bytes"
 
 #: application/view/omeka/admin/media/show.phtml:14
 msgid "Edit media"
@@ -2006,7 +2020,7 @@ msgstr "Onderdeel van object"
 
 #: application/view/omeka/admin/media/show.phtml:57
 msgid "Ingester"
-msgstr ""
+msgstr "Importer"
 
 #: application/view/omeka/admin/media/show.phtml:62
 msgid "Source"
@@ -2053,7 +2067,7 @@ msgstr "door %s"
 #: application/view/omeka/admin/module/browse.phtml:58
 #, php-format
 msgid "A new version of this module is available. %s"
-msgstr ""
+msgstr "Er is een nieuwe versie van deze module beschikbaar. %s"
 
 #: application/view/omeka/admin/module/browse.phtml:75
 #: application/view/omeka/admin/module/browse.phtml:83
@@ -2157,11 +2171,11 @@ msgstr "Andere opties"
 
 #: application/view/omeka/admin/resource-template/form.phtml:72
 msgid "Use for resource title"
-msgstr ""
+msgstr "Gebruik voor objecttitel"
 
 #: application/view/omeka/admin/resource-template/form.phtml:78
 msgid "Use for resource description"
-msgstr ""
+msgstr "Gebruik voor objectbeschrijving"
 
 #: application/view/omeka/admin/resource-template/form.phtml:84
 msgid "Required"
@@ -2207,7 +2221,7 @@ msgstr "Verplicht?"
 #: application/view/omeka/admin/resource-template/review-import.phtml:41
 #: application/view/omeka/admin/resource-template/show.phtml:31
 msgid "Private?"
-msgstr ""
+msgstr "Privé?"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:75
 #: application/view/omeka/admin/resource-template/review-import.phtml:76
@@ -2259,43 +2273,44 @@ msgstr "Gebruikers"
 
 #: application/view/omeka/admin/user/batch-edit.phtml:7
 msgid "Batch edit users"
-msgstr ""
+msgstr "Bewerk gebruikers in batch"
 
 #: application/view/omeka/admin/user/batch-edit.phtml:26
 msgid "Affected users"
-msgstr ""
+msgstr "Getroffen gebruikers"
 
 #: application/view/omeka/admin/user/batch-edit.phtml:28
 #, php-format
 msgid "You are editing the following %s users:"
-msgstr ""
+msgstr "Je bewerkt de volgende %s gebruikers:"
 
 #: application/view/omeka/admin/user/batch-edit.phtml:35
 #, php-format
 msgid "You are editing %s users (except yourself)."
-msgstr ""
+msgstr "Je bewerkt %s gebruikers (behalve jezelf)."
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Nieuwe gebruiker toevoegen"
 
 #: application/view/omeka/admin/user/browse.phtml:95
 msgid "Inactive"
-msgstr ""
+msgstr "Inactief"
 
 #: application/view/omeka/admin/user/browse.phtml:148
 #: application/view/omeka/admin/user/browse.phtml:166
 msgid "Delete users"
-msgstr ""
+msgstr "Verwijder gebruikers"
 
 #: application/view/omeka/admin/user/browse.phtml:149
 msgid "Are you sure you would like to delete the selected users?"
-msgstr ""
+msgstr "Weet je zeker dat je de geselecteerde gebruikers wil verwijderen?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2303,11 +2318,13 @@ msgid ""
 "Are you sure you would like to delete all users (except yourself) on all "
 "pages of this result?"
 msgstr ""
+"Weet je zeker dat je alle gebruikers op alle pagina's met dit resultaat wilt"
+" verwijderen (behalve jezelf)?"
 
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2341,7 +2358,7 @@ msgstr "Sleutel toevoegen"
 
 #: application/view/omeka/admin/user/show-details.phtml:7
 msgid "(inactive)"
-msgstr ""
+msgstr "(inactief)"
 
 #: application/view/omeka/admin/user/show.phtml:11
 msgid "Edit user"
@@ -2390,17 +2407,19 @@ msgstr "Voorzetsel:"
 #: application/view/omeka/admin/vocabulary/properties.phtml:11
 #: application/view/omeka/admin/vocabulary/show-details.phtml:7
 msgid "Namespace URI:"
-msgstr ""
+msgstr "Naamruimte URI:"
 
 #: application/view/omeka/admin/vocabulary/classes.phtml:75
 msgid "This vocabulary has no classes."
 msgstr "Deze woordenlijst heeft geen klassen."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
 msgstr ""
+"Je kunt deze woordenlijst bijwerken naar een nieuwere versie. Je kunt de "
+"wijzigingen bekijken voordat je accepteert."
 
 #: application/view/omeka/admin/vocabulary/import.phtml:7
 msgid "New vocabulary"
@@ -2423,7 +2442,7 @@ msgstr "Veranderingen toepassen"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2434,8 +2453,8 @@ msgstr "Sites"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Ga naar de %s om te beginnen met %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Ga naar de %1$s om te beginnen met %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2515,7 +2534,7 @@ msgid "Theme"
 msgstr "Thema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2527,7 +2546,7 @@ msgstr "Nieuw site"
 #: application/view/omeka/site-admin/index/index.phtml:40
 #: application/view/omeka/site-admin/index/show.phtml:24
 msgid "URL slug"
-msgstr ""
+msgstr "URL slug"
 
 #: application/view/omeka/site-admin/index/index.phtml:25
 msgid "Add new site"
@@ -2556,22 +2575,18 @@ msgstr "Aangepaste link toevoegen"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:46
 msgid "Filter pages"
-msgstr ""
+msgstr "Filter pagina’s"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:60
 msgid "There are no available pages."
 msgstr "Er zijn geen beschikbare pagina's."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Collectie herstellen"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Er zijn momenteel %s objecten in the pool van deze site."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Er zijn geen collecties toegewezen aan deze site."
 
@@ -2610,30 +2625,30 @@ msgstr "Het huidige thema heeft geen configuratieopties."
 msgid "Current theme"
 msgstr "Huidig thema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Bewerk themainstellingen"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Error: dit is geen geldige thema."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2647,16 +2662,11 @@ msgstr "Herstellen"
 msgid "User permissions"
 msgstr "Gebruikersmachtigingen"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Gebruiker wordt verwijderd"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr "Deze site heeft geen gebruikers. Voeg een gebruiker toe."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Klik op een gebruiker om ze toe te voegen aan de site."
 
@@ -2674,7 +2684,7 @@ msgstr "Nieuw blok toevoegen"
 
 #: application/view/omeka/site-admin/page/edit.phtml:41
 msgid "Caption"
-msgstr ""
+msgstr "Bijschrift"
 
 #: application/view/omeka/site-admin/page/edit.phtml:52
 msgid "Apply changes"
@@ -2686,11 +2696,11 @@ msgstr "Nieuwe pagina toevoegen"
 
 #: application/view/omeka/site-admin/page/index.phtml:19
 msgid "Slug"
-msgstr ""
+msgstr "Slug"
 
 #: application/view/omeka/site-admin/page/index.phtml:39
 msgid "View public page"
-msgstr ""
+msgstr "Bekijk publieke pagina"
 
 #: application/view/omeka/site-admin/page/index.phtml:50
 msgid "Delete page"
@@ -2703,22 +2713,22 @@ msgstr "Deze site heeft geen pagina's."
 #: application/view/omeka/site/index/search.phtml:1
 #, php-format
 msgid "Search results for “%s”"
-msgstr ""
+msgstr "Zoekresultaten voor “%s”"
 
 #: application/view/omeka/site/index/search.phtml:11
 #: application/view/omeka/site/index/search.phtml:32
 #, php-format
 msgid "View all results (%s total)"
-msgstr ""
+msgstr "Bekijk alle resultaten (%s in totaal)"
 
 #: application/view/omeka/site/index/search.phtml:20
 #: application/view/omeka/site/page/browse.phtml:18
 msgid "No pages found"
-msgstr ""
+msgstr "Geen pagina's gevonden"
 
 #: application/view/omeka/site/index/search.phtml:41
 msgid "No items found"
-msgstr ""
+msgstr "Geen objecten gevonden"
 
 #: application/view/omeka/site/item-set/search.phtml:6
 msgid "Advanced item set Search"
@@ -2732,37 +2742,41 @@ msgstr "Geavanceerd zoeken in objecten"
 msgid "Item"
 msgstr "Object"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Er ging iets fout"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Je hebt onopgeslagen aanpassingen."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Collectie herstellen"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Sluit icon set"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Open icon set"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Kon object sjabloon niet laden van de API"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Eigenschap herstellen"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Voer een geldige taaltag in"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
-msgstr ""
+msgstr "Beschrijving"
 
 #: application/config/navigation.config.php:181
 #: application/config/navigation.config.php:250
@@ -2776,34 +2790,34 @@ msgstr "Site informatie"
 
 #: application/src/View/Helper/ResourceClassSelect.php:39
 msgid "Select class…"
-msgstr ""
+msgstr "Selecteer klasse…"
 
 #: application/src/View/Helper/SiteSelect.php:39
 msgid "Select site…"
-msgstr ""
+msgstr "Selecteer site…"
 
 #: application/src/View/Helper/RoleSelect.php:39
 #: application/src/Service/Form/Element/RoleSelectFactory.php:16
 #: application/src/Form/UserBatchUpdateForm.php:27
 #: application/src/Form/UserForm.php:97
 msgid "Select role…"
-msgstr ""
+msgstr "Selecter rol…"
 
 #: application/src/View/Helper/UserSelect.php:39
 msgid "Select user…"
-msgstr ""
+msgstr "Selecteer gebruiker…"
 
 #: application/src/View/Helper/PropertySelect.php:39
 msgid "Select property…"
-msgstr ""
+msgstr "Selecteer eigenschap…"
 
 #: application/src/View/Helper/ItemSetSelect.php:39
 msgid "Select item set…"
-msgstr ""
+msgstr "Selecteer collectie…"
 
 #: application/src/View/Helper/ResourceTemplateSelect.php:39
 msgid "Select template…"
-msgstr ""
+msgstr "Selecteer sjabloon…"
 
 #: application/src/View/Helper/BlockShowTitleSelect.php:24
 msgid "item title"
@@ -2819,29 +2833,29 @@ msgstr "geen titel"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
-"Kon \"%s\" niet valideren. Kan geen bestanden opslaan met de mediatype "
-"\"%s\"."
+"Kon \"%1$s\" niet valideren. Kan geen bestanden opslaan met de mediatype "
+"\"%2$s\"."
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
-"Kon \"%s\" niet valideren. Kan geen bestanden opslaan met de "
-"bestandsextensie \"%s\"."
+"Kon \"%1$s\" niet valideren. Kan geen bestanden opslaan met de "
+"bestandsextensie \"%2$s\"."
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Fout met het downloaden van %s: %s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Fout met het downloaden van %1$s: %2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Fout met het downloaden van %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Fout met het downloaden van %1$s: %2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2878,39 +2892,132 @@ msgstr ""
 
 #: application/src/Form/ResourceTemplateImportForm.php:14
 msgid "Resource template file"
+msgstr "Object sjabloonbestand"
+
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
+msgstr "Naamruimte URI"
+
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Woordenlijstbestand"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "Woordenlijst URL"
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr "Bestandsformaat"
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
 #: application/src/Form/UserForm.php:144
 msgid "Select a template"
-msgstr ""
+msgstr "Kies een sjabloon"
 
 #: application/src/Form/ResourceForm.php:34
 msgid "Resource template"
@@ -2918,18 +3025,20 @@ msgstr "Object sjabloon"
 
 #: application/src/Form/ResourceForm.php:35
 msgid "A pre-defined template for resource creation."
-msgstr ""
+msgstr "Een vooraf gedefinieerd sjabloon voor het maken van objecten."
 
 #: application/src/Form/ResourceForm.php:53
 #: application/src/Form/ResourceBatchUpdateForm.php:92
 msgid "Select a class"
-msgstr ""
+msgstr "Kies een klasse"
 
 #: application/src/Form/ResourceForm.php:57
 msgid ""
 "A type for the resource. Different types have different default properties "
 "attached to them."
 msgstr ""
+"Een type voor het object. Verschillende typen hebben verschillende "
+"standaardeigenschappen."
 
 #: application/src/Form/Initializer/Csrf.php:35
 msgid "Invalid or missing CSRF token"
@@ -2937,69 +3046,71 @@ msgstr ""
 
 #: application/src/Form/SitePageForm.php:39
 msgid "Add to navigation"
-msgstr ""
+msgstr "Voeg toe aan navigatie"
 
 #: application/src/Form/ResourceTemplateForm.php:27
 msgid "Suggested class"
-msgstr ""
+msgstr "Aanbevolen klasse"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
-msgstr ""
+msgstr "Algemeen"
 
 #: application/src/Form/SiteSettingsForm.php:36
 msgid "Attachment link type"
-msgstr ""
+msgstr "Bijlage-link type"
 
 #: application/src/Form/SiteSettingsForm.php:38
 msgid "Item page"
-msgstr ""
+msgstr "Objectpagina"
 
 #: application/src/Form/SiteSettingsForm.php:39
 msgid "Media page"
-msgstr ""
+msgstr "Media-pagina"
 
 #: application/src/Form/SiteSettingsForm.php:40
 msgid "Direct link to file"
-msgstr ""
+msgstr "Directe link naar bestand"
 
 #: application/src/Form/SiteSettingsForm.php:52
 msgid "Embed media on item pages"
-msgstr ""
+msgstr "Media op objectpagina's insluiten"
 
 #: application/src/Form/SiteSettingsForm.php:63
 msgid "Show page pagination"
-msgstr ""
+msgstr "Paginering tonen"
 
 #: application/src/Form/SiteSettingsForm.php:64
 msgid ""
 "Show pagination that helps users follow a linear narrative through a site."
 msgstr ""
+"Toon paginering die gebruikers helpt een lineair verhaal te volgen via een "
+"site."
 
 #: application/src/Form/SiteSettingsForm.php:75
 msgid "Show user bar on public views"
-msgstr ""
+msgstr "Toon gebruikersbalk op publieke pagina's"
 
 #: application/src/Form/SiteSettingsForm.php:77
 msgid "Never"
-msgstr ""
+msgstr "Nooit"
 
 #: application/src/Form/SiteSettingsForm.php:78
 msgid "When logged in"
-msgstr ""
+msgstr "Wanneer ingelogd"
 
 #: application/src/Form/SiteSettingsForm.php:79
 msgid "Always"
-msgstr ""
+msgstr "Altijd"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3009,24 +3120,26 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
-msgstr ""
+msgstr "Land-/taalinstellingen"
 
 #: application/src/Form/SiteSettingsForm.php:104
 msgid ""
 "Locale/language code for this site. Leave blank to use the global locale "
 "setting."
 msgstr ""
+"Land-/taalcode voor deze site. Laat leeg om de globale instelling voor "
+"landinstellingen te gebruiken."
 
 #: application/src/Form/SiteSettingsForm.php:126
 msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
-msgstr ""
+msgstr "Resultaten per pagina"
 
 #: application/src/Form/SiteSettingsForm.php:138
 msgid ""
@@ -3036,7 +3149,7 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:144
 msgid "Use global setting"
-msgstr ""
+msgstr "Globale instellingen gebruiken"
 
 #: application/src/Form/SiteSettingsForm.php:152
 msgid "Browse heading property"
@@ -3051,7 +3164,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:161
 #: application/src/Form/SiteSettingsForm.php:178
 msgid "Select a property"
-msgstr ""
+msgstr "Selecteer een eigenschap"
 
 #: application/src/Form/SiteSettingsForm.php:169
 msgid "Browse body property"
@@ -3065,7 +3178,7 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:195
 msgid "Templates"
-msgstr ""
+msgstr "Sjablonen"
 
 #: application/src/Form/SiteSettingsForm.php:196
 msgid "Select which templates to apply to the advanced search form."
@@ -3073,19 +3186,19 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:201
 msgid "Select templates"
-msgstr ""
+msgstr "Selecteer sjablonen"
 
 #: application/src/Form/SiteSettingsForm.php:209
 msgid "Restrict to templates"
-msgstr ""
+msgstr "Beperk tot sjablonen"
 
 #: application/src/Form/SiteSettingsForm.php:210
 msgid "Restrict search results to resources of the selected templates."
-msgstr ""
+msgstr "Beperk zoekresultaten tot objecten van de geselecteerde sjablonen."
 
 #: application/src/Form/UserBatchUpdateForm.php:30
 msgid "Set role"
-msgstr ""
+msgstr "Rol instellen"
 
 #: application/src/Form/UserBatchUpdateForm.php:31
 #: application/src/Form/UserBatchUpdateForm.php:43
@@ -3101,12 +3214,12 @@ msgstr "[geen veranderingen]"
 
 #: application/src/Form/UserBatchUpdateForm.php:39
 msgid "Set activity"
-msgstr ""
+msgstr "Activiteit instellen"
 
 #: application/src/Form/UserBatchUpdateForm.php:55
 #: application/src/Form/UserBatchUpdateForm.php:72
 msgid "Select sites…"
-msgstr ""
+msgstr "Selecteer sites…"
 
 #: application/src/Form/UserBatchUpdateForm.php:59
 msgid "Remove from site permission"
@@ -3131,37 +3244,37 @@ msgstr ""
 
 #: application/src/Form/ModuleStateChangeForm.php:37
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
 #: application/src/Form/ModuleStateChangeForm.php:55
 msgid "Deactivate"
-msgstr ""
+msgstr "Deactiveren"
 
 #: application/src/Form/ModuleStateChangeForm.php:64
 msgid "Upgrade"
-msgstr ""
+msgstr "Upgraden"
 
 #: application/src/Form/InstallationForm.php:19
 msgid "Create the first user"
-msgstr ""
+msgstr "Eerste gebruiker aanmaken"
 
 #: application/src/Form/InstallationForm.php:52
 msgid "Confirm email"
-msgstr ""
+msgstr "Mailadres bevestigen"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
-msgstr ""
+msgstr "Titel van installatie"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
-msgstr ""
+msgstr "Tijdzone"
 
 #: application/src/Form/InstallationForm.php:128
 msgid "The emails did not match"
-msgstr ""
+msgstr "De mailadressen komen niet overeen"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:33
 msgid "Set visibility"
@@ -3198,15 +3311,15 @@ msgstr "[Klasse weghalen]"
 #: application/src/Form/ResourceBatchUpdateForm.php:110
 #: application/src/Form/ResourceBatchUpdateForm.php:124
 msgid "Select item sets"
-msgstr ""
+msgstr "Selecteer collecties"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:113
 msgid "Add to item sets"
-msgstr ""
+msgstr "Aan collecties toevoegen"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:127
 msgid "Remove from item sets"
-msgstr ""
+msgstr "Verwijder uit collecties"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:137
 msgid "Clear language"
@@ -3215,7 +3328,7 @@ msgstr ""
 #: application/src/Form/ResourceBatchUpdateForm.php:161
 #: application/view/common/property-form-batch-edit.phtml:63
 msgid "Select properties"
-msgstr ""
+msgstr "Selecteer eigenschappen"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:164
 msgid "Clear property values"
@@ -3223,140 +3336,150 @@ msgstr "Herstel eigenschapwaarden"
 
 #: application/src/Form/ConfirmForm.php:17
 msgid "Confirm"
-msgstr ""
+msgstr "Bevestigen"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
-msgstr ""
+msgstr "Globale land-/taalinstellingen voor alle interfaces."
 
 #: application/src/Form/UserForm.php:148
 msgid "Default resource template"
-msgstr ""
+msgstr "Standaard objectsjabloon"
 
 #: application/src/Form/UserForm.php:166
 msgid "Current password"
-msgstr ""
+msgstr "Huidig wachtwoord"
 
 #: application/src/Form/UserForm.php:178
 msgid "New password"
-msgstr ""
+msgstr "Nieuw wachtwoord"
 
 #: application/src/Form/UserForm.php:179
 msgid "Confirm new password"
-msgstr ""
+msgstr "Bevestig nieuw wachtwoord"
 
 #: application/src/Form/UserForm.php:188
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
-msgstr ""
+msgstr "Admin mailadres"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
-msgstr ""
+msgstr "Toon woordenlijst"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
-msgstr ""
+msgstr "Toon term"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
-msgstr ""
+msgstr "Standaard grootte"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
+"Selecteer welke site moet worden getoond wanneer gebruikers naar de "
+"voorpagina van de installatie gaan."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
-msgstr ""
+msgstr "Geen standaard (toon lijst van sites)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
-msgstr ""
+msgstr "Schakel versiemeldingen in"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
+"Schakel meldingen in wanneer een nieuwe versie van Omeka S, modules of "
+"thema's beschikbaar zijn."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
-msgstr ""
+msgstr "Standaard zichtbaarheid op Privé"
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
+"Indien aangevinkt, wordt voor alle items, collecties en sites die nieuw "
+"worden gemaakt, standaard de zichtbaarheid ingesteld op privé."
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
-msgstr ""
+msgstr "Full-text zoeken indexeren"
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
-msgstr ""
+msgstr "Beveiliging"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
-msgstr ""
+msgstr "Gebruik HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
-msgstr ""
+msgstr "Toegestane mediatypen"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
+"Een komma-gescheiden lijst met toegestane mediatypen voor het uploaden van "
+"bestanden."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
-msgstr ""
+msgstr "Toegestane bestandstypen"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
+"Een komma-gescheiden lijst met toegestane bestandsextensies voor het "
+"uploaden van bestanden."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3382,82 +3505,32 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
 msgid "Password must:"
-msgstr ""
+msgstr "Wachtwoord moet:"
 
 #: application/src/Form/Element/PasswordConfirm.php:66
 msgid "Confirm password"
-msgstr ""
+msgstr "Bevestig wachtwoord"
 
 #: application/src/Form/Element/PasswordConfirm.php:85
 msgid "The password is invalid"
-msgstr ""
+msgstr "Dit wachtwoord is ongeldig."
 
 #: application/src/Form/Element/PasswordConfirm.php:100
 msgid "The passwords did not match"
-msgstr ""
+msgstr "De wachtwoorden komen niet overeen"
 
 #: application/src/Form/Element/ColorPicker.php:10
 msgid "three- or six-digit hexadecimal color, or \"transparent\""
-msgstr ""
+msgstr "drie- of zescijferige hexadecimale kleur of \"transparant\""
 
 #: application/src/Form/Element/ColorPicker.php:29
 msgid "Invalid color format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
+msgstr "Ongeldige kleurcode"
 
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
@@ -3469,11 +3542,11 @@ msgstr ""
 
 #: application/src/Controller/MigrateController.php:40
 msgid "Migration successful"
-msgstr ""
+msgstr "Migratie succesvol"
 
 #: application/src/Controller/InstallController.php:52
 msgid "Installation successful. Please log in."
-msgstr ""
+msgstr "Installatie succesvol. Inloggen alsjeblieft."
 
 #: application/src/Controller/InstallController.php:56
 msgid "There were errors during installation."
@@ -3481,11 +3554,11 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:66
 msgid "Site successfully created"
-msgstr ""
+msgstr "Site succesvol aangemaakt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:92
 msgid "Site successfully updated"
-msgstr ""
+msgstr "Site succesvol bijgewerkt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:115
 msgid "User does not have permission to edit site settings"
@@ -3494,11 +3567,11 @@ msgstr ""
 #: application/src/Controller/SiteAdmin/IndexController.php:136
 #: application/src/Controller/Admin/SettingController.php:35
 msgid "Settings successfully updated"
-msgstr ""
+msgstr "Instellingen succesvol bijgewerkt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:172
 msgid "Page successfully created"
-msgstr ""
+msgstr "Pagina succesvol aangemaakt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:201
 msgid "Homepage"
@@ -3506,11 +3579,11 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:207
 msgid "First page in navigation"
-msgstr ""
+msgstr "Eerste pagina in sitenavigatie"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:223
 msgid "Navigation successfully updated"
-msgstr ""
+msgstr "Navigatie succesvol bijgewerkt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:256
 msgid "Site resources successfully updated"
@@ -3518,47 +3591,47 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:297
 msgid "User permissions successfully updated"
-msgstr ""
+msgstr "Gebruikersmachtigingen succesvol bijgewerkt"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:329
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
-msgstr ""
+msgstr "Site succesvol verwijderd"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
-msgstr ""
+msgstr "site"
 
 #: application/src/Controller/SiteAdmin/PageController.php:28
 msgid "Page successfully updated"
-msgstr ""
+msgstr "Pagina succesvol bijgewerkt"
 
 #: application/src/Controller/SiteAdmin/PageController.php:81
 msgid "page"
-msgstr ""
+msgstr "pagina"
 
 #: application/src/Controller/SiteAdmin/PageController.php:98
 msgid "Page successfully deleted"
-msgstr ""
+msgstr "Pagina succesvol verwijderd"
 
 #: application/src/Controller/LoginController.php:56
 msgid "Successfully logged in"
-msgstr ""
+msgstr "Succesvol ingelogd"
 
 #: application/src/Controller/LoginController.php:65
 msgid "Email or password is invalid"
-msgstr ""
+msgstr "Mailadres of wachtwoord onjuist"
 
 #: application/src/Controller/LoginController.php:88
 msgid "Successfully logged out"
-msgstr ""
+msgstr "Succesvol uitgelogd"
 
 #: application/src/Controller/LoginController.php:104
 msgid "Invalid password creation key."
@@ -3570,11 +3643,11 @@ msgstr ""
 
 #: application/src/Controller/LoginController.php:129
 msgid "Successfully created your password. Please log in."
-msgstr ""
+msgstr "Wachtwoord succesvol aangemaakt. Inloggen alsjeblieft."
 
 #: application/src/Controller/LoginController.php:132
 msgid "Password creation unsuccessful"
-msgstr ""
+msgstr "Wachtwoord aanmaken mislukt"
 
 #: application/src/Controller/LoginController.php:168
 msgid "Check your email for instructions on how to reset your password"
@@ -3586,7 +3659,7 @@ msgstr ""
 
 #: application/src/Controller/Admin/ResourceTemplateController.php:338
 msgid "resource template"
-msgstr ""
+msgstr "object sjabloon"
 
 #: application/src/Controller/Admin/ResourceTemplateController.php:351
 msgid "Resource template successfully deleted"
@@ -3608,23 +3681,23 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
 #: application/src/Controller/Admin/ItemController.php:47
 msgid "Confirm Delete"
-msgstr ""
+msgstr "Verwijderen bevestigen"
 
 #: application/src/Controller/Admin/UserController.php:113
 #, php-format
 msgid "User successfully created. %s"
-msgstr ""
+msgstr "Gebruiker succesvol aangemaakt. %s"
 
 #: application/src/Controller/Admin/UserController.php:187
 msgid "User successfully updated"
-msgstr ""
+msgstr "Gebruiker succesvol bijgewerkt"
 
 #: application/src/Controller/Admin/UserController.php:202
 msgid "The current password entered was invalid"
@@ -3644,16 +3717,16 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
-msgstr ""
+msgstr "gebruiker"
 
 #: application/src/Controller/Admin/UserController.php:281
 msgid "User successfully deleted"
-msgstr ""
+msgstr "Gebruiker succesvol verwijderd"
 
 #: application/src/Controller/Admin/UserController.php:303
 msgid "You must select at least one user to batch delete."
@@ -3661,15 +3734,15 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:310
 msgid "You can’t delete yourself."
-msgstr ""
+msgstr "Je kunt jezelf niet verwijderen."
 
 #: application/src/Controller/Admin/UserController.php:319
 msgid "Users successfully deleted"
-msgstr ""
+msgstr "Gebruikers succesvol verwijderd"
 
 #: application/src/Controller/Admin/UserController.php:345
 msgid "Deleting users. This may take a while."
-msgstr ""
+msgstr "Gebruikers worden verwijderd. Dat kan even duren."
 
 #: application/src/Controller/Admin/UserController.php:364
 msgid "You must select at least one user to batch edit."
@@ -3681,117 +3754,117 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:391
 msgid "Users successfully edited"
-msgstr ""
+msgstr "Gebruikers succesvol bijgewerkt"
 
 #: application/src/Controller/Admin/UserController.php:444
 msgid "Editing users. This may take a while."
-msgstr ""
+msgstr "Gebruikers worden bijgewerkt. Dat kan even duren."
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
-msgstr ""
+msgstr "Object succesvol aangemaakt. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
-msgstr ""
+msgstr "Collectie succesvol bijgewerkt"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
-msgstr ""
+msgstr "collectie"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
-msgstr ""
+msgstr "Object succesvol verwijderd"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
-msgstr ""
+msgstr "Collecties succesvol verwijderd"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
-msgstr ""
+msgstr "Collecties worden verwijderd. Dat kan even duren."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
-msgstr ""
+msgstr "Collecties succesvol bijgewerkt"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
-msgstr ""
+msgstr "Collecties worden bijgewerkt. Dat kan even duren."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
-msgstr ""
+msgstr "woordenlijst"
 
 #: application/src/Controller/Admin/VocabularyController.php:97
 #, php-format
 msgid "Vocabulary successfully imported. %s"
-msgstr ""
+msgstr "Woordenlijst succesvol geïmporteerd. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
-msgstr ""
+msgstr "Woordenlijst succesvol bijgewerkt"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
-msgstr ""
+msgstr "Wijzigingen in de woordenlijst zijn succesvol aangebracht"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
-msgstr ""
+msgstr "Woordenlijst succesvol verwijderd"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
-msgstr ""
+msgstr "Media succesvol bijgewerkt"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
-msgstr ""
+msgstr "Media succesvol verwijderd"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
-msgstr ""
+msgstr "Media succesvol verwijderd"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
-msgstr ""
+msgstr "Media worden verwijderd. Dat kan even duren."
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
-msgstr ""
+msgstr "Media succesvol bijgewerkt"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
-msgstr ""
+msgstr "Media worden bijgewerkt. Dat kan even duren."
 
 #: application/src/Controller/Admin/ItemController.php:114
 msgid "item"
-msgstr ""
+msgstr "object"
 
 #: application/src/Controller/Admin/ItemController.php:130
 msgid "Item successfully deleted"
-msgstr ""
+msgstr "Object succesvol verwijderd"
 
 #: application/src/Controller/Admin/ItemController.php:151
 msgid "You must select at least one item to batch delete."
@@ -3799,30 +3872,30 @@ msgstr ""
 
 #: application/src/Controller/Admin/ItemController.php:160
 msgid "Items successfully deleted"
-msgstr ""
+msgstr "Objecten succesvol verwijderd"
 
 #: application/src/Controller/Admin/ItemController.php:186
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3948,14 +4021,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3966,15 +4039,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4029,8 +4102,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4038,46 +4115,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4185,7 +4266,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4204,39 +4285,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6160,10 +6241,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6184,6 +6261,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/pl.mo b/application/language/pl.mo
index 88588dff96..95d1cd0750 100644
Binary files a/application/language/pl.mo and b/application/language/pl.mo differ
diff --git a/application/language/pl.po b/application/language/pl.po
index 4e120878ac..6154298d46 100644
--- a/application/language/pl.po
+++ b/application/language/pl.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Michał Seweryniak <michal.seweryniak@zafado.pl>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Michał Seweryniak <michal.seweryniak@zafado.pl>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Polish (https://www.transifex.com/omeka/teams/14184/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,19 +64,19 @@ msgstr "Adapter %1$s nie obsługuje operacji zbiorowego usuwania."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "Pole \"%s\" nie jest dostępne w klasie jednostek %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "Pole \"%1$s\" nie jest dostępne w klasie jednostek %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Zabroniony dostęp dla aktualnego użytkownika to %s zasobu %s."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Zabroniony dostęp dla aktualnego użytkownika to %1$s zasobu %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "Nie znaleziono jednostki %s dla kryteriów %s"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "Nie znaleziono jednostki %1$s dla kryteriów %2$s"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -85,7 +86,7 @@ msgstr "Witamy"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Witamy na twoim nowym portalu. To jest przykładowa strona."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Przeglądaj"
 
@@ -94,7 +95,7 @@ msgstr "Przeglądaj"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API nie obsługuje zasobu \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr "Domyślny"
 msgid "Asset uploads must be POSTed."
 msgstr "Aktywa muszą być wgrywane przez POST."
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Dodać kolejną pozycję?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Dodać kolejny zestaw pozycji?"
 
@@ -196,8 +197,8 @@ msgstr "OpenSeadragon nie jest dostępny jeżeli JavaScript nie jest włączony.
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Moduł \"%s\" jest oznaczony jako \"%s\" i nie może być włączony"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Moduł \"%1$s\" jest oznaczony jako \"%2$s\" i nie może być włączony"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -206,8 +207,8 @@ msgstr "Moduł \"%s\" nie znajduje się bazie danych podczas włączania"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Moduł \"%s\" jest oznaczony jako \"%s\" i nie może być wyłączony"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Moduł \"%1$s\" jest oznaczony jako \"%2$s\" i nie może być wyłączony"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -216,13 +217,13 @@ msgstr "Moduł \"%s\" nie znajduje się bazie danych podczas wyłączania"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Moduł \"%s\" jest oznaczony jako \"%s\" i nie może być zainstalowany"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Moduł \"%1$s\" jest oznaczony jako \"%2$s\" i nie może być zainstalowany"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Moduł \"%s\" jest oznaczony jako \"%s\" i nie może być odinstalowany"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Moduł \"%1$s\" jest oznaczony jako \"%2$s\" i nie może być odinstalowany"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -231,8 +232,8 @@ msgstr "Moduł \"%s\" nie został znaleziony w bazie danych podczas odinstalowan
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Moduł \"%s\" jest oznaczony jako \"%s\" i nie może być zaktualizowany"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "Moduł \"%1$s\" jest oznaczony jako \"%2$s\" i nie może być zaktualizowany"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -241,8 +242,8 @@ msgstr "Moduł \"%s\" nie został znaleziony w bazie danych podczas aktualizacji
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Zabroniony dostęp dla aktualnego użytkownika to %s modułu %s."
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Zabroniony dostęp dla aktualnego użytkownika to %1$s modułu %2$s."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -369,7 +370,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -462,8 +463,9 @@ msgid "AND"
 msgstr "ORAZ"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -528,7 +530,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rola"
 
@@ -561,8 +563,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "Maksymalny rozmiar wgrywanego pliku wynosi %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -582,7 +584,7 @@ msgstr "Maksymalny rozmiar wgrywanego pliku wynosi %s MB."
 msgid "Edit"
 msgstr "Edytuj"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -609,7 +611,7 @@ msgstr "Wyszukuje pozycje przypisane do któregoś z tych zestawów."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -621,6 +623,10 @@ msgstr "Usuń wartość"
 msgid "Add new item set"
 msgstr "Dodaj nowy zestaw pozycji"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -730,7 +736,7 @@ msgid "Block to be removed"
 msgstr "Blok do usunięcia"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -738,6 +744,7 @@ msgstr "Przywróć wartość"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -748,17 +755,17 @@ msgstr "Przywróć wartość"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Zestawy pozycji"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Wartość do usunięcia"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -906,10 +913,6 @@ msgstr "Kliknij w zestaw pozycji aby dodać go do panelu edycji."
 msgid "Filter item sets"
 msgstr "Filtruj zestawy pozycji"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Wszystkie zestawy pozycji"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -947,7 +950,7 @@ msgstr "Wszystkie"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -999,8 +1002,8 @@ msgstr "Następny"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s z %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s z %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1063,12 +1066,12 @@ msgstr "Kliknij we właściwość aby dodać ją do panelu edycji."
 msgid "Filter properties"
 msgstr "Filtruj właściwości"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Dodaj właściwość"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1161,18 +1164,18 @@ msgstr "Wyloguj"
 msgid "Log in"
 msgstr "Zaloguj się"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr "Kliknij w użytkownika aby dodać go do panelu edycji."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtruj użytkowników"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Wszyscy użytkownicy (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1181,7 +1184,7 @@ msgstr "Dostępna jest nowa wersja Omeka S. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Pobierz nową wersję."
 
@@ -1203,7 +1206,7 @@ msgid "Details:"
 msgstr "Szczegóły:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Zasoby"
 
@@ -1414,7 +1417,7 @@ msgstr "Edytuj zbiorowo zestawy pozycji"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1460,7 +1463,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -1624,10 +1627,11 @@ msgstr "Czy na pewno chcesz usunąć zaznaczone zestawy pozycji?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: ta czynność usunie na stałe %s zestawy pozycji i nie będzie można jej "
-"cofnąć."
+"%1$s: ta czynność usunie na stałe %2$s zestawy pozycji i nie będzie można "
+"jej cofnąć."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1792,9 +1796,11 @@ msgstr "Czy na pewno chcesz usunąć zaznaczone pozycje?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: ta czynność usunie na stałe %s pozycje i nie będzie można jej cofnąć."
+"%1$s: ta czynność usunie na stałe %2$s pozycje i nie będzie można jej "
+"cofnąć."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1963,9 +1969,9 @@ msgstr "Czy na pewno chcesz usunąć zaznaczone media?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: ta czynność usunie na stałe %s media i nie będzie można jej cofnąć."
+"%1$s: ta czynność usunie na stałe %2$s media i nie będzie można jej cofnąć."
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2279,7 +2285,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
@@ -2298,7 +2304,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2310,7 +2317,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2399,7 +2406,7 @@ msgstr "URI przestrzeni nazw:"
 msgid "This vocabulary has no classes."
 msgstr "Ten słownik nie ma żadnych klas."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2426,7 +2433,7 @@ msgstr "Zatwierdź zmiany"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2437,8 +2444,8 @@ msgstr "Portale"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Przejdź do %s aby rozpocząć pracę z %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Przejdź do %1$s aby rozpocząć pracę z %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2518,7 +2525,7 @@ msgid "Theme"
 msgstr "Motyw"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Pula pozycji"
 
@@ -2565,16 +2572,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr "Nie ma żadnych dostępnych stron."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Przywróć zestaw pozycji"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Aktualnie jest %s pozycji w puli tego portalu."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Brak zestawów pozycji przypisanych do tego portalu."
 
@@ -2613,30 +2616,30 @@ msgstr "Aktualny motyw nie ma żadnych opcji konfiguracji."
 msgid "Current theme"
 msgstr "Aktualny motyw"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Edytuj ustawienia motywu"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Błąd: ten motyw jest nieprawidłowy."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "Identyfikator: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2653,18 +2656,13 @@ msgstr "Przywróć"
 msgid "User permissions"
 msgstr "Uprawnienia użytkownika"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Użytkownik do usunięcia"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 "Ten portal nie ma żadnych użytkowników. Dodaj użytkownika za pomocą "
 "interfejsu po prawej."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Kliknij w użytkownika aby dodać go do tego portalu."
 
@@ -2740,35 +2738,39 @@ msgstr "Wyszukiwanie zaawansowane pozycji"
 msgid "Item"
 msgstr "Pozycja"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Coś poszło nie tak"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Masz niezapisane zmiany"
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Przywróć zestaw pozycji"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Zamknij zestaw ikon"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Otwórz zestaw ikon"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Niepowodzenie podczas ładowania szablonu zasobu z API"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Przywróć właściwość"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Wprowadź proszę poprawne oznaczenie języka"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2827,24 +2829,24 @@ msgstr "bez tytułu"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2883,35 +2885,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Plik szablonu zasobu"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
-"Zwięzły identyfikator słownika, używany jako skrótowe zastąpienie URI "
-"przestrzeni nazw."
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "URI przestrzeni nazw"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Plik słownika"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
 msgstr ""
-"Unikalny URI przestrzeni nazw używany przez słownik do identyfikacji "
-"lokalnych klas członkowskich oraz właściwości."
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Wyświetlany tytuł słownika."
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Wyświetlany opis słownika."
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2951,7 +3042,7 @@ msgid "Suggested class"
 msgstr "Sugerowana klasa"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Ogólne"
 
@@ -3001,12 +3092,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3016,7 +3107,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -3031,7 +3122,7 @@ msgid "Restrict browse to attached items"
 msgstr "Ogranicz przeglądanie do załączonych pozycji"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Ilość wyników na stronę"
 
@@ -3157,12 +3248,12 @@ msgid "Confirm email"
 msgstr "Potwierdź adres e-mail"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Tytuł instalacji"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Strefa czasowa"
 
@@ -3233,7 +3324,7 @@ msgid "Confirm"
 msgstr "Potwierdź"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3257,39 +3348,39 @@ msgstr "Potwierdź nowe hasło"
 msgid "New key label"
 msgstr "Nowa etykieta klucza"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Adres e-mail administratora"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "Maksymalna liczba wyników na stronę w widoku przeglądania."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Informacja etykiety właściwości"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr "Dodatkowa informacja towarzysząca etykietom na stronach zasobu."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Domyślny portal"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3297,78 +3388,78 @@ msgstr ""
 "Wybierz, który portal ma zostać wyświetlony, gdy użytkownicy wejdą na główną"
 " stronę tej instalacji. "
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Brak domyślnego (pokaż spis portali)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Użyj HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Wyczyść wprowadzony przez użytkownika HTML."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Wyłącz sprawdzanie pliku"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr "Zaznacz aby wyłączyć media typu plik oraz weryfikację rozszerzenia."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Dozwolone typy mediów"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Rozdzielona przecinkami lista dozwolonych typów mediów dla wgrywanych "
 "plików."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Dozwolone rozszerzenia pliku"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Rozdzielona przecinkami lista dozwolonych rozszerzeń dla wgrywanych plików."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "Klucz reCAPTCHA dla portalu"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "Tajny klucz reCAPTCHA"
 
@@ -3394,7 +3485,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3422,56 +3513,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr "Nieprawidłowy kod koloru"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Plik słownika"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Musisz potwierdzić że jesteś człowiekiem uzupełniając pole CAPTCHA."
@@ -3537,15 +3578,15 @@ msgstr "Pomyślnie zaktualizowano uprawnienia użytkownika"
 msgid "Site theme successfully updated"
 msgstr "Pomyślnie zaktualizowano motyw portalu"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Pomyślnie zaktualizowano ustawienia motywu"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Pomyślnie usunięto portal"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "portal"
 
@@ -3621,8 +3662,8 @@ msgstr "Pomyślnie utworzono szablon zasobu. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3657,12 +3698,8 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
-"Pomyślnie utworzono klucz API.<br><br>Oto twój identyfikator klucza oraz "
-"uwierzytelnienie dostępu do API. UWAGA: uwierzytelnienie będzie utracone "
-"jeżeli opuścisz tę stronę.<br><br>identyfikator "
-"klucza:<code>%s</code><br>uwierzytelnienie klucza:<code>%s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3704,50 +3741,50 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Pomyślnie utworzono zestaw pozycji. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Pomyślnie zaktualizowano zestaw pozycji"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "zestaw pozycji"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Pomyślnie usunięto zestaw pozycji"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Musisz zaznaczyć przynajmniej jeden zestaw pozycji do zbiorowego usunięcia."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Pomyślnie usunięto zestawy pozycji"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Usuwanie zestawów pozycji. Może to chwilę potrwać."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Musisz zaznaczyć przynajmniej jeden zestaw pozycji do zbiorowego edytowania."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Pomyślnie edytowano zestawy pozycji"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Edytowanie zestawów pozycji. Może to chwilę potrwać."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "słownik"
 
@@ -3756,51 +3793,51 @@ msgstr "słownik"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Pomyślnie zaimportowano słownik. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Przeglądnij proszę te zmiany przed ich zatwierdzeniem."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Pomyślnie zaktualizowano słownik"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Pomyślnie wprowadzono zmiany w słowniku"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Pomyślnie usunięto słownik"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Pomyślnie zaktualizowano media"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Pomyślnie usunięto media"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3824,24 +3861,24 @@ msgstr "Pomyślnie usunięto pozycje"
 msgid "Deleting items. This may take a while."
 msgstr "Usuwanie pozycji. Może to chwilę potrwać."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Pomyślnie utworzono pozycję. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Pomyślnie zaktualizowano pozycję"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Musisz zaznaczyć przynajmniej jedną pozycję do zbiorowej edycji."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Pomyślnie edytowano pozycje"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Edytowanie pozycji. Może to chwilę potrwać."
 
@@ -3968,14 +4005,14 @@ msgstr "Wgraj plik"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3986,15 +4023,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4049,55 +4086,63 @@ msgstr "Prezentacja pozycji"
 msgid "Item with metadata"
 msgstr "Pozycja z metadanymi"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Wyrównanie miniatury"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Zobacz podgląd"
@@ -4206,8 +4251,8 @@ msgstr "Media muszą być tablicą"
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "Szablon zasobu \"%s\" wymaga wartości \"%s\""
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "Szablon zasobu \"%1$s\" wymaga wartości \"%2$s\""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4225,39 +4270,39 @@ msgstr "Portal musi mieć pulę danych pozycji."
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "Nieprawidłowa nawigacja: nawigacja musi być tablicą"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Niepoprawna nawigacja: brakujący typ odnośnika"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Niepoprawna nawigacja: brak danych odnośnika"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Niepoprawna nawigacja: nieprawidłowe dane odnośnika"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Niepoprawna nawigacja: odnośniki do stron muszą być unikalne"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "Niepoprawna nawigacja: odnośniki muszą być tablicą"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "Media muszą być przypisane do jakiejś pozycji."
 
@@ -6201,10 +6246,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6225,6 +6266,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/pt_BR.mo b/application/language/pt_BR.mo
index bff730e08a..43c6c14865 100644
Binary files a/application/language/pt_BR.mo and b/application/language/pt_BR.mo differ
diff --git a/application/language/pt_BR.po b/application/language/pt_BR.po
index 9ee9b6aca1..2cf59adabc 100644
--- a/application/language/pt_BR.po
+++ b/application/language/pt_BR.po
@@ -6,15 +6,16 @@
 # Translators:
 # Diego Ecker <eckerdiego@gmail.com>, 2018
 # Deidson Rafael Trindade <drafael@usp.br>, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Deidson Rafael Trindade <drafael@usp.br>, 2019\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/omeka/teams/14184/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,43 +65,43 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
-msgstr ""
+msgstr "Bem-vindo"
 
 #: application/src/Api/Adapter/SiteAdapter.php:141
 msgid "Welcome to your new site. This is an example page."
-msgstr ""
+msgstr " Bem-vindo ao seu novo site. Esta é uma página de exemplo."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
-msgstr ""
+msgstr "Procurar"
 
 #: application/src/Api/Manager.php:201
 #, php-format
 msgid "The API does not support the \"%s\" resource."
-msgstr ""
+msgstr "A API não suporta o \" 1%s \" do recurso."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
 msgid "[Untitled]"
-msgstr ""
+msgstr "[Sem título]"
 
 #: application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php:105
 msgid "Default"
@@ -110,13 +111,13 @@ msgstr "Padrão"
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Adicionar outro item?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
-msgstr "Adicionar outro conjunto de itens?"
+msgstr "Adicionar outra coleção?"
 
 #: application/src/Controller/Admin/ModuleController.php:69
 #: application/src/Controller/Admin/ModuleController.php:76
@@ -155,7 +156,7 @@ msgstr "Módulo inválido"
 
 #: application/src/Controller/Admin/ModuleController.php:82
 msgid "Invalid INI"
-msgstr ""
+msgstr "INI inválido"
 
 #: application/src/Controller/Admin/ModuleController.php:83
 msgid "Invalid Omeka S version"
@@ -171,7 +172,7 @@ msgstr "Adicionar novo usuário?"
 
 #: application/src/Controller/Admin/VocabularyController.php:92
 msgid "Must provide a vocabulary file or a vocabulary URL"
-msgstr ""
+msgstr "Forneça um arquivo com um vocabulário ou um link para um vocabulário."
 
 #: application/src/Controller/Admin/VocabularyController.php:101
 msgid "Import another vocabulary?"
@@ -184,7 +185,7 @@ msgstr ""
 
 #: application/src/Db/Migration/Manager.php:112
 msgid "Migration file did not contain the expected class"
-msgstr ""
+msgstr "O arquivo de migração não continha a classe esperada"
 
 #: application/src/Media/Ingester/Fallback.php:33
 #: application/view/common/navigation-link-form/fallback.phtml:4
@@ -194,10 +195,12 @@ msgstr "Desconhecido"
 #: application/src/Media/Renderer/IIIF.php:14
 msgid "OpenSeadragon is not available unless JavaScript is enabled."
 msgstr ""
+"O OpenSeadragon não está disponível, a menos que o JavaScript esteja "
+"ativado."
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -207,7 +210,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -217,12 +220,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -232,7 +235,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -242,7 +245,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -263,7 +266,7 @@ msgstr "Opções"
 
 #: application/src/Site/BlockLayout/LineBreak.php:43
 msgid "Break type"
-msgstr ""
+msgstr "Tipo de quebra"
 
 #: application/src/Site/BlockLayout/TableOfContents.php:28
 msgid "Depth"
@@ -271,7 +274,7 @@ msgstr ""
 
 #: application/src/Site/BlockLayout/TableOfContents.php:29
 msgid "Number of child page levels to display"
-msgstr ""
+msgstr "Números de níveis de páginas filhas a serem exibidas."
 
 #: application/src/Site/Navigation/Translator.php:60
 msgid "Home"
@@ -313,11 +316,11 @@ msgstr ""
 #: application/src/Stdlib/Mailer.php:233
 #, php-format
 msgid "User activation for %s"
-msgstr ""
+msgstr "Ativação do usuário para %s"
 
 #: application/src/View/Helper/BlockShowTitleSelect.php:33
 msgid "Show attachment title"
-msgstr ""
+msgstr "Exibir título do anexo"
 
 #: application/src/View/Helper/BlockThumbnailTypeSelect.php:42
 msgid "Thumbnail type"
@@ -331,72 +334,72 @@ msgstr "Cancelar"
 #: application/src/View/Helper/PasswordRequirements.php:40
 #, php-format
 msgid "Password must be a minimum of %s characters in length."
-msgstr ""
+msgstr "A senha deve ter no mínimo %s caracteres."
 
 #: application/src/View/Helper/PasswordRequirements.php:46
 #, php-format
 msgid "Password must contain at least %s lowercase characters."
-msgstr ""
+msgstr "A senha deve conter pelo menos %s caracteres minúsculos."
 
 #: application/src/View/Helper/PasswordRequirements.php:52
 #, php-format
 msgid "Password must contain at least %s uppercase characters."
-msgstr ""
+msgstr " A senha deve conter pelo menos %s caracteres maiúsculas."
 
 #: application/src/View/Helper/PasswordRequirements.php:58
 #, php-format
 msgid "Password must contain at least %s numbers."
-msgstr ""
+msgstr "A senha deve conter pelo menos %s números."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
 #: application/view/common/advanced-search/properties.phtml:65
 msgid "is exactly"
-msgstr ""
+msgstr "é exatamente"
 
 #: application/src/View/Helper/SearchFilters.php:33
 #: application/view/common/advanced-search/properties.phtml:66
 msgid "is not exactly"
-msgstr ""
+msgstr "não é exatamente"
 
 #: application/src/View/Helper/SearchFilters.php:34
 #: application/view/common/advanced-search/properties.phtml:67
 msgid "contains"
-msgstr ""
+msgstr "contém"
 
 #: application/src/View/Helper/SearchFilters.php:35
 #: application/view/common/advanced-search/properties.phtml:68
 msgid "does not contain"
-msgstr ""
+msgstr "não contém"
 
 #: application/src/View/Helper/SearchFilters.php:36
 #: application/view/common/advanced-search/properties.phtml:69
 msgid "is resource with ID"
-msgstr ""
+msgstr "é um recurso com ID"
 
 #: application/src/View/Helper/SearchFilters.php:37
 #: application/view/common/advanced-search/properties.phtml:70
 msgid "is not resource with ID"
-msgstr ""
+msgstr "não é um recursos com ID"
 
 #: application/src/View/Helper/SearchFilters.php:38
 #: application/view/common/advanced-search/properties.phtml:71
 msgid "has any value"
-msgstr ""
+msgstr "tem algum valor"
 
 #: application/src/View/Helper/SearchFilters.php:39
 #: application/view/common/advanced-search/properties.phtml:72
 msgid "has no values"
-msgstr ""
+msgstr "não tem valores"
 
 #: application/src/View/Helper/SearchFilters.php:47
 #: application/view/common/advanced-search/fulltext.phtml:6
 msgid "Search full-text"
-msgstr ""
+msgstr "Pesquisar texto na integra"
 
 #: application/src/View/Helper/SearchFilters.php:60
 #: application/view/common/linked-resources.phtml:33
@@ -418,11 +421,11 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/show.phtml:18
 #: application/view/omeka/site/item/browse.phtml:22
 msgid "Class"
-msgstr ""
+msgstr "Classe"
 
 #: application/src/View/Helper/SearchFilters.php:64
 msgid "Unknown class"
-msgstr ""
+msgstr "Classe desconhecida"
 
 #: application/src/View/Helper/SearchFilters.php:102
 msgid "Unknown property"
@@ -443,8 +446,9 @@ msgid "AND"
 msgstr "E"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -473,7 +477,7 @@ msgstr "Configuração do item"
 
 #: application/src/View/Helper/SearchFilters.php:160
 msgid "Unknown item set"
-msgstr ""
+msgstr "Coleções desconhecidas"
 
 #: application/src/View/Helper/SearchFilters.php:168
 #: application/view/omeka/site-admin/index/users.phtml:30
@@ -509,13 +513,13 @@ msgstr "Nome"
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
-msgstr "Regras"
+msgstr "Perfil"
 
 #: application/src/View/Helper/SearchUserFilters.php:62
 msgid "Unknown role"
-msgstr "Regras desconhecidas"
+msgstr "Perfil desconhecido"
 
 #: application/src/View/Helper/SearchUserFilters.php:66
 #: application/view/omeka/admin/user/show.phtml:35
@@ -535,15 +539,15 @@ msgstr "não"
 #: application/src/View/Helper/SearchUserFilters.php:71
 #: application/view/common/advanced-search/users.phtml:53
 msgid "Has permission in site"
-msgstr ""
+msgstr "Tem permissão no site"
 
 #: application/src/View/Helper/UploadLimit.php:26
 #, php-format
 msgid "The maximum upload size is %s MB."
 msgstr "O tamanho máximo do upload é %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -563,7 +567,7 @@ msgstr "O tamanho máximo do upload é %s MB."
 msgid "Edit"
 msgstr "Editar"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -571,7 +575,7 @@ msgstr "Visualizar"
 
 #: application/view/common/advanced-search/item-sets.phtml:15
 msgid "Search by item set"
-msgstr ""
+msgstr "Pesquisar por coleções"
 
 #: application/view/common/advanced-search/item-sets.phtml:16
 #: application/view/common/advanced-search/resource-class.phtml:16
@@ -584,13 +588,15 @@ msgstr "Expandir"
 #: application/view/common/advanced-search/item-sets.phtml:18
 msgid "Searches for items that are assigned to any of these item sets."
 msgstr ""
+"Procura por itens que são atribuídos a qualquer um destes conjuntos de "
+"itens."
 
 #: application/view/common/advanced-search/item-sets.phtml:34
 #: application/view/common/advanced-search/properties.phtml:75
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -600,35 +606,39 @@ msgstr "Remover valor"
 #: application/view/omeka/admin/index/browse.phtml:23
 #: application/view/omeka/admin/item-set/browse.phtml:42
 msgid "Add new item set"
+msgstr "Adicionar nova coleção"
+
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
 msgstr ""
 
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
-msgstr ""
+msgstr "Consulta de texto"
 
 #: application/view/common/advanced-search/properties.phtml:39
 msgid "Search by value"
-msgstr ""
+msgstr "Pesquisar por valor"
 
 #: application/view/common/advanced-search/properties.phtml:57
 msgid "Property"
-msgstr ""
+msgstr " Propriedade"
 
 #: application/view/common/advanced-search/properties.phtml:64
 msgid "Query type"
-msgstr ""
+msgstr "Pesquisar por tipo"
 
 #: application/view/common/advanced-search/properties.phtml:81
 msgid "Add new value"
-msgstr ""
+msgstr "Adicionar novo valor"
 
 #: application/view/common/advanced-search/resource-class.phtml:15
 msgid "Search by class"
-msgstr ""
+msgstr "Pesquisar por classe"
 
 #: application/view/common/advanced-search/resource-class.phtml:18
 msgid "Searches for items that are any of these classes."
-msgstr ""
+msgstr "Procura itens que estão em qualquer uma dessas classes."
 
 #: application/view/common/advanced-search/resource-class.phtml:34
 msgid "Add new class"
@@ -636,27 +646,27 @@ msgstr "Adicionar nova classe"
 
 #: application/view/common/advanced-search/resource-template.phtml:16
 msgid "Search by template"
-msgstr ""
+msgstr "Pesquisar por template"
 
 #: application/view/common/advanced-search/resource-template.phtml:19
 msgid "Searches for items that use any of these templates."
-msgstr ""
+msgstr "Pesquisar por itens que usem qualquer um destes templates"
 
 #: application/view/common/advanced-search/resource-template.phtml:35
 msgid "Add new template"
-msgstr ""
+msgstr "Adicionar novo template"
 
 #: application/view/common/advanced-search/site-pool.phtml:12
 msgid "In site pool"
-msgstr ""
+msgstr "No pool de sites"
 
 #: application/view/common/advanced-search/users.phtml:17
 msgid "Search by email"
-msgstr ""
+msgstr "Pesquisar por email"
 
 #: application/view/common/advanced-search/users.phtml:25
 msgid "Search by name"
-msgstr ""
+msgstr "Pesquisar por nome"
 
 #: application/view/common/advanced-search/users.phtml:33
 msgid "Search by role"
@@ -668,7 +678,7 @@ msgstr ""
 
 #: application/view/common/asset-form.phtml:34
 msgid "[No asset selected]"
-msgstr ""
+msgstr "[Nenhum ativo selecionado]"
 
 #: application/view/common/asset-form.phtml:37
 msgid "Select"
@@ -708,17 +718,18 @@ msgstr "Adicionar anexo"
 
 #: application/view/common/block-layout.phtml:10
 msgid "Block to be removed"
-msgstr ""
+msgstr "Bloco a ser removido"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
-msgstr ""
+msgstr "Restaurar valor"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -729,17 +740,17 @@ msgstr ""
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
-msgstr ""
+msgstr "Coleções"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
-msgstr ""
+msgstr "Valor a ser removido"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -752,15 +763,15 @@ msgstr "Tornar privado"
 
 #: application/view/common/data-type/literal.phtml:4
 msgid "Set language"
-msgstr ""
+msgstr "Definir idioma"
 
 #: application/view/common/data-type/literal.phtml:5
 msgid "Language"
-msgstr ""
+msgstr "Língua"
 
 #: application/view/common/data-type/resource.phtml:14
 msgid "No resource selected"
-msgstr ""
+msgstr "Nenhum recurso selecionado"
 
 #: application/view/common/data-type/resource.phtml:22
 #: application/view/layout/layout-admin.phtml:68
@@ -881,15 +892,11 @@ msgstr "Leia mais"
 
 #: application/view/common/item-set-selector.phtml:7
 msgid "Click on an item set to add it to the edit panel."
-msgstr ""
+msgstr "Clique em uma coleção para adicioná-lo ao painel de edição."
 
 #: application/view/common/item-set-selector.phtml:8
 msgid "Filter item sets"
-msgstr ""
-
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr ""
+msgstr "Filtrar por coleções"
 
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
@@ -928,7 +935,7 @@ msgstr "Todos"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -949,7 +956,7 @@ msgstr "Tipo"
 
 #: application/view/common/navigation-link-form/browse.phtml:9
 msgid "Query"
-msgstr ""
+msgstr "Consulta"
 
 #: application/view/common/navigation-link-form/page.phtml:14
 #: application/view/common/pagination.phtml:8
@@ -980,8 +987,8 @@ msgstr "Próxima"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s de %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -989,12 +996,12 @@ msgstr "0 resultados"
 
 #: application/view/common/property-form-batch-edit.phtml:7
 msgid "Select property"
-msgstr ""
+msgstr "Selecionar propriedade"
 
 #: application/view/common/property-form-batch-edit.phtml:12
 #: application/view/common/property-form-batch-edit.phtml:76
 msgid "Add text value"
-msgstr ""
+msgstr "Adicionar texto"
 
 #: application/view/common/property-form-batch-edit.phtml:17
 #: application/view/common/property-form-batch-edit.phtml:31
@@ -1014,7 +1021,7 @@ msgstr "Público"
 #: application/view/common/property-form-batch-edit.phtml:47
 #: application/view/common/property-form-batch-edit.phtml:67
 msgid "Not public"
-msgstr ""
+msgstr "Privado"
 
 #: application/view/common/property-form-batch-edit.phtml:20
 #: application/view/common/property-form-batch-edit.phtml:34
@@ -1025,57 +1032,59 @@ msgstr "Remover"
 #: application/view/common/property-form-batch-edit.phtml:26
 #: application/view/common/property-form-batch-edit.phtml:77
 msgid "Add resource value"
-msgstr ""
+msgstr "Adicionar o recurso"
 
 #: application/view/common/property-form-batch-edit.phtml:30
 msgid "Resource ID"
-msgstr ""
+msgstr "ID do recurso"
 
 #: application/view/common/property-form-batch-edit.phtml:40
 #: application/view/common/property-form-batch-edit.phtml:78
 msgid "Add URI value"
-msgstr ""
+msgstr "Adicionar valor de URI"
 
 #: application/view/common/property-selector.phtml:10
 msgid "Click on a property to add it to the edit panel."
-msgstr ""
+msgstr "Clique em uma propriedade para adicioná-lo ao painel de edição."
 
 #: application/view/common/property-selector.phtml:12
 msgid "Filter properties"
-msgstr ""
+msgstr "Propriedades do filtro"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
-msgstr ""
+msgstr "Adicionar propriedades"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
 "here."
 msgstr ""
+"Omeka S seleciona automaticamente uma thumbnail anexada para um recurso. "
+"Você pode usar uma imagem de sua escolha, escolhendo um recurso aqui."
 
 #: application/view/common/resource-form-templates.phtml:10
 #: application/view/omeka/admin/item/sidebar-select.phtml:28
 #: application/view/omeka/site-admin/page/attachment-item-options.phtml:35
 #: application/view/omeka/site-admin/page/edit.phtml:44
 msgid "Collapse"
-msgstr ""
+msgstr "Colapso"
 
 #: application/view/common/resource-form-templates.phtml:13
 msgid "Property term for development use"
-msgstr ""
+msgstr "Termo de propriedade para uso em desenvolvimento"
 
 #: application/view/common/resource-form-templates.phtml:18
 msgid "Select the first value type."
-msgstr ""
+msgstr "Selecione o primeiro tipo de valor."
 
 #: application/view/common/resource-form-templates.phtml:21
 #: application/view/common/resource-form-templates.phtml:27
 #: application/view/common/resource-form-templates.phtml:28
 msgid "Add value"
-msgstr ""
+msgstr "Adicionar valor"
 
 #: application/view/common/resource-form-templates.phtml:22
 msgid "Text"
@@ -1083,23 +1092,23 @@ msgstr "Texto"
 
 #: application/view/common/resource-form-templates.phtml:23
 msgid "Omeka resource"
-msgstr ""
+msgstr " Recurso Omeka"
 
 #: application/view/common/resource-select-sidebar.phtml:20
 msgid "Select resource"
-msgstr ""
+msgstr "Selecione o recurso"
 
 #: application/view/common/site-page-pagination.phtml:3
 msgid "Prev"
-msgstr ""
+msgstr "Anterior"
 
 #: application/view/common/sort-link.phtml:4
 msgid "Switch to descending order"
-msgstr ""
+msgstr "Mudar para ordem descendente"
 
 #: application/view/common/sort-link.phtml:6
 msgid "Switch to ascending order"
-msgstr ""
+msgstr "Mudar para ordem ascendente"
 
 #: application/view/common/sort-link.phtml:8
 #, php-format
@@ -1112,15 +1121,15 @@ msgstr "Ordenar por"
 
 #: application/view/common/sort-selector.phtml:13
 msgid "Sort order"
-msgstr ""
+msgstr "Ordem de classificação"
 
 #: application/view/common/sort-selector.phtml:14
 msgid "Ascending"
-msgstr ""
+msgstr "Ascendente"
 
 #: application/view/common/sort-selector.phtml:15
 msgid "Descending"
-msgstr ""
+msgstr " Descendente"
 
 #: application/view/common/sort-selector.phtml:17
 msgid "Sort"
@@ -1130,7 +1139,7 @@ msgstr "Ordenar"
 #: application/view/layout/layout-admin.phtml:48
 #, php-format
 msgid "Signed in as %s"
-msgstr ""
+msgstr "Logado como %s"
 
 #: application/view/common/user-bar.phtml:25
 #: application/view/layout/layout-admin.phtml:52
@@ -1142,18 +1151,18 @@ msgstr "Sair"
 msgid "Log in"
 msgstr "Entrar"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
-msgstr ""
+msgstr "Clique em um usuário para adicioná-lo ao painel de edição."
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Filtrar usuários"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Todos os usuários (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1162,18 +1171,18 @@ msgstr "Uma nova versão do Omeka S está disponível. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Obtenha a nova versão."
 
 #: application/view/error/403.phtml:4
 msgid "Forbidden"
-msgstr ""
+msgstr "Proibido"
 
 #: application/view/error/404.phtml:12
 #, php-format
 msgid "Reason: %s"
-msgstr ""
+msgstr "Razão: %s"
 
 #: application/view/error/index.phtml:4
 msgid "Omeka S encountered an error"
@@ -1184,19 +1193,19 @@ msgid "Details:"
 msgstr "Detalhes:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #: application/view/layout/layout-admin.phtml:24
 #: application/view/omeka/site-admin/index/add.phtml:7
 #: application/view/omeka/site-admin/index/users.phtml:12
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: application/view/layout/layout-admin.phtml:37
 msgid "Skip to main content"
-msgstr ""
+msgstr "Ir para o conteúdo principal"
 
 #: application/view/layout/layout-admin.phtml:42
 msgid "Navigation menu"
@@ -1204,7 +1213,7 @@ msgstr "Menu de navegação"
 
 #: application/view/layout/layout-admin.phtml:43
 msgid "Search site"
-msgstr ""
+msgstr "Site de pesquisa"
 
 #: application/view/layout/layout-admin.phtml:44
 msgid "User menu"
@@ -1212,7 +1221,7 @@ msgstr "Menu do usuário"
 
 #: application/view/layout/layout-admin.phtml:54
 msgid "not logged in"
-msgstr ""
+msgstr "deslogado"
 
 #: application/view/layout/layout-admin.phtml:61
 msgid "Advanced options"
@@ -1220,7 +1229,7 @@ msgstr "Opções avançadas"
 
 #: application/view/layout/layout-admin.phtml:64
 msgid "Resource type"
-msgstr ""
+msgstr "Tipo de recurso"
 
 #: application/view/layout/layout-admin.phtml:66
 msgid "Search items"
@@ -1228,22 +1237,22 @@ msgstr "Buscar itens"
 
 #: application/view/layout/layout-admin.phtml:70
 msgid "Search item sets"
-msgstr ""
+msgstr "Pesquisa por coleção"
 
 #: application/view/layout/layout-admin.phtml:74
 msgid "Search media"
-msgstr ""
+msgstr "Pesquisar mídia"
 
 #: application/view/layout/layout-admin.phtml:87
 #: application/view/omeka/site-admin/index/index.phtml:70
 msgid "View public site"
-msgstr ""
+msgstr "Visualizar site público"
 
 #: application/view/layout/layout-admin.phtml:93
 #: application/view/omeka/admin/module/browse.phtml:11
 #: application/view/omeka/admin/module/configure.phtml:6
 msgid "Modules"
-msgstr ""
+msgstr "Módulos"
 
 #: application/view/layout/layout-admin.phtml:111
 msgid "Omeka S"
@@ -1268,15 +1277,15 @@ msgstr "Manual do usuário"
 
 #: application/view/layout/layout-admin.phtml:114
 msgid "Support forums"
-msgstr ""
+msgstr " Fóruns de suporte"
 
 #: application/view/layout/layout.phtml:30
 msgid "Powered by Omeka S"
-msgstr ""
+msgstr "Distribuído por Omeka S"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:9
 msgid "Upload new asset"
-msgstr ""
+msgstr "Carregar novo recurso"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:12
 msgid "Upload"
@@ -1284,19 +1293,19 @@ msgstr "Enviar"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:17
 msgid "Select asset"
-msgstr ""
+msgstr "Selecione o recurso"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:26
 msgid "No owner"
-msgstr ""
+msgstr "Sem dono"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:33
 msgid "Filter by owner"
-msgstr ""
+msgstr "Filtro por dono"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:49
 msgid "Delete asset"
-msgstr ""
+msgstr "Excluir recurso"
 
 #: application/view/omeka/admin/asset/sidebar-select.phtml:53
 msgid "Cancel delete"
@@ -1333,7 +1342,7 @@ msgstr ""
 #: application/view/omeka/admin/index/browse.phtml:15
 #, php-format
 msgid "Items (%s)"
-msgstr ""
+msgstr "itens (%s)"
 
 #: application/view/omeka/admin/index/browse.phtml:17
 #: application/view/omeka/admin/item/browse.phtml:41
@@ -1348,26 +1357,26 @@ msgstr ""
 #: application/view/omeka/admin/index/browse.phtml:27
 #, php-format
 msgid "Vocabularies (%s)"
-msgstr ""
+msgstr "Vocabulários (%s)"
 
 #: application/view/omeka/admin/index/browse.phtml:29
 #: application/view/omeka/admin/vocabulary/browse.phtml:29
 msgid "Import new vocabulary"
-msgstr ""
+msgstr "Importar novo vocabulário"
 
 #: application/view/omeka/admin/index/browse.phtml:33
 #, php-format
 msgid "Resource templates (%s)"
-msgstr ""
+msgstr "Modelos de recursos (%s)"
 
 #: application/view/omeka/admin/index/browse.phtml:35
 #: application/view/omeka/admin/resource-template/browse.phtml:30
 msgid "Add new resource template"
-msgstr ""
+msgstr "Adicionar novo modelo de recurso"
 
 #: application/view/omeka/admin/index/browse.phtml:42
 msgid "Manage sites"
-msgstr ""
+msgstr "Gerenciar sites"
 
 #: application/view/omeka/admin/index/browse.phtml:53
 msgid "Add site"
@@ -1395,7 +1404,7 @@ msgstr ""
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1423,7 +1432,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:13
 #: application/view/omeka/site/item/browse.phtml:18
 msgid "Identifier"
-msgstr ""
+msgstr "Identificador"
 
 #: application/view/omeka/admin/item-set/browse.phtml:19
 #: application/view/omeka/admin/item-set/browse.phtml:76
@@ -1441,9 +1450,9 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
-msgstr ""
+msgstr "Dono"
 
 #: application/view/omeka/admin/item-set/browse.phtml:23
 #: application/view/omeka/admin/item-set/browse.phtml:77
@@ -1458,7 +1467,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:81
 #: application/view/omeka/site/item/browse.phtml:26
 msgid "Created"
-msgstr ""
+msgstr "Criado"
 
 #: application/view/omeka/admin/item-set/browse.phtml:35
 #: application/view/omeka/admin/item-set/search.phtml:5
@@ -1482,35 +1491,35 @@ msgstr "Busca avançada"
 #: application/view/omeka/admin/user/browse.phtml:45
 #: application/view/omeka/admin/user/browse.phtml:46
 msgid "Batch actions"
-msgstr ""
+msgstr "Ações em lote"
 
 #: application/view/omeka/admin/item-set/browse.phtml:53
 #: application/view/omeka/admin/item/browse.phtml:52
 #: application/view/omeka/admin/media/browse.phtml:49
 #: application/view/omeka/admin/user/browse.phtml:48
 msgid "Edit selected"
-msgstr ""
+msgstr "Editar selecionado"
 
 #: application/view/omeka/admin/item-set/browse.phtml:54
 #: application/view/omeka/admin/item/browse.phtml:53
 #: application/view/omeka/admin/media/browse.phtml:50
 #: application/view/omeka/admin/user/browse.phtml:49
 msgid "Edit all"
-msgstr ""
+msgstr "Edite tudo"
 
 #: application/view/omeka/admin/item-set/browse.phtml:55
 #: application/view/omeka/admin/item/browse.phtml:54
 #: application/view/omeka/admin/media/browse.phtml:53
 #: application/view/omeka/admin/user/browse.phtml:52
 msgid "Delete selected"
-msgstr ""
+msgstr "Excluir selecionado"
 
 #: application/view/omeka/admin/item-set/browse.phtml:56
 #: application/view/omeka/admin/item/browse.phtml:55
 #: application/view/omeka/admin/media/browse.phtml:54
 #: application/view/omeka/admin/user/browse.phtml:53
 msgid "Delete all"
-msgstr ""
+msgstr "Deletar todos"
 
 #: application/view/omeka/admin/item-set/browse.phtml:59
 #: application/view/omeka/admin/item-set/browse.phtml:60
@@ -1605,7 +1614,8 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1617,44 +1627,46 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:152
 #: application/view/omeka/admin/user/browse.phtml:170
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #: application/view/omeka/admin/item-set/browse.phtml:176
 msgid ""
 "Are you sure you would like to delete all item sets on all pages of this "
 "result?"
 msgstr ""
+"Tem certeza de que deseja excluir todos os conjuntos de itens em todas as "
+"páginas deste resultado?"
 
 #: application/view/omeka/admin/item-set/browse.phtml:182
 #: application/view/omeka/admin/item/browse.phtml:180
 #: application/view/omeka/admin/media/browse.phtml:192
 #: application/view/omeka/admin/user/browse.phtml:173
 msgid "Are you sure?"
-msgstr ""
+msgstr "Você tem certeza?"
 
 #: application/view/omeka/admin/item-set/browse.phtml:216
 msgid "Omeka could not find any item sets."
-msgstr ""
+msgstr "Omeka não encontrou nenhuma coleção."
 
 #: application/view/omeka/admin/item-set/form.phtml:12
 #: application/view/omeka/admin/item/form.phtml:13
 #: application/view/omeka/admin/media/edit.phtml:12
 msgid "Values"
-msgstr ""
+msgstr "Valores"
 
 #: application/view/omeka/admin/item-set/form.phtml:13
 #: application/view/omeka/admin/item/form.phtml:16
 #: application/view/omeka/admin/media/edit.phtml:13
 msgid "Thumbnail"
-msgstr ""
+msgstr "Miniatura"
 
 #: application/view/omeka/admin/item-set/form.phtml:27
 msgid "Close item set"
-msgstr ""
+msgstr " Fechar coleção"
 
 #: application/view/omeka/admin/item-set/form.phtml:33
 msgid "Open item set"
-msgstr ""
+msgstr "Abrir coleção"
 
 #: application/view/omeka/admin/item-set/form.phtml:47
 #: application/view/omeka/admin/item/form.phtml:49
@@ -1663,7 +1675,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/add.phtml:21
 #: application/view/omeka/site-admin/index/edit.phtml:21
 msgid "Make public"
-msgstr ""
+msgstr "Tornar público"
 
 #: application/view/omeka/admin/item-set/search.phtml:12
 #: application/view/omeka/admin/item/search.phtml:12
@@ -1678,17 +1690,17 @@ msgstr ""
 #: application/view/omeka/admin/media/show-details.phtml:37
 #: application/view/omeka/admin/media/show.phtml:32
 msgid "Visibility"
-msgstr ""
+msgstr "Visibilidade"
 
 #: application/view/omeka/admin/item-set/show-details.phtml:15
 #: application/view/omeka/admin/item-set/show.phtml:76
 msgid "Open to additions"
-msgstr ""
+msgstr "Aberto a adições"
 
 #: application/view/omeka/admin/item-set/show-details.phtml:15
 #: application/view/omeka/admin/item-set/show.phtml:76
 msgid "Closed to additions"
-msgstr ""
+msgstr "Fechado a adições"
 
 #: application/view/omeka/admin/item-set/show.phtml:21
 #: application/view/omeka/admin/item/show.phtml:12
@@ -1700,11 +1712,11 @@ msgstr "Metadados"
 #: application/view/omeka/admin/item/show.phtml:13
 #: application/view/omeka/site/item/show.phtml:45
 msgid "Linked resources"
-msgstr ""
+msgstr "Recursos vinculados"
 
 #: application/view/omeka/admin/item-set/show.phtml:30
 msgid "Edit item set"
-msgstr ""
+msgstr "Editar coleção"
 
 #: application/view/omeka/admin/item-set/show.phtml:32
 msgid "View items"
@@ -1712,11 +1724,11 @@ msgstr "Ver itens"
 
 #: application/view/omeka/admin/item-set/show.phtml:54
 msgid "The following resources link to this item set:"
-msgstr ""
+msgstr "Os seguintes recursos estão vinculados a essas coleções:"
 
 #: application/view/omeka/admin/item-set/show.phtml:58
 msgid "No resources link to this item set."
-msgstr ""
+msgstr "Nenhum link de recursos para essa coleção."
 
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:39
 msgid "item sets"
@@ -1769,13 +1781,16 @@ msgstr "Você tem certeza que deseja excluir o item selecionado?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
 "Are you sure you would like to delete all items on all pages of this result?"
 msgstr ""
+"Tem certeza de que deseja excluir todos os itens em todas as páginas deste "
+"resultado?"
 
 #: application/view/omeka/admin/item/browse.phtml:214
 msgid "Omeka could not find any items."
@@ -1810,7 +1825,7 @@ msgstr ""
 #: application/view/omeka/admin/item/manage-media.phtml:68
 #: application/view/omeka/admin/item/manage-media.phtml:72
 msgid "Add media"
-msgstr ""
+msgstr "Adicionar mídia"
 
 #: application/view/omeka/admin/item/show.phtml:21
 msgid "Edit item"
@@ -1818,7 +1833,7 @@ msgstr "Editar item"
 
 #: application/view/omeka/admin/item/show.phtml:44
 msgid "The following resources link to this item:"
-msgstr ""
+msgstr "Os seguintes recursos apontam para este item:"
 
 #: application/view/omeka/admin/item/show.phtml:48
 msgid "No resources link to this item."
@@ -1826,15 +1841,15 @@ msgstr ""
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:28
 msgid "Filter search"
-msgstr ""
+msgstr "Filtrar pesquisa"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:57
 msgid "Filter by item ID"
-msgstr ""
+msgstr "Filtrar por ID do item"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:67
 msgid "Quick add"
-msgstr ""
+msgstr " Adição rápida"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:98
 msgid "items"
@@ -1855,19 +1870,19 @@ msgstr "Status"
 #: application/view/omeka/admin/job/browse.phtml:25
 #: application/view/omeka/admin/job/show.phtml:21
 msgid "Jobs"
-msgstr ""
+msgstr "Trabalhos"
 
 #: application/view/omeka/admin/job/browse.phtml:78
 msgid "Omeka could not find any jobs."
-msgstr ""
+msgstr "Omeka não conseguiu encontrar nenhum trabalho."
 
 #: application/view/omeka/admin/job/show.phtml:8
 msgid "[not started]"
-msgstr ""
+msgstr "[não foi iniciado]"
 
 #: application/view/omeka/admin/job/show.phtml:13
 msgid "[not ended]"
-msgstr ""
+msgstr "[não finalizou]"
 
 #: application/view/omeka/admin/job/show.phtml:33
 msgid "Started"
@@ -1899,41 +1914,41 @@ msgstr "[sem log]"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:9
 msgid "Batch edit medias"
-msgstr ""
+msgstr "Editar mídia em lote"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:29
 msgid "Affected medias"
-msgstr ""
+msgstr " Mídias afetadas"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:31
 #, php-format
 msgid "You are editing the following %s medias:"
-msgstr ""
+msgstr "Você está editando a seguinte %s mídia:"
 
 #: application/view/omeka/admin/media/batch-edit.phtml:38
 #, php-format
 msgid "You are editing %s medias."
-msgstr ""
+msgstr "Você está editando %s mídias."
 
 #: application/view/omeka/admin/media/browse.phtml:107
 #: application/view/omeka/admin/media/sidebar-select.phtml:8
 msgid "Select media"
-msgstr ""
+msgstr "Selecionar mídia"
 
 #: application/view/omeka/admin/media/browse.phtml:167
 #: application/view/omeka/admin/media/browse.phtml:185
 msgid "Delete medias"
-msgstr ""
+msgstr "Deletar mídia"
 
 #: application/view/omeka/admin/media/browse.phtml:168
 msgid "Are you sure you would like to delete the selected medias?"
-msgstr ""
+msgstr "Tem certeza de que deseja excluir as mídias selecionadas?"
 
 #: application/view/omeka/admin/media/browse.phtml:170
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -1941,19 +1956,21 @@ msgid ""
 "Are you sure you would like to delete all medias on all pages of this "
 "result?"
 msgstr ""
+"Tem certeza de que deseja excluir todas as mídias em todas as páginas deste "
+"resultado?"
 
 #: application/view/omeka/admin/media/browse.phtml:227
 msgid "Omeka could not find any medias."
-msgstr ""
+msgstr "Omeka não conseguiu encontrar nenhuma mídia."
 
 #: application/view/omeka/admin/media/show-details.phtml:18
 msgid "Part of Item"
-msgstr ""
+msgstr "Parte do item"
 
 #: application/view/omeka/admin/media/show-details.phtml:24
 #: application/view/omeka/admin/media/show.phtml:46
 msgid "MIME type"
-msgstr ""
+msgstr "Tipo MIME"
 
 #: application/view/omeka/admin/media/show-details.phtml:31
 #: application/view/omeka/admin/media/show.phtml:52
@@ -1964,15 +1981,15 @@ msgstr "Tamanho"
 #: application/view/omeka/admin/media/show.phtml:53
 #, php-format
 msgid "%s bytes"
-msgstr ""
+msgstr "%s bytes"
 
 #: application/view/omeka/admin/media/show.phtml:14
 msgid "Edit media"
-msgstr ""
+msgstr "Editar mídia"
 
 #: application/view/omeka/admin/media/show.phtml:36
 msgid "Part of item"
-msgstr ""
+msgstr "Parte do item"
 
 #: application/view/omeka/admin/media/show.phtml:57
 msgid "Ingester"
@@ -1980,15 +1997,15 @@ msgstr ""
 
 #: application/view/omeka/admin/media/show.phtml:62
 msgid "Source"
-msgstr ""
+msgstr "Fonte"
 
 #: application/view/omeka/admin/media/show.phtml:68
 msgid "File Derivatives"
-msgstr ""
+msgstr "Derivados de Arquivo"
 
 #: application/view/omeka/admin/media/show.phtml:70
 msgid "original"
-msgstr ""
+msgstr "original"
 
 #: application/view/omeka/admin/media/show.phtml:73
 msgid "large"
@@ -2008,11 +2025,11 @@ msgstr ""
 
 #: application/view/omeka/admin/module/browse.phtml:15
 msgid "All modules"
-msgstr ""
+msgstr "Todos os módulos"
 
 #: application/view/omeka/admin/module/browse.phtml:36
 msgid "name not found"
-msgstr ""
+msgstr "nome não encontrado"
 
 #: application/view/omeka/admin/module/browse.phtml:44
 #: application/view/omeka/admin/module/browse.phtml:46
@@ -2023,7 +2040,7 @@ msgstr "por %s"
 #: application/view/omeka/admin/module/browse.phtml:58
 #, php-format
 msgid "A new version of this module is available. %s"
-msgstr ""
+msgstr "Uma nova versão deste módulo está disponível. %s"
 
 #: application/view/omeka/admin/module/browse.phtml:75
 #: application/view/omeka/admin/module/browse.phtml:83
@@ -2038,11 +2055,11 @@ msgstr "Desinstalar"
 
 #: application/view/omeka/admin/module/browse.phtml:144
 msgid "Error: invalid Module.php file"
-msgstr ""
+msgstr "Erro: arquivo Module.php inválido"
 
 #: application/view/omeka/admin/module/browse.phtml:146
 msgid "Error: invalid config/module.ini file"
-msgstr ""
+msgstr "Erro: arquivo config/module.ini inválido"
 
 #: application/view/omeka/admin/module/browse.phtml:148
 #, php-format
@@ -2051,28 +2068,28 @@ msgstr ""
 
 #: application/view/omeka/admin/module/browse.phtml:150
 msgid "Error: module in database but not in filesystem"
-msgstr ""
+msgstr "Erro: módulo no banco de dados, mas não no sistema de arquivos"
 
 #: application/view/omeka/admin/module/browse.phtml:167
 msgid "Omeka could not find any modules."
-msgstr ""
+msgstr "Omeka não encontrou nenhum módulo."
 
 #: application/view/omeka/admin/module/configure.phtml:10
 msgid "Submit"
-msgstr ""
+msgstr " Enviar"
 
 #: application/view/omeka/admin/module/uninstall-confirm.phtml:5
 msgid "Uninstall module"
-msgstr ""
+msgstr "Remover módulo"
 
 #: application/view/omeka/admin/module/uninstall-confirm.phtml:6
 msgid "Are you sure you would like to uninstall this module?"
-msgstr ""
+msgstr "Tem certeza de que deseja remover este módulo?"
 
 #: application/view/omeka/admin/property/show-details.phtml:6
 #: application/view/omeka/admin/resource-class/show-details.phtml:6
 msgid "Vocabulary"
-msgstr ""
+msgstr "Vocabulário"
 
 #: application/view/omeka/admin/property/show-details.phtml:10
 #: application/view/omeka/admin/resource-class/show-details.phtml:10
@@ -2080,7 +2097,7 @@ msgstr ""
 #: application/view/omeka/admin/vocabulary/classes.phtml:38
 #: application/view/omeka/admin/vocabulary/properties.phtml:21
 msgid "Term"
-msgstr ""
+msgstr "Termo"
 
 #: application/view/omeka/admin/property/show-details.phtml:14
 #: application/view/omeka/admin/resource-class/show-details.phtml:14
@@ -2090,7 +2107,7 @@ msgstr "Comentário"
 
 #: application/view/omeka/admin/resource-template/add.phtml:6
 msgid "New resource template"
-msgstr ""
+msgstr "Novo modelo de recurso"
 
 #: application/view/omeka/admin/resource-template/add.phtml:6
 #: application/view/omeka/admin/resource-template/browse.phtml:25
@@ -2099,7 +2116,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/review-import.phtml:5
 #: application/view/omeka/admin/resource-template/show.phtml:7
 msgid "Resource templates"
-msgstr ""
+msgstr "Modelos de recursos"
 
 #: application/view/omeka/admin/resource-template/browse.phtml:28
 #: application/view/omeka/admin/resource-template/import.phtml:5
@@ -2109,7 +2126,7 @@ msgstr "Importar"
 
 #: application/view/omeka/admin/resource-template/browse.phtml:106
 msgid "Omeka could not find any resource templates."
-msgstr ""
+msgstr " Omeka não conseguiu encontrar nenhum modelo de recurso."
 
 #: application/view/omeka/admin/resource-template/form.phtml:56
 #: application/view/omeka/admin/resource-template/form.phtml:63
@@ -2119,19 +2136,19 @@ msgstr "Original"
 #: application/view/omeka/admin/resource-template/form.phtml:58
 #: application/view/omeka/admin/resource-template/form.phtml:65
 msgid "Alternate"
-msgstr ""
+msgstr "Alternar"
 
 #: application/view/omeka/admin/resource-template/form.phtml:69
 msgid "Other options"
-msgstr ""
+msgstr "Outras opções"
 
 #: application/view/omeka/admin/resource-template/form.phtml:72
 msgid "Use for resource title"
-msgstr ""
+msgstr "Use para título do recurso"
 
 #: application/view/omeka/admin/resource-template/form.phtml:78
 msgid "Use for resource description"
-msgstr ""
+msgstr "Use para descrição do recurso"
 
 #: application/view/omeka/admin/resource-template/form.phtml:84
 msgid "Required"
@@ -2141,33 +2158,33 @@ msgstr "Requerido"
 #: application/view/omeka/admin/resource-template/review-import.phtml:37
 #: application/view/omeka/admin/resource-template/show.phtml:27
 msgid "Data type"
-msgstr ""
+msgstr "Tipo de dados"
 
 #: application/view/omeka/admin/resource-template/form.phtml:101
 msgid "Set changes"
-msgstr ""
+msgstr "Definir alterações"
 
 #: application/view/omeka/admin/resource-template/import.phtml:9
 msgid "Review import"
-msgstr ""
+msgstr "Revisar importação"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:5
 msgid "Review"
-msgstr ""
+msgstr "Reveja"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:9
 msgid "Complete import"
-msgstr ""
+msgstr "Importação completa"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:36
 #: application/view/omeka/admin/resource-template/show.phtml:26
 msgid "Original label"
-msgstr ""
+msgstr "Etiqueta original"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:39
 #: application/view/omeka/admin/resource-template/show.phtml:29
 msgid "Alternate comment"
-msgstr ""
+msgstr "Comentário alternativo"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:40
 #: application/view/omeka/admin/resource-template/show.phtml:30
@@ -2177,7 +2194,7 @@ msgstr "Requerido?"
 #: application/view/omeka/admin/resource-template/review-import.phtml:41
 #: application/view/omeka/admin/resource-template/show.phtml:31
 msgid "Private?"
-msgstr ""
+msgstr "Privado?"
 
 #: application/view/omeka/admin/resource-template/review-import.phtml:75
 #: application/view/omeka/admin/resource-template/review-import.phtml:76
@@ -2197,7 +2214,7 @@ msgstr "Não"
 
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:32
 msgid "Edit property"
-msgstr ""
+msgstr "Editar propriedade"
 
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:36
 msgid "Remove property"
@@ -2246,7 +2263,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
@@ -2265,7 +2282,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2273,11 +2291,13 @@ msgid ""
 "Are you sure you would like to delete all users (except yourself) on all "
 "pages of this result?"
 msgstr ""
+"Tem certeza de que deseja excluir todos os usuários (exceto você) em todas "
+"as páginas deste resultado?"
 
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2345,11 +2365,11 @@ msgstr "Propriedades"
 #: application/view/omeka/admin/vocabulary/properties.phtml:7
 #: application/view/omeka/admin/vocabulary/update.phtml:20
 msgid "Vocabularies"
-msgstr ""
+msgstr "Vocabulários"
 
 #: application/view/omeka/admin/vocabulary/browse.phtml:100
 msgid "Omeka could not find any vocabularies."
-msgstr ""
+msgstr "Omeka não conseguiu encontrar nenhum vocabulário."
 
 #: application/view/omeka/admin/vocabulary/classes.phtml:24
 #: application/view/omeka/admin/vocabulary/properties.phtml:10
@@ -2366,7 +2386,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2393,7 +2413,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2404,7 +2424,7 @@ msgstr ""
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2465,7 +2485,7 @@ msgstr ""
 
 #: application/view/omeka/site-admin/index/add-page.phtml:6
 msgid "New page"
-msgstr ""
+msgstr "Nova página"
 
 #: application/view/omeka/site-admin/index/add-page.phtml:6
 #: application/view/omeka/site-admin/page/edit.phtml:11
@@ -2473,17 +2493,17 @@ msgstr ""
 #: application/view/omeka/site/index/search.phtml:3
 #: application/view/omeka/site/page/browse.phtml:5
 msgid "Pages"
-msgstr ""
+msgstr "Páginas"
 
 #: application/view/omeka/site-admin/index/add.phtml:8
 #: application/view/omeka/site-admin/index/show.phtml:32
 #: application/view/omeka/site-admin/index/theme-settings.phtml:6
 #: application/view/omeka/site-admin/index/theme.phtml:11
 msgid "Theme"
-msgstr ""
+msgstr "Tema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2507,41 +2527,37 @@ msgstr ""
 
 #: application/view/omeka/site-admin/index/navigation.phtml:10
 msgid "Navigation"
-msgstr ""
+msgstr "Navegação"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:24
 #: application/view/omeka/site-admin/index/navigation.phtml:44
 msgid "Add a link to a site page"
-msgstr ""
+msgstr "Adicionar um link a uma página do site"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:28
 msgid "Select a homepage"
-msgstr ""
+msgstr "Selecione uma página inicial"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:32
 msgid "Add a custom link"
-msgstr ""
+msgstr "Adicionar um link personalizado"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:46
 msgid "Filter pages"
-msgstr ""
+msgstr "Filtrar páginas"
 
 #: application/view/omeka/site-admin/index/navigation.phtml:60
 msgid "There are no available pages."
-msgstr ""
+msgstr "Não há páginas disponíveis."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
-msgstr ""
+msgstr "Nenhuma coleção é atribuída a este site."
 
 #: application/view/omeka/site-admin/index/show.phtml:6
 #: application/view/omeka/site-admin/index/users.phtml:10
@@ -2555,53 +2571,53 @@ msgstr ""
 
 #: application/view/omeka/site-admin/index/show.phtml:20
 msgid "Back to site list"
-msgstr ""
+msgstr "Voltar à lista de sites"
 
 #: application/view/omeka/site-admin/index/show.phtml:40
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #: application/view/omeka/site-admin/index/theme-selector.phtml:26
 msgid "Invalid theme.ini file"
-msgstr ""
+msgstr "Arquivo theme.ini inválido"
 
 #: application/view/omeka/site-admin/index/theme-selector.phtml:28
 #, php-format
 msgid "This theme requires Omeka S %s"
-msgstr ""
+msgstr "Este tema requer Omeka S %s"
 
 #: application/view/omeka/site-admin/index/theme-settings.phtml:17
 msgid "The current theme has no configuration options."
-msgstr ""
+msgstr "O tema atual não possui opções de configuração."
 
 #: application/view/omeka/site-admin/index/theme.phtml:27
 msgid "Current theme"
-msgstr ""
+msgstr "Tema atual"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
-msgstr ""
+msgstr " Editar configurações do tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
-msgstr ""
+msgstr "Uma nova versão deste tema está disponível. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
-msgstr ""
+msgstr "Erro: este tema é inválido."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2613,20 +2629,15 @@ msgstr ""
 
 #: application/view/omeka/site-admin/index/users.phtml:16
 msgid "User permissions"
-msgstr ""
+msgstr "Permissões de usuário"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
-msgstr ""
+msgstr "Clique em um usuário para adicioná-lo ao site."
 
 #: application/view/omeka/site-admin/page/attachment-item-options.phtml:17
 msgid "Change item"
@@ -2634,7 +2645,7 @@ msgstr ""
 
 #: application/view/omeka/site-admin/page/attachment-item-options.phtml:59
 msgid "No item selected."
-msgstr ""
+msgstr "Nenhum item selecionado."
 
 #: application/view/omeka/site-admin/page/edit.phtml:28
 msgid "Add new block"
@@ -2650,7 +2661,7 @@ msgstr ""
 
 #: application/view/omeka/site-admin/page/index.phtml:11
 msgid "Add new page"
-msgstr ""
+msgstr "Adicionar nova página"
 
 #: application/view/omeka/site-admin/page/index.phtml:19
 msgid "Slug"
@@ -2666,23 +2677,23 @@ msgstr ""
 
 #: application/view/omeka/site/index/index.phtml:4
 msgid "This site has no pages."
-msgstr ""
+msgstr "Este site não possui páginas."
 
 #: application/view/omeka/site/index/search.phtml:1
 #, php-format
 msgid "Search results for “%s”"
-msgstr ""
+msgstr "Resultados encontrados para \"%s\""
 
 #: application/view/omeka/site/index/search.phtml:11
 #: application/view/omeka/site/index/search.phtml:32
 #, php-format
 msgid "View all results (%s total)"
-msgstr ""
+msgstr "Ver todos os resultados ( %s total)"
 
 #: application/view/omeka/site/index/search.phtml:20
 #: application/view/omeka/site/page/browse.phtml:18
 msgid "No pages found"
-msgstr ""
+msgstr "Nenhuma página encontrada"
 
 #: application/view/omeka/site/index/search.phtml:41
 msgid "No items found"
@@ -2690,45 +2701,49 @@ msgstr ""
 
 #: application/view/omeka/site/item-set/search.phtml:6
 msgid "Advanced item set Search"
-msgstr ""
+msgstr "Busca avançada por coleções"
 
 #: application/view/omeka/site/item/search.phtml:6
 msgid "Advanced item search"
-msgstr ""
+msgstr "Pesquisa avançada de itens"
 
 #: application/view/omeka/site/item/show.phtml:10
 msgid "Item"
 msgstr ""
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2736,7 +2751,7 @@ msgstr ""
 #: application/config/navigation.config.php:250
 #: application/src/Form/InstallationForm.php:26
 msgid "Settings"
-msgstr ""
+msgstr "Configurações"
 
 #: application/config/navigation.config.php:192
 msgid "Site info"
@@ -2744,34 +2759,34 @@ msgstr ""
 
 #: application/src/View/Helper/ResourceClassSelect.php:39
 msgid "Select class…"
-msgstr ""
+msgstr "Selecionar classe ..."
 
 #: application/src/View/Helper/SiteSelect.php:39
 msgid "Select site…"
-msgstr ""
+msgstr "Selecionar site ..."
 
 #: application/src/View/Helper/RoleSelect.php:39
 #: application/src/Service/Form/Element/RoleSelectFactory.php:16
 #: application/src/Form/UserBatchUpdateForm.php:27
 #: application/src/Form/UserForm.php:97
 msgid "Select role…"
-msgstr ""
+msgstr "Selecionar perfil ..."
 
 #: application/src/View/Helper/UserSelect.php:39
 msgid "Select user…"
-msgstr ""
+msgstr "Selecionar usuário ..."
 
 #: application/src/View/Helper/PropertySelect.php:39
 msgid "Select property…"
-msgstr ""
+msgstr "Selecionar propriedade…"
 
 #: application/src/View/Helper/ItemSetSelect.php:39
 msgid "Select item set…"
-msgstr ""
+msgstr "Selecionar coleção ..."
 
 #: application/src/View/Helper/ResourceTemplateSelect.php:39
 msgid "Select template…"
-msgstr ""
+msgstr "Selecionar modelo ..."
 
 #: application/src/View/Helper/BlockShowTitleSelect.php:24
 msgid "item title"
@@ -2787,24 +2802,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2843,37 +2858,130 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
 #: application/src/Form/UserForm.php:144
 msgid "Select a template"
-msgstr ""
+msgstr "Selecione um modelo"
 
 #: application/src/Form/ResourceForm.php:34
 msgid "Resource template"
@@ -2886,7 +2994,7 @@ msgstr ""
 #: application/src/Form/ResourceForm.php:53
 #: application/src/Form/ResourceBatchUpdateForm.php:92
 msgid "Select a class"
-msgstr ""
+msgstr "Selecione uma turma"
 
 #: application/src/Form/ResourceForm.php:57
 msgid ""
@@ -2900,20 +3008,20 @@ msgstr ""
 
 #: application/src/Form/SitePageForm.php:39
 msgid "Add to navigation"
-msgstr ""
+msgstr "Adicionar à navegação"
 
 #: application/src/Form/ResourceTemplateForm.php:27
 msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:36
 msgid "Attachment link type"
-msgstr ""
+msgstr "Tipo de link de anexo"
 
 #: application/src/Form/SiteSettingsForm.php:38
 msgid "Item page"
@@ -2929,11 +3037,11 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:52
 msgid "Embed media on item pages"
-msgstr ""
+msgstr "Incorporar mídia nas páginas dos itens"
 
 #: application/src/Form/SiteSettingsForm.php:63
 msgid "Show page pagination"
-msgstr ""
+msgstr "Mostrar paginação da página"
 
 #: application/src/Form/SiteSettingsForm.php:64
 msgid ""
@@ -2942,7 +3050,7 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:75
 msgid "Show user bar on public views"
-msgstr ""
+msgstr "Mostrar barra de usuários em visualizações públicas"
 
 #: application/src/Form/SiteSettingsForm.php:77
 msgid "Never"
@@ -2957,12 +3065,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2972,22 +3080,24 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
-msgstr ""
+msgstr "Localidade"
 
 #: application/src/Form/SiteSettingsForm.php:104
 msgid ""
 "Locale/language code for this site. Leave blank to use the global locale "
 "setting."
 msgstr ""
+"Código de local/idioma para este site. Deixe em branco para usar a "
+"configuração de localidade global."
 
 #: application/src/Form/SiteSettingsForm.php:126
 msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -2996,6 +3106,8 @@ msgid ""
 "The maximum number of results per page on browse pages. Leave blank to use "
 "the global setting."
 msgstr ""
+"O número máximo de resultados por página nas páginas de navegação. Deixe em "
+"branco para usar a configuração global."
 
 #: application/src/Form/SiteSettingsForm.php:144
 msgid "Use global setting"
@@ -3014,7 +3126,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:161
 #: application/src/Form/SiteSettingsForm.php:178
 msgid "Select a property"
-msgstr ""
+msgstr "Selecione uma propriedade"
 
 #: application/src/Form/SiteSettingsForm.php:169
 msgid "Browse body property"
@@ -3036,7 +3148,7 @@ msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:201
 msgid "Select templates"
-msgstr ""
+msgstr "Selecionar modelos"
 
 #: application/src/Form/SiteSettingsForm.php:209
 msgid "Restrict to templates"
@@ -3069,7 +3181,7 @@ msgstr ""
 #: application/src/Form/UserBatchUpdateForm.php:55
 #: application/src/Form/UserBatchUpdateForm.php:72
 msgid "Select sites…"
-msgstr ""
+msgstr "Selecione sites ..."
 
 #: application/src/Form/UserBatchUpdateForm.php:59
 msgid "Remove from site permission"
@@ -3086,7 +3198,7 @@ msgstr ""
 
 #: application/src/Form/UserBatchUpdateForm.php:87
 msgid "Select permission…"
-msgstr ""
+msgstr "Selecione permissão ..."
 
 #: application/src/Form/UserBatchUpdateForm.php:91
 msgid "Add to site permission as"
@@ -3113,12 +3225,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3161,7 +3273,7 @@ msgstr ""
 #: application/src/Form/ResourceBatchUpdateForm.php:110
 #: application/src/Form/ResourceBatchUpdateForm.php:124
 msgid "Select item sets"
-msgstr ""
+msgstr "Selecionar coleção"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:113
 msgid "Add to item sets"
@@ -3178,7 +3290,7 @@ msgstr ""
 #: application/src/Form/ResourceBatchUpdateForm.php:161
 #: application/view/common/property-form-batch-edit.phtml:63
 msgid "Select properties"
-msgstr ""
+msgstr "Selecionar propriedades"
 
 #: application/src/Form/ResourceBatchUpdateForm.php:164
 msgid "Clear property values"
@@ -3189,13 +3301,13 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
-msgstr ""
+msgstr "Código global de idioma / idioma para todas as interfaces."
 
 #: application/src/Form/UserForm.php:148
 msgid "Default resource template"
-msgstr ""
+msgstr "Modelo de recurso padrão"
 
 #: application/src/Form/UserForm.php:166
 msgid "Current password"
@@ -3213,113 +3325,114 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
-msgstr ""
+msgstr "Email do administrador"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
-msgstr ""
+msgstr "O número máximo de resultados por página nas páginas de navegação."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
+"As informações adicionais que acompanham os rótulos nas páginas de recursos."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
-msgstr ""
+msgstr "Site padrão"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
-msgstr ""
+msgstr "Sem padrão (mostrar índice de sites)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
-msgstr ""
+msgstr "Visibilidade de conteúdo padrão para Privado"
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3345,7 +3458,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3372,56 +3485,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3452,12 +3515,12 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:115
 msgid "User does not have permission to edit site settings"
-msgstr ""
+msgstr "O usuário não tem permissão para editar as configurações do site"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:136
 #: application/src/Controller/Admin/SettingController.php:35
 msgid "Settings successfully updated"
-msgstr ""
+msgstr "Configurações atualizadas com sucesso"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:172
 msgid "Page successfully created"
@@ -3469,11 +3532,11 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:207
 msgid "First page in navigation"
-msgstr ""
+msgstr "Primeira página na navegação"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:223
 msgid "Navigation successfully updated"
-msgstr ""
+msgstr "Navegação atualizada com sucesso"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:256
 msgid "Site resources successfully updated"
@@ -3481,21 +3544,21 @@ msgstr ""
 
 #: application/src/Controller/SiteAdmin/IndexController.php:297
 msgid "User permissions successfully updated"
-msgstr ""
+msgstr "Permissões de usuário atualizadas com sucesso"
 
 #: application/src/Controller/SiteAdmin/IndexController.php:329
 msgid "Site theme successfully updated"
-msgstr ""
+msgstr "Tema do site atualizado com sucesso"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
-msgstr ""
+msgstr "Configurações de tema atualizadas com sucesso"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3571,8 +3634,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3607,7 +3670,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3650,48 +3713,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3700,51 +3763,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3768,24 +3831,24 @@ msgstr ""
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3911,14 +3974,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3929,24 +3992,24 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
 msgid "Global Administrator"
-msgstr ""
+msgstr "Administrador Global"
 
 #: application/src/Permissions/Acl.php:22
 msgid "Site Administrator"
-msgstr ""
+msgstr "Administrador de site"
 
 #: application/src/Permissions/Acl.php:24
 msgid "Reviewer"
@@ -3954,11 +4017,11 @@ msgstr ""
 
 #: application/src/Permissions/Acl.php:25
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #: application/src/Permissions/Acl.php:26
 msgid "Researcher"
-msgstr ""
+msgstr "Pesquisador"
 
 #: application/src/Site/Navigation/Link/BrowseItemSets.php:11
 msgid "Browse item sets"
@@ -3966,7 +4029,7 @@ msgstr ""
 
 #: application/src/Site/Navigation/Link/Url.php:11
 msgid "Custom URL"
-msgstr ""
+msgstr "URL personalizada"
 
 #: application/src/Site/BlockLayout/TableOfContents.php:15
 msgid "Table of contents"
@@ -3992,8 +4055,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4001,46 +4068,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4148,7 +4219,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4157,7 +4228,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:247
 msgid "A site must have a theme."
-msgstr ""
+msgstr "Um site deve ter um tema."
 
 #: application/src/Api/Adapter/SiteAdapter.php:252
 msgid "A site must have item pool data."
@@ -4167,39 +4238,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
-msgstr ""
+msgstr "Navegação inválida: a navegação deve ser um array"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
-msgstr ""
+msgstr "Navegação inválida: tipo ausente do link"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
-msgstr ""
+msgstr "Navegação inválida: vincular dados ausentes"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
-msgstr ""
+msgstr "Navegação inválida: dados de link inválidos"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
-msgstr ""
+msgstr "Navegação inválida: os links da página devem ser exclusivos"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
-msgstr ""
+msgstr "Navegação inválida: os links devem ser uma matriz"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -4324,7 +4395,7 @@ msgstr ""
 
 #: application/view/common/advanced-search/properties.phtml:60
 msgid "[Any Property]"
-msgstr ""
+msgstr "[Qualquer propriedade]"
 
 #: application/view/omeka/admin/item/sidebar-select.phtml:41
 msgid "Filter by class"
@@ -4665,7 +4736,7 @@ msgstr ""
 #. Property comment for Dublin Core:abstract
 #. Property comment for Bibliographic Ontology:abstract
 msgid "A summary of the resource."
-msgstr ""
+msgstr "Um resumo do recurso."
 
 #. Property label for Dublin Core:created
 msgid "Date Created"
@@ -5588,7 +5659,7 @@ msgstr ""
 
 #. Class comment for Bibliographic Ontology:Website
 msgid "A group of Webpages accessible on the Web."
-msgstr ""
+msgstr "Um grupo de páginas da Web acessíveis na Web."
 
 #. Class label for Bibliographic Ontology:Workshop
 msgid "Workshop"
@@ -5977,11 +6048,11 @@ msgstr ""
 
 #. Property label for Bibliographic Ontology:numPages
 msgid "number of pages"
-msgstr ""
+msgstr "número de páginas"
 
 #. Property comment for Bibliographic Ontology:numPages
 msgid "The number of pages contained in a document"
-msgstr ""
+msgstr "O número de páginas contidas em um documento"
 
 #. Property label for Bibliographic Ontology:numVolumes
 msgid "number of volumes"
@@ -6024,7 +6095,7 @@ msgstr ""
 
 #. Property label for Bibliographic Ontology:pages
 msgid "pages"
-msgstr ""
+msgstr "Páginas"
 
 #. Property comment for Bibliographic Ontology:pages
 msgid ""
@@ -6123,10 +6194,6 @@ msgstr "Pessoa"
 msgid "A person."
 msgstr "Uma pessoa."
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "O documento."
@@ -6147,6 +6214,10 @@ msgstr "Grupo"
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Projeto"
@@ -6660,7 +6731,7 @@ msgstr "nome da conta"
 
 #. Property comment for Friend of a Friend:accountName
 msgid "Indicates the name (identifier) associated with this online account."
-msgstr ""
+msgstr " Indica o nome (identificador) associado a esta conta online."
 
 #. Property label for Friend of a Friend:member
 msgid "member"
@@ -6668,7 +6739,7 @@ msgstr "membro"
 
 #. Property comment for Friend of a Friend:member
 msgid "Indicates a member of a Group"
-msgstr ""
+msgstr "Indica um membro de um grupo"
 
 #. Property label for Friend of a Friend:membershipClass
 msgid "membershipClass"
diff --git a/application/language/pt_PT.mo b/application/language/pt_PT.mo
index 697ddd63c9..57a24a72b4 100644
Binary files a/application/language/pt_PT.mo and b/application/language/pt_PT.mo differ
diff --git a/application/language/pt_PT.po b/application/language/pt_PT.po
index 5e8a7361cf..970cf9431a 100644
--- a/application/language/pt_PT.po
+++ b/application/language/pt_PT.po
@@ -6,15 +6,16 @@
 # Translators:
 # Filipe <llopes@museus.ul.pt>, 2018
 # Hugo Castelo Branco <hugo.castelobranco@gmail.com>, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Hugo Castelo Branco <hugo.castelobranco@gmail.com>, 2019\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/omeka/teams/14184/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,19 +65,19 @@ msgstr "O adaptador %1$s anão implementa a operação de eliminação múltipla
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "O campo \"%s\" não está disponível na classe de entidade %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "O campo \"%1$s\" não está disponível na classe de entidade %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Permissão negada ao utilizador para %s ao recurso %s."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Permissão negada ao utilizador para %1$s ao recurso %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "Entidade %s com critério %s não foi encontrada"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "Entidade %1$s com critério %2$s não foi encontrada"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -86,7 +87,7 @@ msgstr "Benvindo"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Benvindo ao seu novo site. Esta é uma página de exemplo."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Explorar"
 
@@ -95,7 +96,7 @@ msgstr "Explorar"
 msgid "The API does not support the \"%s\" resource."
 msgstr "A API não suporta o recurso \"%s\"."
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -110,11 +111,11 @@ msgstr "Default"
 msgid "Asset uploads must be POSTed."
 msgstr "Carregamento de recursos deve ser feito por POST "
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Adicionar outro item?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Adicionar outro conjunto de itens?"
 
@@ -198,8 +199,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "O módulo \"%s\" está marcado como \"%s\" e não pode ser activado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "O módulo \"%1$s\" está marcado como \"%2$s\" e não pode ser activado"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -208,8 +209,8 @@ msgstr "O módulo \"%s\" não estava na base de dados durante a activação"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "O módulo \"%s\" está marcado como \"%s\" e não pode ser desactivado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "O módulo \"%1$s\" está marcado como \"%2$s\" e não pode ser desactivado"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -218,13 +219,13 @@ msgstr "O módulo \"%s\" não estava na base de dados durante a desactivação"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "O módulo \"%s\" está marcado como \"%s\" e não pode ser instalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "O módulo \"%1$s\" está marcado como \"%2$s\" e não pode ser instalado"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "O módulo \"%s\" está marcado como \"%s\" e não pode ser desinstalado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "O módulo \"%1$s\" está marcado como \"%2$s\" e não pode ser desinstalado"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -234,8 +235,8 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "O módulo \"%s\" está marcado como \"%s\" e não pode ser actualizado"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "O módulo \"%1$s\" está marcado como \"%2$s\" e não pode ser actualizado"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -244,8 +245,8 @@ msgstr "Módulo \"%s\" não foi encontrado na base de dados durante a actualiza
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr ""
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Permissão negada ao utilizador ao %1$s do módulo %2$s."
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -371,7 +372,7 @@ msgstr "Senha deve conter pelo menos %s algarismos."
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -464,8 +465,9 @@ msgid "AND"
 msgstr "E"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -530,7 +532,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Responsabilidade"
 
@@ -563,8 +565,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "O tamanho máximo de carregamento é de %s MB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -584,7 +586,7 @@ msgstr "O tamanho máximo de carregamento é de %s MB."
 msgid "Edit"
 msgstr "Editar"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -611,7 +613,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -623,6 +625,10 @@ msgstr "Remover valor"
 msgid "Add new item set"
 msgstr "Adicionar novo conjunto de itens"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -732,7 +738,7 @@ msgid "Block to be removed"
 msgstr "Bloco a remover"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -740,6 +746,7 @@ msgstr "Restaurar valor"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -750,17 +757,17 @@ msgstr "Restaurar valor"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Conjuntos de itens"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Valor a remover"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -908,10 +915,6 @@ msgstr "Clique num set de itens para os adicionar ao painel de edição."
 msgid "Filter item sets"
 msgstr "Filtrar conjuntos de itens"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Todos os conjuntos de itens"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -949,7 +952,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -1001,8 +1004,8 @@ msgstr "Próximo"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s de %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s de %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1065,12 +1068,12 @@ msgstr "Clique numa propriedade para a adicionar ao painel de edição."
 msgid "Filter properties"
 msgstr "Filtrar propriedades"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Nova propriedade"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1163,17 +1166,17 @@ msgstr "Desligar"
 msgid "Log in"
 msgstr "Ligar"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1183,7 +1186,7 @@ msgstr "Está disponível uma nova versão de Omeka S: %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Obter a nova versão"
 
@@ -1205,7 +1208,7 @@ msgid "Details:"
 msgstr "Detalhes:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Recursos"
 
@@ -1416,7 +1419,7 @@ msgstr "Edição múltipla de grupos de itens"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1462,7 +1465,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Dono"
 
@@ -1627,10 +1630,11 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: esta acção eliminará de forma definitiva %s conjuntos de itens e não "
-"pode ser desfeita."
+"%1$s: esta acção eliminará de forma definitiva %2$s conjuntos de itens e não"
+" pode ser desfeita."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1793,9 +1797,10 @@ msgstr "Tem a certeza que quer eliminar os itens seleccionados?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: esta acção eliminará permanentemente %s itens, que não poderão ser "
+"%1$s: esta acção eliminará permanentemente %2$s itens, que não poderão ser "
 "recuperados."
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1961,10 +1966,10 @@ msgstr "Tem a certeza que quer eliminar \"medias\" seleccionados ?"
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
-"%s: esta acção apagará permanentemente %s \"medias\" que não poderão ser "
-"recuperadas."
+"%1$s: esta acção apagará permanentemente %2$s \"medias\" que não poderão ser"
+" recuperadas."
 
 #: application/view/omeka/admin/media/browse.phtml:186
 msgid ""
@@ -2276,7 +2281,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Adicionar novo utilizador"
 
@@ -2295,7 +2300,8 @@ msgstr "Tem a certeza de que quer eliminar os utilizadores seleccionados ?"
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2307,7 +2313,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2396,7 +2402,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr "Este vocabulário não inclui classes."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2423,7 +2429,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2434,7 +2440,7 @@ msgstr ""
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2513,7 +2519,7 @@ msgid "Theme"
 msgstr ""
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2560,16 +2566,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2608,30 +2610,30 @@ msgstr ""
 msgid "Current theme"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Editar definições de tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2645,16 +2647,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2730,35 +2727,39 @@ msgstr "Pesquisa avançada de itens"
 msgid "Item"
 msgstr ""
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Restaurar propriedade removida"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Especifique sff um código de idioma válido"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2817,24 +2818,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2873,30 +2874,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Ficheiro de vocabulário"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr "URL do vocabulário"
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2937,7 +3031,7 @@ msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2987,12 +3081,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3002,7 +3096,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -3017,7 +3111,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3143,12 +3237,12 @@ msgid "Confirm email"
 msgstr "Confirmar email"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3219,7 +3313,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3243,113 +3337,113 @@ msgstr "Confirme a nova senha"
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Email do administrador"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Mostrar vocabulário"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3375,7 +3469,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3402,56 +3496,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Ficheiro de vocabulário"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr "URL do vocabulário"
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3517,15 +3561,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Definições de tema actualizadas com sucesso"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3601,8 +3645,8 @@ msgstr "Modelo de recursos %s criado com sucesso."
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3637,7 +3681,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3682,49 +3726,49 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "Tem de seleccionar pelo menos um item para eliminação múltipla."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Tem de seleccionar pelo menos um grupo de itens para eliminação múltipla."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "vocabulário"
 
@@ -3733,51 +3777,51 @@ msgstr "vocabulário"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Vocabulário %s importado com sucesso."
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Vocabulário actualizado com sucesso"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Vocabulário eliminado com sucesso"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "\"Media\" actualizado/a com sucesso"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "\"Media\" eliminado/a com sucesso"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr "Tem de seleccionar pelo menos um(a) \"media\" para eliminação múltipla."
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr "\"Medias\" eliminadas com sucesso"
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr "Tem de seleccionar pelo menos um(a) \"media\" para edição múltipla."
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr "\"Media\" editado/a com sucesso"
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3801,24 +3845,24 @@ msgstr ""
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Tem de seleccionar pelo menos um item para edição múltipla."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3944,14 +3988,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3962,15 +4006,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4025,8 +4069,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4034,46 +4082,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4181,7 +4233,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4200,39 +4252,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6159,10 +6211,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6183,6 +6231,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/sr_RS.mo b/application/language/sr_RS.mo
index d810ef6346..be4afe96da 100644
Binary files a/application/language/sr_RS.mo and b/application/language/sr_RS.mo differ
diff --git a/application/language/sr_RS.po b/application/language/sr_RS.po
index 7c5fd97203..fda0664bc9 100644
--- a/application/language/sr_RS.po
+++ b/application/language/sr_RS.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Ognjen Calic <cognjen@gmail.com>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Ognjen Calic <cognjen@gmail.com>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Serbian (Serbia) (https://www.transifex.com/omeka/teams/14184/sr_RS/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,19 +64,19 @@ msgstr "Адаптер %1$sне имплементира операцију се
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "Поље \"%s\" није доступно у  entitetskoj klasi %s."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "Поље \"%1$s\" није доступно у  entitetskoj klasi %2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "Тренутном кориснику није дозвољено да %s ресурс%s."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "Тренутном кориснику није дозвољено да %1$s ресурс%2$s."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "%s ентитет са критеријумом %s није пронађен"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "%1$s ентитет са критеријумом %2$s није пронађен"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -85,7 +86,7 @@ msgstr "Добродошли"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Добродошли на Ваш нови сајт. Ово је пробна страница."
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Прегледајте"
 
@@ -94,7 +95,7 @@ msgstr "Прегледајте"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API не подржава \"%s\" ресурс"
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr "Подразумијевано"
 msgid "Asset uploads must be POSTed."
 msgstr "Отпремање ставке имовине мора бити POSTовано."
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Додај објекат?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Додај скуп објеката?"
 
@@ -196,8 +197,8 @@ msgstr "OpenSeadragon није доступан док се JavaScript не ом
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "Модул \"%s\" је означен као \"%s\" и не  може се активирати "
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "Модул \"%1$s\" је означен као \"%2$s\" и не  може се активирати "
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -206,8 +207,8 @@ msgstr "Модул \"%s\" није у бази података за врије
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "Модул \"%s\" је означен као \"%s\" и не може се деактивирати "
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "Модул \"%1$s\" је означен као \"%2$s\" и не може се деактивирати "
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -216,13 +217,13 @@ msgstr "Модул \"%s\" није у бази података за врије
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "Модул \"%s\" је означен као \"%s\" и не може се инсталирати"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "Модул \"%1$s\" је означен као \"%2$s\" и не може се инсталирати"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "Модул \"%s\" је означен као \"%s\" и не може се деинсталирати"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "Модул \"%1$s\" је означен као \"%2$s\" и не може се деинсталирати"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -231,8 +232,8 @@ msgstr "Модул \"%s\" није у бази података за врије
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "Модул \"%s\" је означен као \"%s\" и не може се надоградити"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "Модул \"%1$s\" је означен као \"%2$s\" и не може се надоградити"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -241,8 +242,8 @@ msgstr "Модул \"%s\" није у бази података за врије
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "Тренутни корисник нема дозволу да %s модул %s"
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "Тренутни корисник нема дозволу да %1$s модул %2$s"
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -367,7 +368,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -460,8 +461,9 @@ msgid "AND"
 msgstr "AND"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -526,7 +528,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Улога"
 
@@ -559,8 +561,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "Максимална величина датотеке која се шаље је %sMB."
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -580,7 +582,7 @@ msgstr "Максимална величина датотеке која се ш
 msgid "Edit"
 msgstr "Ажурирај"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -607,7 +609,7 @@ msgstr "Тражи објекте који су додјењени било ки
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -619,6 +621,10 @@ msgstr "Уклони вриједност"
 msgid "Add new item set"
 msgstr "Додај скуп објеката"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -728,7 +734,7 @@ msgid "Block to be removed"
 msgstr "Блок који треба уклонити"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -736,6 +742,7 @@ msgstr "Обновити вриједност"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -746,17 +753,17 @@ msgstr "Обновити вриједност"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Скупови објеката"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Вриједност коју треба уклонити"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -904,10 +911,6 @@ msgstr "Клликните на скуп објеката да бисте га 
 msgid "Filter item sets"
 msgstr "Филтрирај скупове објеката"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Сви скупови објеката."
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -945,7 +948,7 @@ msgstr "Све"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -997,8 +1000,8 @@ msgstr "Наредна"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s–%s од%s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s–%2$s од %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1061,12 +1064,12 @@ msgstr "Кликните на својство да бисте је додалу
 msgid "Filter properties"
 msgstr "Филтрирај особине"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Додај својство"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1159,17 +1162,17 @@ msgstr "Одјава"
 msgid "Log in"
 msgstr "Пријава"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Филтрирајте кориснике"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1179,7 +1182,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1201,7 +1204,7 @@ msgid "Details:"
 msgstr "Детаљи:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Ресурси"
 
@@ -1412,7 +1415,7 @@ msgstr "Ажурирај серију објеката"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1458,7 +1461,7 @@ msgstr "Идентификатор"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Власник"
 
@@ -1622,9 +1625,10 @@ msgstr "Да ли сте сигурни да желите обрисати из
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: ова акција ће трајно обрисати %s скупова података и не може бити "
+"%1$s: ова акција ће трајно обрисати %2$s скупова података и не може бити "
 "поништена."
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1790,9 +1794,10 @@ msgstr "Да ли сте сигурни да желите обрисати ов
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: ова акција ће трајно обрисати %s објеката и не може бити поништена."
+"%1$s: ова акција ће трајно обрисати %2$s објеката и не може бити поништена."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1959,7 +1964,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2272,7 +2277,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Додај новог корисника"
 
@@ -2291,7 +2296,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2303,7 +2309,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2392,7 +2398,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr "Овај ријечник нема класа."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2419,7 +2425,7 @@ msgstr "Прихвати измјене"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2430,8 +2436,8 @@ msgstr "Сајтови"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "Идите на  %s да почнете са радом на %s."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "Идите на  %1$s да почнете са радом на %2$s."
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2511,7 +2517,7 @@ msgid "Theme"
 msgstr "Тема"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Лагер објеката "
 
@@ -2558,16 +2564,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr "Нема доступних страница."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Обнови скуп објеката"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Тренутно је %s објек(а)т/а на лагеру сајта."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Ниједан скуп објеката није додјењен овом сајту."
 
@@ -2606,30 +2608,30 @@ msgstr "Тренутна тема нема опцију конфигурациј
 msgid "Current theme"
 msgstr "Тренутна тема"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Ажурирај подешавање теме"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Грешка: ова тема је неисправна."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2645,16 +2647,11 @@ msgstr "Обнови"
 msgid "User permissions"
 msgstr "Корисничке дозволе"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Корисници које треба уклонити"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr "Овај сајт нема корисника. Додајте кориснике помоћу интерфејса десно."
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Кликните на корисника да бисте га додали сајту."
 
@@ -2730,35 +2727,39 @@ msgstr "Напредна претрага обвјеката"
 msgid "Item"
 msgstr "Објеката"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "Нешто није у реду"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Имате несачуване промене."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Обнови скуп објеката"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "Затвори скуп икона"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "Отвори скуп икона"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "Учитавање шаблона ресурса из API-ја није усјело"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "Обнови својство"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Молимо унесите исправну ознаку језика"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Опис"
 
@@ -2817,29 +2818,29 @@ msgstr "без наслова"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
-"грешка валидације \"%s\". Није могуће сачувати датотеку чији је тип медија "
-"\"%s\"."
+"грешка валидације \"%1$s\". Није могуће сачувати датотеку чији је тип медија"
+" \"%2$s\"."
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
-"грешка валидације \"%s\". Није могуће сачувати датотеку са екстензијом "
-"\"%s\"."
+"грешка валидације \"%1$s\". Није могуће сачувати датотеку са екстензијом "
+"\"%2$s\"."
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "Грешка преузимања: %s:%s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "Грешка преузимања: %1$s:%2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "Грешка преузимања: %s:%s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "Грешка преузимања: %1$s:%2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2879,35 +2880,124 @@ msgstr "Неисправна конфигурација резервог мин
 msgid "Resource template file"
 msgstr "Датотека шаблона ресурса"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
 msgstr ""
-"Скраћени идентификатор ријечника, који се користи као скраћеница за URI "
-"именског простора."
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "Именски простор URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Датотека ријечника"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
 msgstr ""
-"Јединствени УРИ именског простора којег користи ријечник за идентификацију "
-"локалних класа чланова и својстава."
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "Читљљив наслов ријечника."
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Читљив опис ријечника."
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2949,7 +3039,7 @@ msgid "Suggested class"
 msgstr "Предложена класа"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Генерално"
 
@@ -2999,12 +3089,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -3014,7 +3104,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Локал"
 
@@ -3031,7 +3121,7 @@ msgid "Restrict browse to attached items"
 msgstr "Ограничи преглед на приложене објекте"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Резултата по страници"
 
@@ -3157,12 +3247,12 @@ msgid "Confirm email"
 msgstr "Потврдите мејл"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Наслов инсталације"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Временска зона"
 
@@ -3233,7 +3323,7 @@ msgid "Confirm"
 msgstr "Потврда"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "Код глобалног локала/језика за све интерфејсе. "
 
@@ -3257,39 +3347,39 @@ msgstr "Потврда нове лозинке"
 msgid "New key label"
 msgstr "Нова кључна ознака"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Администраторов мејл"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "Максималан број резултата по страници на страницама за претраживање."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr "Додатне информације које прате етикете на страницама ресурса."
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Ниједан"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "Прикажи ријечник"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Подразумијевани сајт"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3297,78 +3387,78 @@ msgstr ""
 "Изаберите сајт који ће се појавити када корисници иду на почетну страницу "
 "инсталације."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Сигурност"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "Користи HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Очисти HTML које уносе корисници."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Онемогући валидацију датотека"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "Дозвоњени типови медија"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 "Списак дозвољених типова медија за отпремање датотека одвојен зарезима."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "Дозвољене екстензије датотека"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 "Списак дозвољених екстензија датотека за отпремање датотека одвојен "
 "зарезима."
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "Кључ за reCAPTCHA сајт"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "Тајни кључ reCAPTCHA "
 
@@ -3394,7 +3484,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3421,56 +3511,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr "Неисправан формат боје"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Датотека ријечника"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "Морате да потврдите да сте човјек попуњавањем CAPTCHA."
@@ -3536,15 +3576,15 @@ msgstr "Корисничке дозволе успјешно ажуриране"
 msgid "Site theme successfully updated"
 msgstr "Тема сајта успјешно ажурирана"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Подешавања теме успјешно ажурирана"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Сајт успјешно обрисан"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "сајт"
 
@@ -3620,8 +3660,8 @@ msgstr "Шаблон ресурса успјешно креиран. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3656,12 +3696,12 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 "API кључ је успјешно креиран.<br><br>Ово је ваш идентификатор кључа и "
 "приступни подаци за приступ API-ју. УПОЗОРЕЊЕ: \"key_credential\" неће бит "
 "идоступан након што напустите ову страницу.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3703,52 +3743,52 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Скуп објеката успјешно креиран. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Скуп података успјешно ажуриран"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "Скуп објеката"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Скуп објеката успјешно обрисан"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 "Морате изабрати барем један скуп података да бисте брисали серију скупова "
 "података."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Скуп објеката успјешно обрисан"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Брисање скупова објеката је у току. Ово може трајати дуже времена."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 "Морате изабрати барем један скуп података да бисте ажурирали серију скупова "
 "података."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Скупови објеката успјешно ажурирани"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Ажурирање скупова објеката је у току. Ово може трајати дуже времена."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "Ријечник"
 
@@ -3757,51 +3797,51 @@ msgstr "Ријечник"
 msgid "Vocabulary successfully imported. %s"
 msgstr "Ријечник је успјешно увезен. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Ријечник је успјешно обрисан"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "Медија успјешно ажурирана"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "Медија успјешно обрисана"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3825,25 +3865,25 @@ msgstr "Објекат је успјешно обрисан"
 msgid "Deleting items. This may take a while."
 msgstr "Објекти се бришу. Ово може трајати дуже времена."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Објекат успјешно креиран. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Објекат успјешно ажуриран"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 "Морате изабрати барем један објекат да бисте ажурирали серију објеката."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Објекат успјешно ажуриран"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Објекти се ажурирају. Ово може трајати дуже времена."
 
@@ -3969,14 +4009,14 @@ msgstr "Отпреми датотеку"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3987,15 +4027,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4050,55 +4090,63 @@ msgstr ""
 msgid "Item with metadata"
 msgstr "Објекат са метаподацима"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "Поравнање минијатурних приказа"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "Непознат [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Прегледајте приказ"
@@ -4206,7 +4254,7 @@ msgstr "Медија мора бити низ"
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4225,39 +4273,39 @@ msgstr "Сајт мора имати податке о лагеру објека
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "Неисправна навигација: навигација мора бити низ."
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "Неисправна навигација: линку недостаје тип"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "Неисправна навигација: линку недостаје податак"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "Неисправна навигација: неисправан податак линка"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "Неисправна навигација: линк старнице мора бити јединствен"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "Неисправна навигација: линкови морају бити низ"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6307,10 +6355,6 @@ msgstr "Особа"
 msgid "A person."
 msgstr "Особа."
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr "Агент (нпр. особа, група, софтвер или физички артифакт)"
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "Докуемент."
@@ -6331,6 +6375,10 @@ msgstr "Група"
 msgid "A class of Agents."
 msgstr "Класа агента."
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr "Агент (нпр. особа, група, софтвер или физички артифакт)"
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "Пројекат"
diff --git a/application/language/template.pot b/application/language/template.pot
index a7adfd933c..0f15833bb6 100644
--- a/application/language/template.pot
+++ b/application/language/template.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,18 +59,18 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Welcome to your new site. This is an example page."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 msgid "The API does not support the \"%s\" resource."
 msgstr ""
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -105,11 +105,11 @@ msgstr ""
 msgid "Asset uploads must be POSTed."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -202,7 +202,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -212,12 +212,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -227,7 +227,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -237,7 +237,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -347,7 +347,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -440,8 +440,9 @@ msgid "AND"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -506,7 +507,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr ""
 
@@ -539,8 +540,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -560,7 +561,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -587,7 +588,7 @@ msgstr ""
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -599,6 +600,10 @@ msgstr ""
 msgid "Add new item set"
 msgstr ""
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -708,7 +713,7 @@ msgid "Block to be removed"
 msgstr ""
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -716,6 +721,7 @@ msgstr ""
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -726,17 +732,17 @@ msgstr ""
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr ""
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr ""
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -884,10 +890,6 @@ msgstr ""
 msgid "Filter item sets"
 msgstr ""
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr ""
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -925,7 +927,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -977,7 +979,7 @@ msgstr ""
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
+msgid "%1$s–%2$s of %3$s"
 msgstr ""
 
 #: application/view/common/pagination.phtml:30
@@ -1041,12 +1043,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr ""
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1139,17 +1141,17 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr ""
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1159,7 +1161,7 @@ msgstr ""
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr ""
 
@@ -1181,7 +1183,7 @@ msgid "Details:"
 msgstr ""
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr ""
 
@@ -1392,7 +1394,7 @@ msgstr ""
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1438,7 +1440,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr ""
 
@@ -1602,7 +1604,8 @@ msgstr ""
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
@@ -1766,7 +1769,8 @@ msgstr ""
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/item/browse.phtml:174
@@ -1929,7 +1933,8 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:170
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
-msgid "%s: this action will permanently delete %s medias and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2241,7 +2246,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr ""
 
@@ -2260,7 +2265,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2272,7 +2278,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2361,7 +2367,7 @@ msgstr ""
 msgid "This vocabulary has no classes."
 msgstr ""
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2388,7 +2394,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2399,7 +2405,7 @@ msgstr ""
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
+msgid "Go to the %1$s to start working with %2$s."
 msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
@@ -2479,7 +2485,7 @@ msgid "Theme"
 msgstr ""
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr ""
 
@@ -2526,16 +2532,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr ""
 
@@ -2574,30 +2576,30 @@ msgstr ""
 msgid "Current theme"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2611,16 +2613,11 @@ msgstr ""
 msgid "User permissions"
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr ""
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr ""
 
@@ -2696,35 +2693,39 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr ""
 
 #: application/config/module.config.php:623
-msgid "Close icon set"
+msgid "Restore item set"
 msgstr ""
 
 #: application/config/module.config.php:624
+msgid "Close icon set"
+msgstr ""
+
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr ""
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr ""
 
@@ -2783,24 +2784,25 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid ""
+"Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension \"%s"
-"\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2839,30 +2841,123 @@ msgstr ""
 msgid "Resource template file"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:20
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
+msgid "Namespace URI"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:70
 msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace "
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
 "URI."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
-msgid "Namespace URI"
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:136
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter the preferred language of the labels and comments using an <a target="
+"\"_blank\" href=\"https://www.w3.org/International/articles/language-tags/"
+"\">IETF language tag</a>. Defaults to the first available."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI "
+"enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
 msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
@@ -2903,7 +2998,7 @@ msgid "Suggested class"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr ""
 
@@ -2953,12 +3048,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2968,7 +3063,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr ""
 
@@ -2983,7 +3078,7 @@ msgid "Restrict browse to attached items"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr ""
 
@@ -3109,12 +3204,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr ""
 
@@ -3185,7 +3280,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3209,113 +3304,113 @@ msgstr ""
 msgid "New key label"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr ""
 
@@ -3341,7 +3436,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3368,56 +3463,6 @@ msgstr ""
 msgid "Invalid color format"
 msgstr ""
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3483,15 +3528,15 @@ msgstr ""
 msgid "Site theme successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr ""
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr ""
 
@@ -3567,8 +3612,8 @@ msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3602,8 +3647,8 @@ msgstr ""
 msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
-"you navigate away from this page.<br><br>key_identity: <code>%s</"
-"code><br>key_credential: <code>%s</code>"
+"you navigate away from this page.<br><br>key_identity: <code>%1$s</"
+"code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3646,48 +3691,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3696,51 +3741,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr ""
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3764,24 +3809,24 @@ msgstr ""
 msgid "Deleting items. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr ""
 
@@ -3907,14 +3952,14 @@ msgstr ""
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version "
+"%2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3925,15 +3970,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -3988,8 +4033,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -3997,46 +4046,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr ""
@@ -4144,7 +4197,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4163,39 +4216,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6114,10 +6167,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6138,6 +6187,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/tr_TR.mo b/application/language/tr_TR.mo
index c5dd60cb9b..6ad00d7045 100644
Binary files a/application/language/tr_TR.mo and b/application/language/tr_TR.mo differ
diff --git a/application/language/tr_TR.po b/application/language/tr_TR.po
index ed0eece12f..426c3aa60c 100644
--- a/application/language/tr_TR.po
+++ b/application/language/tr_TR.po
@@ -8,15 +8,16 @@
 # Furkan Kalkan <furkan.kalkan3@gmail.com>, 2018
 # Onur Metin <onurmetin@gmail.com>, 2018
 # Zubeyir Tercan <zubeyir@gmail.com>, 2019
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Zubeyir Tercan <zubeyir@gmail.com>, 2019\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/omeka/teams/14184/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,18 +67,18 @@ msgstr "%1$s adaptörü toplu silme işlemini desteklemiyor."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "\"%s\" alanı %s nesne sınıfı içinde bulunmuyor."
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "\"%1$s\" alanı %2$s nesne sınıfı içinde bulunmuyor."
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
+msgid "Permission denied for the current user to %1$s the %2$s resource."
 msgstr ""
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
+msgid "%1$s entity with criteria %2$s not found"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
@@ -88,7 +89,7 @@ msgstr "Hoş geldiniz"
 msgid "Welcome to your new site. This is an example page."
 msgstr "Yeni sitenize hoşgeldiniz. Bu örnek bir sayfadır. "
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "Görüntüle"
 
@@ -97,7 +98,7 @@ msgstr "Görüntüle"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API \"%s\" kaynağını (resource) desteklemiyor. "
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -112,11 +113,11 @@ msgstr "Varsayılan"
 msgid "Asset uploads must be POSTed."
 msgstr "Dosya yüklemeleri POST metoduyla yapılmalıdır. "
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "Başka öğe eklemek istiyor musunuz ?"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "Başka koleksiyon eklemek istiyor musunuz?"
 
@@ -199,7 +200,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
 msgstr ""
 
 #: application/src/Module/Manager.php:181
@@ -209,7 +210,7 @@ msgstr ""
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
 msgstr ""
 
 #: application/src/Module/Manager.php:213
@@ -219,12 +220,12 @@ msgstr ""
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
 msgstr ""
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
 msgstr ""
 
 #: application/src/Module/Manager.php:288
@@ -234,7 +235,7 @@ msgstr "Modül \"%s\" kaldırma sırasında veritabanında bulunamadı"
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
 msgstr ""
 
 #: application/src/Module/Manager.php:331
@@ -244,7 +245,7 @@ msgstr "Modül \"%s\" kaldırma sırasında veritabanında bulunamadı"
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
+msgid "Permission denied for the current user to %1$s the %2$s module."
 msgstr ""
 
 #: application/src/Mvc/MvcListeners.php:436
@@ -360,7 +361,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -453,8 +454,9 @@ msgid "AND"
 msgstr "VE"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -519,7 +521,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "Rol"
 
@@ -552,8 +554,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "Maksimum yükleme boyutu %s MB'tır"
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -573,7 +575,7 @@ msgstr "Maksimum yükleme boyutu %s MB'tır"
 msgid "Edit"
 msgstr "Düzenle"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -600,7 +602,7 @@ msgstr "Bu koleksiyonlardan herhangi birisi içerisinde bulunan öğeleri arar."
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -612,6 +614,10 @@ msgstr "Değeri kaldır"
 msgid "Add new item set"
 msgstr "Yeni koleksiyon ekle"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -721,7 +727,7 @@ msgid "Block to be removed"
 msgstr "Blok kaldırıldı"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -729,6 +735,7 @@ msgstr ""
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -739,17 +746,17 @@ msgstr ""
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "Koleksiyonlar"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "Değer kaldırıldı"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -897,10 +904,6 @@ msgstr "Düzenleme paneline eklemek için ilgili koleksiyonun üzerine tıklayı
 msgid "Filter item sets"
 msgstr "Koleksiyonları filtrele"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "Tüm koleksiyonlar"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -938,7 +941,7 @@ msgstr "Tümü"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -990,8 +993,8 @@ msgstr "Sonraki"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s – %s / %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s – %2$s / %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1055,12 +1058,12 @@ msgstr ""
 msgid "Filter properties"
 msgstr "Üstveri alanlarını filtrele"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "Üstveri alanı ekle"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1153,18 +1156,18 @@ msgstr "Çıkış"
 msgid "Log in"
 msgstr "Giriş yap"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "Kullanıcıları filtrele"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
-msgstr "Tüm kullanıcılar (%s)"
+msgid "Users (%s)"
+msgstr ""
 
 #: application/view/common/version-notification.phtml:8
 #, php-format
@@ -1173,7 +1176,7 @@ msgstr "Omeka S yeni sürümü  Omeka S'nin yeni bir sürümü mevcut. %s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "Yeni sürümü al."
 
@@ -1195,7 +1198,7 @@ msgid "Details:"
 msgstr "Detaylar:"
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "Kaynaklar"
 
@@ -1406,7 +1409,7 @@ msgstr "Koleksiyonları toplu düzenle"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1452,7 +1455,7 @@ msgstr ""
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "Sahip"
 
@@ -1616,10 +1619,11 @@ msgstr "Seçili koleksiyonları silmek istediğinizden emin misiniz?"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
 msgstr ""
-"%s: bu işlem %s koleksiyonu kalıcı olarak silecek ve bu işlem geri alınamaz "
-"!"
+"%1$s: bu işlem %2$s koleksiyonu kalıcı olarak silecek ve bu işlem geri "
+"alınamaz !"
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1782,9 +1786,10 @@ msgstr "Seçili öğeleri silmekten emin misiniz?"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
 msgstr ""
-"%s: bu işlem %s öğeyi kalıcı olarak silecek ve bu işlem geri alınamaz."
+"%1$s: bu işlem %2$s öğeyi kalıcı olarak silecek ve bu işlem geri alınamaz."
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1952,7 +1957,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2265,7 +2270,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
@@ -2284,7 +2289,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2296,7 +2302,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2385,7 +2391,7 @@ msgstr "Namespace URI"
 msgid "This vocabulary has no classes."
 msgstr "Bu sözlük sınıf içermiyor."
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2412,7 +2418,7 @@ msgstr ""
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2423,8 +2429,8 @@ msgstr "Siteler"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "%sile çalışmak için %sne gidiniz."
+msgid "Go to the %1$s to start working with %2$s."
+msgstr ""
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2504,7 +2510,7 @@ msgid "Theme"
 msgstr "Tema"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "Öğe havuzu"
 
@@ -2551,16 +2557,12 @@ msgstr "Sayfaları filtrele"
 msgid "There are no available pages."
 msgstr "Kullanılabilir sayfa bulunamadı."
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "Koleksiyonu geri yükle"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "Şuan bu sitenin havuzunda %s öğe bulunmaktadır."
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "Bu siteye atanmış bir koleksiyon yok."
 
@@ -2599,30 +2601,30 @@ msgstr "Mevcut tema konfigürasyon seçeneklerine sahip değil. "
 msgid "Current theme"
 msgstr "Mevcut tema"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "Tema ayarlarını düzenle"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "Bu temanın yeni bir sürümü mevcut. %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "Hata: bu tema geçersiz."
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "Durum: %s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2636,16 +2638,11 @@ msgstr ""
 msgid "User permissions"
 msgstr "Kullanıcı yetkileri"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "Kullanıcı kaldırıldı"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr ""
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "Siteye eklemek için ilgili kullanıcının üzerine tıklayın."
 
@@ -2721,35 +2718,39 @@ msgstr "Gelişmiş öğe arama"
 msgid "Item"
 msgstr "Öğe"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr ""
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "Kaydedilmemiş değişiklikleriniz var."
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "Koleksiyonu geri yükle"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr ""
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr ""
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr ""
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr ""
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "Lütfen geçerli bir dil etiketi giriniz"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "Tanımlama"
 
@@ -2808,24 +2809,24 @@ msgstr ""
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
 msgstr ""
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
 msgstr ""
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
+msgid "Error downloading %1$s: %2$s"
 msgstr ""
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
 msgstr ""
 
 #: application/src/File/ThumbnailManager.php:102
@@ -2864,33 +2865,124 @@ msgstr ""
 msgid "Resource template file"
 msgstr "Kaynak şablonu dosyası"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "Namespace URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
+msgid ""
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "Sözlük dosyası"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
 msgstr ""
-"Benzersiz namespace URI sözlük tarafından sınıflar ve üstveri alanlarını "
-"belirtmek için kullanılır."
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
 msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "Sözlüğe ait tanımlama"
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2930,7 +3022,7 @@ msgid "Suggested class"
 msgstr "Önerilen sınıf"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "Genel"
 
@@ -2980,12 +3072,12 @@ msgid "Always"
 msgstr "Her zaman"
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2995,7 +3087,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "Yerelleştirme"
 
@@ -3010,7 +3102,7 @@ msgid "Restrict browse to attached items"
 msgstr "Eklenmiş öğelerin görüntülenmesini kısıtla"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "Sayfa başına sonuç sayısı"
 
@@ -3136,12 +3228,12 @@ msgid "Confirm email"
 msgstr ""
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "Kurulum başlığı"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "Saat dilimi"
 
@@ -3212,7 +3304,7 @@ msgid "Confirm"
 msgstr ""
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr ""
 
@@ -3236,39 +3328,39 @@ msgstr "Yeni şifreyi doğrula"
 msgid "New key label"
 msgstr "Yeni anahtar etiketi"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "Yönetici e-postası"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "Görüntüleme sayfalarında sayfa başına düşen en fazla sonuç sayısı."
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "Üstveri alanı etiketlerinde gösterilecek bilgi"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "Hiçbiri"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "Varsayılan site"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
@@ -3276,77 +3368,77 @@ msgstr ""
 "Omeka kurulumunuzun anasayfasına gittiğinde kullanıcıların görecekleri "
 "siteyi seçiniz."
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "Varsayılan yok (mevcut sitelerin bir listesini göster)"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "Sürüm bildirimlerini göster"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr ""
 "Omeka S, modüller ya da temaların yeni sürümleri çıktığında haber ver."
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "Güvenlik"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "HTMLPurifier kullan"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "Kullanıcılar tarafından girilmiş HTML kodlarını temizler."
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "Dosya doğrulamasını devre dışı bırak"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr ""
 "Uzantı ve dosya türü doğrulamasını devre dışı bırakmak için bunu işaretle."
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "İzin verilen dosya türleri"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr "İzin verilmiş dosya türlerinin virgülle ayrılmış listesi."
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "İzin verilen dosya uzantıları"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr "İzin verilmiş dosya uzantılarının virgülle ayrılmış listesi. "
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "reCAPTCHA site anahtarı"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr " reCAPTCHA gizli anahtarı"
 
@@ -3372,7 +3464,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3399,56 +3491,6 @@ msgstr "3 ya da 6 karakterli hexadecimal renk kodu ya da \"transparent\" "
 msgid "Invalid color format"
 msgstr "Geçersiz renk formatı"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "Sözlük dosyası"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr ""
@@ -3514,15 +3556,15 @@ msgstr "Kullanıcı yetkileri başarıyla güncellendi"
 msgid "Site theme successfully updated"
 msgstr "Site teması baarıyla güncellendi"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "Tema ayarları başarıyla güncellendi"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "Site başarıyla silindi"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "site"
 
@@ -3598,8 +3640,8 @@ msgstr "Kaynak şablonu başarıyla oluşturuldu. %s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3634,7 +3676,7 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/Controller/Admin/UserController.php:268
@@ -3677,48 +3719,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "Koleksiyon başarıyla oluşturuldu. %s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "Koleksiyon başarıyla güncellendi"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "koleksiyon"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "Koleksiyon başarıyla silindi"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "Toplu silme için en az bir koleksiyon seçmelisiniz."
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "Koleksiyonlar başarıyla silindi"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "Koleksiyonlar siliniyor. Bu biraz sürebilir."
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "Toplu düzenleme için en az bir koleksiyon seçmelisiniz."
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "Koleksiyonlar başarıyla düzenlendi"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "Koleksiyonlar düzenleniyor. Bu biraz sürebilir."
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr ""
 
@@ -3727,51 +3769,51 @@ msgstr ""
 msgid "Vocabulary successfully imported. %s"
 msgstr "Sözlük başarıyla içe aktarıldı. %s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "Onaylamadan önce lütfen değişiklikleri gözden geçiriniz."
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "Sözlük başarıyla güncellendi"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "Sözlükteki değişiklikler başarıyla yapıldı"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "Sözlük başarıyla silindi"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3795,24 +3837,24 @@ msgstr "Öğeler başarıyla silindi"
 msgid "Deleting items. This may take a while."
 msgstr "Öğeler siliniyor. Bu biraz zaman alabilir."
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "Öğe başarıyla oluşturuldu. %s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "Öğe başarıyla güncellendi"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "Toplu düzenleme için en az bir öğe seçmelisiniz."
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "Öğeler başarıyla düzenlendi"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "Öğeler düzenleniyor. Bu biraz sürebilir."
 
@@ -3938,14 +3980,14 @@ msgstr "Dosya yükle"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3956,15 +3998,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4019,8 +4061,12 @@ msgstr ""
 msgid "Item with metadata"
 msgstr ""
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
 msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
@@ -4028,46 +4074,50 @@ msgstr ""
 msgid "Unknown [%s]"
 msgstr "Bilinmeyen [%s]"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "Görüntüleme önizlemesi"
@@ -4175,7 +4225,7 @@ msgstr ""
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
 msgstr ""
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
@@ -4194,39 +4244,39 @@ msgstr ""
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr ""
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr ""
 
@@ -6150,10 +6200,6 @@ msgstr ""
 msgid "A person."
 msgstr ""
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr ""
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr ""
@@ -6174,6 +6220,10 @@ msgstr ""
 msgid "A class of Agents."
 msgstr ""
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr ""
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr ""
diff --git a/application/language/zh_CN.mo b/application/language/zh_CN.mo
index 23e452e8ad..71ec9263b8 100644
Binary files a/application/language/zh_CN.mo and b/application/language/zh_CN.mo differ
diff --git a/application/language/zh_CN.po b/application/language/zh_CN.po
index c80f8ccaa1..1a2aea0b20 100644
--- a/application/language/zh_CN.po
+++ b/application/language/zh_CN.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Hong Zhang <zhangh@unlv.nevada.edu>, 2018
+# John Flatness <john@zerocrates.org>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-13 15:51-0400\n"
+"POT-Creation-Date: 2020-01-27 13:06-0500\n"
 "PO-Revision-Date: 2017-06-13 18:56+0000\n"
-"Last-Translator: Hong Zhang <zhangh@unlv.nevada.edu>, 2018\n"
+"Last-Translator: John Flatness <john@zerocrates.org>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/omeka/teams/14184/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,19 +64,19 @@ msgstr "%1$s适配器没有实现批量删除操作。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:241
 #, php-format
-msgid "The \"%s\" field is not available in the %s entity class."
-msgstr "在%s实体等级中没有“%s”字段。"
+msgid "The \"%1$s\" field is not available in the %2$s entity class."
+msgstr "在%1$s实体等级中没有“%2$s”字段。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:586
 #: application/src/Api/Manager.php:209
 #, php-format
-msgid "Permission denied for the current user to %s the %s resource."
-msgstr "当前用户被拒绝授予权限于%s%s资源。"
+msgid "Permission denied for the current user to %1$s the %2$s resource."
+msgstr "当前用户被拒绝授予权限于%1$s%2$s资源。"
 
 #: application/src/Api/Adapter/AbstractEntityAdapter.php:628
 #, php-format
-msgid "%s entity with criteria %s not found"
-msgstr "未发现符合标准%s的%s实体"
+msgid "%1$s entity with criteria %2$s not found"
+msgstr "未发现符合标准%1$s的%2$s实体"
 
 #: application/src/Api/Adapter/SiteAdapter.php:136
 msgid "Welcome"
@@ -85,7 +86,7 @@ msgstr "欢迎"
 msgid "Welcome to your new site. This is an example page."
 msgstr "欢迎来到您的新网站。这是样板页面。"
 
-#: application/src/Api/Adapter/SiteAdapter.php:351
+#: application/src/Api/Adapter/SiteAdapter.php:358
 msgid "Browse"
 msgstr "浏览"
 
@@ -94,7 +95,7 @@ msgstr "浏览"
 msgid "The API does not support the \"%s\" resource."
 msgstr "API不支持“%s”资源。"
 
-#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:492
+#: application/src/Api/Representation/AbstractResourceEntityRepresentation.php:504
 #: application/view/common/block-layout/browse-preview.phtml:15
 #: application/view/omeka/site/item-set/browse.phtml:23
 #: application/view/omeka/site/item/browse.phtml:58
@@ -109,11 +110,11 @@ msgstr "默认"
 msgid "Asset uploads must be POSTed."
 msgstr "素材上传必须使用HTTP POST方法。"
 
-#: application/src/Controller/Admin/ItemController.php:211
+#: application/src/Controller/Admin/ItemController.php:212
 msgid "Add another item?"
 msgstr "添加下一个条目？"
 
-#: application/src/Controller/Admin/ItemSetController.php:35
+#: application/src/Controller/Admin/ItemSetController.php:36
 msgid "Add another item set?"
 msgstr "添加下一个条目集？"
 
@@ -196,8 +197,8 @@ msgstr "除非启用JavaScript，否则OpenSeadragon不可用。"
 
 #: application/src/Module/Manager.php:170
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be activated"
-msgstr "模块“%s”被标记为“%s”，无法激活"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be activated"
+msgstr "模块“%1$s”被标记为“%2$s”，无法激活"
 
 #: application/src/Module/Manager.php:181
 #, php-format
@@ -206,8 +207,8 @@ msgstr "激活时模块“%s”不在数据库中"
 
 #: application/src/Module/Manager.php:202
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be deactivated"
-msgstr "模块“%s”被标记为“%s”，无法禁用"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be deactivated"
+msgstr "模块“%1$s”被标记为“%2$s”，无法禁用"
 
 #: application/src/Module/Manager.php:213
 #, php-format
@@ -216,13 +217,13 @@ msgstr "禁用时模块“%s”不在数据库中"
 
 #: application/src/Module/Manager.php:233
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be installed"
-msgstr "模块“%s”被标记为“%s”，无法安装"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be installed"
+msgstr "模块“%1$s”被标记为“%2$s”，无法安装"
 
 #: application/src/Module/Manager.php:271
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be uninstalled"
-msgstr "模块“%s”被标记为“%s”，无法卸载"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be uninstalled"
+msgstr "模块“%1$s”被标记为“%2$s”，无法卸载"
 
 #: application/src/Module/Manager.php:288
 #, php-format
@@ -231,8 +232,8 @@ msgstr "卸载时模块“%s”不在数据库中"
 
 #: application/src/Module/Manager.php:309
 #, php-format
-msgid "Module \"%s\" is marked as \"%s\" and cannot be upgraded"
-msgstr "模块“%s”被标记为“%s”，无法升级"
+msgid "Module \"%1$s\" is marked as \"%2$s\" and cannot be upgraded"
+msgstr "模块“%1$s”被标记为“%2$s”，无法升级"
 
 #: application/src/Module/Manager.php:331
 #, php-format
@@ -241,8 +242,8 @@ msgstr "升级时在数据库中未发现“%s”模块"
 
 #: application/src/Module/Manager.php:410
 #, php-format
-msgid "Permission denied for the current user to %s the %s module."
-msgstr "当前用户被拒绝授予权限于%s%s模块。"
+msgid "Permission denied for the current user to %1$s the %2$s module."
+msgstr "当前用户被拒绝授予权限于%1$s%2$s模块。"
 
 #: application/src/Mvc/MvcListeners.php:436
 #, php-format
@@ -367,7 +368,7 @@ msgstr ""
 
 #: application/src/View/Helper/PasswordRequirements.php:67
 #, php-format
-msgid "Password must contain at least %s symbols: <code>%s</code>"
+msgid "Password must contain at least %1$s symbols: <code>%2$s</code>"
 msgstr ""
 
 #: application/src/View/Helper/SearchFilters.php:32
@@ -460,8 +461,9 @@ msgid "AND"
 msgstr "和"
 
 #: application/src/View/Helper/SearchFilters.php:124
-#: application/view/common/search-form.phtml:7
 #: application/view/common/search-form.phtml:8
+#: application/view/common/search-form.phtml:9
+#: application/view/common/search-form.phtml:10
 #: application/view/layout/layout-admin.phtml:62
 #: application/view/omeka/admin/item-set/search.phtml:13
 #: application/view/omeka/admin/item-set/sidebar-select.phtml:12
@@ -526,7 +528,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:80
 #: application/view/omeka/admin/user/show.phtml:29
 #: application/view/omeka/site-admin/index/users.phtml:31
-#: application/view/omeka/site-admin/index/users.phtml:47
+#: application/view/omeka/site-admin/index/users.phtml:46
 msgid "Role"
 msgstr "角色"
 
@@ -559,8 +561,8 @@ msgstr ""
 msgid "The maximum upload size is %s MB."
 msgstr "最大上传尺寸是%sMB。"
 
-#: application/src/View/Helper/UserBar.php:118
-#: application/src/View/Helper/UserBar.php:150
+#: application/src/View/Helper/UserBar.php:120
+#: application/src/View/Helper/UserBar.php:161
 #: application/view/omeka/admin/index/browse.phtml:48
 #: application/view/omeka/admin/item-set/browse.phtml:109
 #: application/view/omeka/admin/item-set/edit.phtml:14
@@ -580,7 +582,7 @@ msgstr "最大上传尺寸是%sMB。"
 msgid "Edit"
 msgstr "编辑"
 
-#: application/src/View/Helper/UserBar.php:157
+#: application/src/View/Helper/UserBar.php:154
 #: application/view/omeka/site-admin/index/show.phtml:17
 #: application/view/omeka/site-admin/page/edit.phtml:15
 msgid "View"
@@ -607,7 +609,7 @@ msgstr "搜索被分配给这里任意一个条目集的条目。"
 #: application/view/common/advanced-search/resource-class.phtml:31
 #: application/view/common/advanced-search/resource-template.phtml:32
 #: application/view/common/block-layout.phtml:12
-#: application/view/common/data-type-wrapper.phtml:12
+#: application/view/common/data-type-wrapper.phtml:10
 #: application/view/common/media-field-wrapper.phtml:13
 #: application/view/omeka/admin/item/manage-media.phtml:49
 msgid "Remove value"
@@ -619,6 +621,10 @@ msgstr "移除值"
 msgid "Add new item set"
 msgstr "添加新条目集"
 
+#: application/view/common/advanced-search/media-type.phtml:6
+msgid "Search by MIME type"
+msgstr ""
+
 #: application/view/common/advanced-search/properties.phtml:33
 msgid "Query text"
 msgstr ""
@@ -728,7 +734,7 @@ msgid "Block to be removed"
 msgstr "将被移除的段落"
 
 #: application/view/common/block-layout.phtml:13
-#: application/view/common/data-type-wrapper.phtml:13
+#: application/view/common/data-type-wrapper.phtml:11
 #: application/view/omeka/admin/item/manage-media.phtml:53
 #: application/view/omeka/admin/resource-template/show-property-row.phtml:40
 msgid "Restore value"
@@ -736,6 +742,7 @@ msgstr "恢复值"
 
 #: application/view/common/block-layout/item-with-metadata.phtml:12
 #: application/view/common/data-type/resource.phtml:29
+#: application/view/common/item-set-selector.phtml:10
 #: application/view/layout/layout-admin.phtml:72
 #: application/view/omeka/admin/item-set/add.phtml:6
 #: application/view/omeka/admin/item-set/browse.phtml:29
@@ -746,17 +753,17 @@ msgstr "恢复值"
 #: application/view/omeka/admin/item/show-details.phtml:19
 #: application/view/omeka/admin/item/show.phtml:63
 #: application/view/omeka/admin/user/show-details.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:24
+#: application/view/omeka/site-admin/index/resources.phtml:23
 #: application/view/omeka/site/item-set/browse.phtml:8
 #: application/view/omeka/site/item/show.phtml:24
 msgid "Item sets"
 msgstr "条目集"
 
-#: application/view/common/data-type-wrapper.phtml:10
+#: application/view/common/data-type-wrapper.phtml:8
 msgid "Value to be removed"
 msgstr "将被移除的值"
 
-#: application/view/common/data-type-wrapper.phtml:15
+#: application/view/common/data-type-wrapper.phtml:13
 #: application/view/common/media-field-wrapper.phtml:9
 #: application/view/omeka/admin/item-set/form.phtml:41
 #: application/view/omeka/admin/item/form.phtml:43
@@ -904,10 +911,6 @@ msgstr "点击一个条目集，加入到编辑面板中。"
 msgid "Filter item sets"
 msgstr "过滤条目集"
 
-#: application/view/common/item-set-selector.phtml:10
-msgid "All item sets"
-msgstr "所有条目集"
-
 #: application/view/common/item-set-selector.phtml:17
 #: application/view/omeka/admin/item-set/browse.phtml:93
 #: application/view/omeka/admin/item-set/show.phtml:17
@@ -945,7 +948,7 @@ msgstr "所有"
 #: application/view/omeka/admin/media/browse.phtml:79
 #: application/view/omeka/site-admin/index/index.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:39
-#: application/view/omeka/site-admin/index/resources.phtml:62
+#: application/view/omeka/site-admin/index/resources.phtml:61
 #: application/view/omeka/site-admin/index/show.phtml:28
 #: application/view/omeka/site-admin/page/index.phtml:18
 #: application/view/omeka/site/item/browse.phtml:14
@@ -997,8 +1000,8 @@ msgstr "下一个"
 
 #: application/view/common/pagination.phtml:28
 #, php-format
-msgid "%s–%s of %s"
-msgstr "%s的%s - %s"
+msgid "%1$s–%2$s of %3$s"
+msgstr "%1$s的%2$s - %3$s"
 
 #: application/view/common/pagination.phtml:30
 msgid "0 results"
@@ -1061,12 +1064,12 @@ msgstr "点击一个属性，加入到编辑面板中。"
 msgid "Filter properties"
 msgstr "过滤属性"
 
-#: application/view/common/resource-fields.phtml:33
+#: application/view/common/resource-fields.phtml:34
 #: application/view/omeka/admin/resource-template/form.phtml:32
 msgid "Add property"
 msgstr "添加属性"
 
-#: application/view/common/resource-fields.phtml:40
+#: application/view/common/resource-fields.phtml:41
 msgid ""
 "Omeka S automatically selects a thumbnail from among attached media for a "
 "resource. You may use an image of your choice instead by choosing an asset "
@@ -1159,17 +1162,17 @@ msgstr "登出"
 msgid "Log in"
 msgstr "登录"
 
-#: application/view/common/user-selector.phtml:10
+#: application/view/common/user-selector.phtml:11
 msgid "Click on a user to add it to the edit panel."
 msgstr ""
 
-#: application/view/common/user-selector.phtml:13
+#: application/view/common/user-selector.phtml:14
 msgid "Filter users"
 msgstr "过滤用户"
 
-#: application/view/common/user-selector.phtml:15
+#: application/view/common/user-selector.phtml:16
 #, php-format
-msgid "All users (%s)"
+msgid "Users (%s)"
 msgstr ""
 
 #: application/view/common/version-notification.phtml:8
@@ -1179,7 +1182,7 @@ msgstr "Omeka S 的新版本已经可用了。%s"
 
 #: application/view/common/version-notification.phtml:12
 #: application/view/omeka/admin/module/browse.phtml:62
-#: application/view/omeka/site-admin/index/theme.phtml:53
+#: application/view/omeka/site-admin/index/theme.phtml:55
 msgid "Get the new version."
 msgstr "获取新版本。"
 
@@ -1201,7 +1204,7 @@ msgid "Details:"
 msgstr "细节："
 
 #: application/view/layout/layout-admin.phtml:23
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 msgid "Resources"
 msgstr "资源"
 
@@ -1412,7 +1415,7 @@ msgstr "批量编辑条目集"
 #: application/view/omeka/admin/vocabulary/edit.phtml:13
 #: application/view/omeka/site-admin/index/edit.phtml:29
 #: application/view/omeka/site-admin/index/navigation.phtml:17
-#: application/view/omeka/site-admin/index/resources.phtml:32
+#: application/view/omeka/site-admin/index/resources.phtml:31
 #: application/view/omeka/site-admin/index/settings.phtml:10
 #: application/view/omeka/site-admin/index/theme-settings.phtml:12
 #: application/view/omeka/site-admin/index/theme.phtml:18
@@ -1458,7 +1461,7 @@ msgstr "标识符"
 #: application/view/omeka/admin/resource-template/browse.phtml:45
 #: application/view/omeka/site-admin/index/index.phtml:15
 #: application/view/omeka/site-admin/index/index.phtml:41
-#: application/view/omeka/site-admin/index/resources.phtml:63
+#: application/view/omeka/site-admin/index/resources.phtml:62
 msgid "Owner"
 msgstr "所有人"
 
@@ -1622,8 +1625,9 @@ msgstr "您确定要删除选定的条目集吗？"
 #: application/view/omeka/admin/item-set/browse.phtml:178
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s item sets and cannot be undone."
-msgstr "%s：该操作将永久删除%s条目集，并且不能被恢复。"
+"%1$s: this action will permanently delete %2$s item sets and cannot be "
+"undone."
+msgstr "%1$s：该操作将永久删除%2$s条目集，并且不能被恢复。"
 
 #: application/view/omeka/admin/item-set/browse.phtml:161
 #: application/view/omeka/admin/item-set/browse.phtml:179
@@ -1786,8 +1790,9 @@ msgstr "您确定要删除选定的条目吗？"
 #: application/view/omeka/admin/item/browse.phtml:158
 #: application/view/omeka/admin/item/browse.phtml:176
 #, php-format
-msgid "%s: this action will permanently delete %s items and cannot be undone."
-msgstr "%s：该操作将永久删除%s条目，并且不能被恢复。"
+msgid ""
+"%1$s: this action will permanently delete %2$s items and cannot be undone."
+msgstr "%1$s：该操作将永久删除%2$s条目，并且不能被恢复。"
 
 #: application/view/omeka/admin/item/browse.phtml:174
 msgid ""
@@ -1950,7 +1955,7 @@ msgstr ""
 #: application/view/omeka/admin/media/browse.phtml:188
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s medias and cannot be undone."
+"%1$s: this action will permanently delete %2$s medias and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/media/browse.phtml:186
@@ -2263,7 +2268,7 @@ msgid "You are editing %s users (except yourself)."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:36
-#: application/view/omeka/site-admin/index/users.phtml:75
+#: application/view/omeka/site-admin/index/users.phtml:70
 msgid "Add new user"
 msgstr "添加新用户"
 
@@ -2282,7 +2287,8 @@ msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:151
 #, php-format
-msgid "%s: this action will permanently delete %s users and cannot be undone."
+msgid ""
+"%1$s: this action will permanently delete %2$s users and cannot be undone."
 msgstr ""
 
 #: application/view/omeka/admin/user/browse.phtml:167
@@ -2294,7 +2300,7 @@ msgstr ""
 #: application/view/omeka/admin/user/browse.phtml:169
 #, php-format
 msgid ""
-"%s: this action will permanently delete %s users (except yourself) and "
+"%1$s: this action will permanently delete %2$s users (except yourself) and "
 "cannot be undone."
 msgstr ""
 
@@ -2383,7 +2389,7 @@ msgstr "命名空间URI："
 msgid "This vocabulary has no classes."
 msgstr "该词汇没有类。"
 
-#: application/view/omeka/admin/vocabulary/edit.phtml:19
+#: application/view/omeka/admin/vocabulary/edit.phtml:18
 msgid ""
 "You may update this vocabulary to a newer version. You will be able to "
 "review the changes before you accept."
@@ -2410,7 +2416,7 @@ msgstr "接受更改"
 #: application/view/omeka/site-admin/index/edit.phtml:7
 #: application/view/omeka/site-admin/index/index.phtml:21
 #: application/view/omeka/site-admin/index/navigation.phtml:10
-#: application/view/omeka/site-admin/index/resources.phtml:21
+#: application/view/omeka/site-admin/index/resources.phtml:20
 #: application/view/omeka/site-admin/index/settings.phtml:6
 #: application/view/omeka/site-admin/index/show.phtml:11
 #: application/view/omeka/site-admin/index/theme.phtml:11
@@ -2421,8 +2427,8 @@ msgstr "网站"
 
 #: application/view/omeka/index/index.phtml:25
 #, php-format
-msgid "Go to the %s to start working with %s."
-msgstr "前往%s，开始为%s工作。"
+msgid "Go to the %1$s to start working with %2$s."
+msgstr "前往%1$s，开始为%2$s工作。"
 
 #: application/view/omeka/install/index.phtml:11
 msgid "Install Omeka S"
@@ -2500,7 +2506,7 @@ msgid "Theme"
 msgstr "主题"
 
 #: application/view/omeka/site-admin/index/add.phtml:9
-#: application/view/omeka/site-admin/index/resources.phtml:23
+#: application/view/omeka/site-admin/index/resources.phtml:22
 msgid "Item pool"
 msgstr "条目池"
 
@@ -2547,16 +2553,12 @@ msgstr ""
 msgid "There are no available pages."
 msgstr "没有可用页面。"
 
-#: application/view/omeka/site-admin/index/resources.phtml:15
-msgid "Restore item set"
-msgstr "恢复条目集"
-
-#: application/view/omeka/site-admin/index/resources.phtml:37
+#: application/view/omeka/site-admin/index/resources.phtml:36
 #, php-format
 msgid "There are currently %s items in this site’s pool."
 msgstr "目前在该网站池里有%s条目。"
 
-#: application/view/omeka/site-admin/index/resources.phtml:69
+#: application/view/omeka/site-admin/index/resources.phtml:68
 msgid "No item sets are assigned to this site."
 msgstr "没有条目集被分配给该网站。"
 
@@ -2595,30 +2597,30 @@ msgstr "当前主题没有配置选项。"
 msgid "Current theme"
 msgstr "当前主题"
 
-#: application/view/omeka/site-admin/index/theme.phtml:43
+#: application/view/omeka/site-admin/index/theme.phtml:44
 msgid "Edit theme settings"
 msgstr "编辑主题设置"
 
-#: application/view/omeka/site-admin/index/theme.phtml:49
+#: application/view/omeka/site-admin/index/theme.phtml:51
 #, php-format
 msgid "A new version of this theme is available. %s"
 msgstr "该主题的新版本已经可用了。%s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:59
+#: application/view/omeka/site-admin/index/theme.phtml:61
 msgid "Error: this theme is invalid."
 msgstr "错误：该主题无效。"
 
-#: application/view/omeka/site-admin/index/theme.phtml:61
+#: application/view/omeka/site-admin/index/theme.phtml:63
 #, php-format
 msgid "ID: %s"
 msgstr "ID：%s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:62
+#: application/view/omeka/site-admin/index/theme.phtml:64
 #, php-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: application/view/omeka/site-admin/index/theme.phtml:64
+#: application/view/omeka/site-admin/index/theme.phtml:66
 msgid ""
 "Please contact the Omeka S administrator. This site will not be publicly "
 "available until the problem is resolved or you select another theme below."
@@ -2632,16 +2634,11 @@ msgstr "恢复"
 msgid "User permissions"
 msgstr "用户权限"
 
-#: application/view/omeka/site-admin/index/users.phtml:43
-#: application/view/omeka/site-admin/index/users.phtml:83
-msgid "User to be removed"
-msgstr "将被移除的用户"
-
-#: application/view/omeka/site-admin/index/users.phtml:73
+#: application/view/omeka/site-admin/index/users.phtml:68
 msgid "This site has no users. Add users using the interface to the right."
 msgstr "该网站尚无用户。用右边的界面添加用户。"
 
-#: application/view/omeka/site-admin/index/users.phtml:76
+#: application/view/omeka/site-admin/index/users.phtml:71
 msgid "Click on a user to add them to the site."
 msgstr "点击一个用户把他们添加到网站。"
 
@@ -2717,35 +2714,39 @@ msgstr "高级条目搜索"
 msgid "Item"
 msgstr "条目"
 
-#: application/config/module.config.php:616
+#: application/config/module.config.php:617
 msgid "Something went wrong"
 msgstr "出错了"
 
-#: application/config/module.config.php:621
+#: application/config/module.config.php:622
 msgid "You have unsaved changes."
 msgstr "您还有未保存的改变。"
 
 #: application/config/module.config.php:623
+msgid "Restore item set"
+msgstr "恢复条目集"
+
+#: application/config/module.config.php:624
 msgid "Close icon set"
 msgstr "关闭图标集"
 
-#: application/config/module.config.php:624
+#: application/config/module.config.php:625
 msgid "Open icon set"
 msgstr "打开图标集"
 
-#: application/config/module.config.php:626
+#: application/config/module.config.php:627
 msgid "Failed loading resource template from API"
 msgstr "从API加载资源模板失败了"
 
-#: application/config/module.config.php:627
+#: application/config/module.config.php:628
 msgid "Restore property"
 msgstr "恢复属性"
 
-#: application/config/module.config.php:629
+#: application/config/module.config.php:630
 msgid "Please enter a valid language tag"
 msgstr "请输入一个有效的语言标签"
 
-#: application/config/module.config.php:631
+#: application/config/module.config.php:632
 msgid "Description"
 msgstr "描述"
 
@@ -2804,25 +2805,25 @@ msgstr "无标题"
 
 #: application/src/File/Validator.php:65
 #, php-format
-msgid "Error validating \"%s\". Cannot store files with the media type \"%s\"."
-msgstr "确证“%s”时出错。无法保存媒体类型为“%s”的文件。"
+msgid "Error validating \"%1$s\". Cannot store files with the media type \"%2$s\"."
+msgstr "确证“%1$s”时出错。无法保存媒体类型为“%2$s”的文件。"
 
 #: application/src/File/Validator.php:78
 #, php-format
 msgid ""
-"Error validating \"%s\". Cannot store files with the resolved extension "
-"\"%s\"."
-msgstr "确证“%s”时出错。无法保存解析后缀为“%s”的文件。"
+"Error validating \"%1$s\". Cannot store files with the resolved extension "
+"\"%2$s\"."
+msgstr "确证“%1$s”时出错。无法保存解析后缀为“%2$s”的文件。"
 
 #: application/src/File/Downloader.php:71
 #, php-format
-msgid "Error downloading %s: %s"
-msgstr "下载%s错误：%s"
+msgid "Error downloading %1$s: %2$s"
+msgstr "下载%1$s错误：%2$s"
 
 #: application/src/File/Downloader.php:83
 #, php-format
-msgid "Error downloading %s: %s %s"
-msgstr "下载%s错误：%s %s"
+msgid "Error downloading %1$s: %2$s %3$s"
+msgstr "下载%1$s错误：%2$s %3$s"
 
 #: application/src/File/ThumbnailManager.php:102
 msgid "Missing thumbnail configuration."
@@ -2860,31 +2861,124 @@ msgstr "无效后备缩略图设置。"
 msgid "Resource template file"
 msgstr "资源模板文件"
 
-#: application/src/Form/VocabularyImportForm.php:20
-msgid ""
-"A concise vocabulary identifier, used as a shorthand proxy for the namespace"
-" URI."
-msgstr "简洁的词汇标识符，用来做命名空间的简化代理。"
+#: application/src/Form/VocabularyForm.php:23
+msgid "Basic info"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:32
+#: application/src/Form/VocabularyForm.php:30
+msgid "File"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:37
+msgid "Advanced"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:46
+msgid "Enter a human-readable title of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:58
+msgid "Enter a human-readable description of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:69
 msgid "Namespace URI"
 msgstr "命名空间URI"
 
-#: application/src/Form/VocabularyImportForm.php:33
+#: application/src/Form/VocabularyForm.php:70
+msgid ""
+"Enter the unique namespace URI used to identify the classes and properties "
+"of the vocabulary."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:81
+msgid "Namespace prefix"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:82
 msgid ""
-"The unique namespace URI used by the vocabulary to identify local member "
-"classes and properties."
-msgstr "被词汇用来识别本地成员类和属性的唯一的命名空间URI。"
+"Enter a concise vocabulary identifier used as a shorthand for the namespace "
+"URI."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:94
+msgid "Vocabulary file"
+msgstr "词汇文件"
+
+#: application/src/Form/VocabularyForm.php:95
+msgid ""
+"Choose a RDF vocabulary file. You must choose a file or enter a URL below."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:105
+msgid "Vocabulary URL"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:106
+msgid ""
+"Enter a RDF vocabulary URL. You must enter a URL or choose a file above."
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:46
-#: application/src/Form/VocabularyForm.php:15
-msgid "A human-readable title of the vocabulary."
-msgstr "词汇的人类可读标题。"
+#: application/src/Form/VocabularyForm.php:116
+msgid "File format"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:118
+msgid "[Autodetect]"
+msgstr ""
 
-#: application/src/Form/VocabularyImportForm.php:59
-#: application/src/Form/VocabularyForm.php:28
-msgid "A human-readable description of the vocabulary."
-msgstr "词汇的人类可读描述。"
+#: application/src/Form/VocabularyForm.php:119
+msgid "JSON-LD (.jsonld)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:120
+msgid "N-Triples (.nt)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:121
+msgid "Notation3 (.n3)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:122
+msgid "RDF/XML (.rdf)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:123
+msgid "Turtle (.ttl)"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:135
+msgid "Preferred language"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:136
+msgid ""
+"Enter the preferred language of the labels and comments using an <a "
+"target=\"_blank\" href=\"https://www.w3.org/International/articles/language-"
+"tags/\">IETF language tag</a>. Defaults to the first available."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:147
+msgid "Label property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:148
+msgid ""
+"Enter the label property. This is typically only needed if the vocabulary "
+"uses an unconventional property for labels. Please use the full property URI"
+" enclosed in angle brackets."
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:158
+msgid "Comment property"
+msgstr ""
+
+#: application/src/Form/VocabularyForm.php:159
+msgid ""
+"Enter the comment property. This is typically only needed if the vocabulary "
+"uses an unconventional property for comments. Please use the full property "
+"URI enclosed in angle brackets."
+msgstr ""
 
 #: application/src/Form/ResourceForm.php:30
 #: application/src/Form/ResourceBatchUpdateForm.php:69
@@ -2924,7 +3018,7 @@ msgid "Suggested class"
 msgstr "受建议的类"
 
 #: application/src/Form/SiteSettingsForm.php:28
-#: application/src/Form/SettingForm.php:105
+#: application/src/Form/SettingForm.php:109
 msgid "General"
 msgstr "一般信息"
 
@@ -2974,12 +3068,12 @@ msgid "Always"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:90
-#: application/src/Form/SettingForm.php:232
+#: application/src/Form/SettingForm.php:236
 msgid "Disable JSON-LD embed"
 msgstr ""
 
 #: application/src/Form/SiteSettingsForm.php:91
-#: application/src/Form/SettingForm.php:233
+#: application/src/Form/SettingForm.php:237
 msgid ""
 "By default, Omeka embeds JSON-LD in resource browse and show pages for the "
 "purpose of machine-readable metadata discovery. Check this to disable "
@@ -2989,7 +3083,7 @@ msgstr ""
 #: application/src/Form/SiteSettingsForm.php:103
 #: application/src/Form/InstallationForm.php:112
 #: application/src/Form/UserForm.php:129
-#: application/src/Form/SettingForm.php:205
+#: application/src/Form/SettingForm.php:209
 msgid "Locale"
 msgstr "区域"
 
@@ -3004,7 +3098,7 @@ msgid "Restrict browse to attached items"
 msgstr "限制只浏览附属条目"
 
 #: application/src/Form/SiteSettingsForm.php:137
-#: application/src/Form/SettingForm.php:156
+#: application/src/Form/SettingForm.php:160
 msgid "Results per page"
 msgstr "每页结果数"
 
@@ -3130,12 +3224,12 @@ msgid "Confirm email"
 msgstr "确认电邮地址"
 
 #: application/src/Form/InstallationForm.php:80
-#: application/src/Form/SettingForm.php:127
+#: application/src/Form/SettingForm.php:131
 msgid "Installation title"
 msgstr "安装标题"
 
 #: application/src/Form/InstallationForm.php:98
-#: application/src/Form/SettingForm.php:142
+#: application/src/Form/SettingForm.php:146
 msgid "Time zone"
 msgstr "时区"
 
@@ -3206,7 +3300,7 @@ msgid "Confirm"
 msgstr "确认"
 
 #: application/src/Form/UserForm.php:130
-#: application/src/Form/SettingForm.php:206
+#: application/src/Form/SettingForm.php:210
 msgid "Global locale/language code for all interfaces."
 msgstr "所有界面的全局区域/语言代码。"
 
@@ -3230,113 +3324,113 @@ msgstr "确认新密码"
 msgid "New key label"
 msgstr "新密钥标签"
 
-#: application/src/Form/SettingForm.php:114
+#: application/src/Form/SettingForm.php:118
 msgid "Administrator email"
 msgstr "管理员电邮"
 
-#: application/src/Form/SettingForm.php:157
+#: application/src/Form/SettingForm.php:161
 msgid "The maximum number of results per page on browse pages."
 msgstr "浏览页面上每页显示的最大结果数。"
 
-#: application/src/Form/SettingForm.php:170
+#: application/src/Form/SettingForm.php:174
 msgid "Property label information"
 msgstr "属性标签信息"
 
-#: application/src/Form/SettingForm.php:171
+#: application/src/Form/SettingForm.php:175
 msgid "The additional information that accompanies labels on resource pages."
 msgstr "资源页面上和标签相伴的附加信息。"
 
-#: application/src/Form/SettingForm.php:173
+#: application/src/Form/SettingForm.php:177
 msgid "None"
 msgstr "无"
 
-#: application/src/Form/SettingForm.php:174
+#: application/src/Form/SettingForm.php:178
 msgid "Show Vocabulary"
 msgstr "显示词汇"
 
-#: application/src/Form/SettingForm.php:175
+#: application/src/Form/SettingForm.php:179
 msgid "Show Term"
 msgstr "显示术语"
 
-#: application/src/Form/SettingForm.php:188
+#: application/src/Form/SettingForm.php:192
 msgid "Default site"
 msgstr "默认网站"
 
-#: application/src/Form/SettingForm.php:189
+#: application/src/Form/SettingForm.php:193
 msgid ""
 "Select which site should appear when users go to the front page of the "
 "installation."
 msgstr "选择当用户前往安装的首页时要显示的网站。"
 
-#: application/src/Form/SettingForm.php:194
+#: application/src/Form/SettingForm.php:198
 msgid "No default (show index of sites)"
 msgstr "没有默认（显示网站索引）"
 
-#: application/src/Form/SettingForm.php:219
+#: application/src/Form/SettingForm.php:223
 msgid "Enable version notifications"
 msgstr "启用版本通知"
 
-#: application/src/Form/SettingForm.php:220
+#: application/src/Form/SettingForm.php:224
 msgid ""
 "Enable notifications when a new version of Omeka S, modules, or themes are "
 "available."
 msgstr "启用当Omeka S、模块、或主题的新版本可用时的通知功能。"
 
-#: application/src/Form/SettingForm.php:245
+#: application/src/Form/SettingForm.php:249
 msgid "Default content visibility to Private"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:246
+#: application/src/Form/SettingForm.php:250
 msgid ""
 "If checked, all items, item sets and sites newly created will have their "
 "visibility set to private by default."
 msgstr ""
 
-#: application/src/Form/SettingForm.php:258
+#: application/src/Form/SettingForm.php:262
 msgid "Index full-text search"
 msgstr ""
 
-#: application/src/Form/SettingForm.php:272
+#: application/src/Form/SettingForm.php:276
 msgid "Security"
 msgstr "安全"
 
-#: application/src/Form/SettingForm.php:281
+#: application/src/Form/SettingForm.php:285
 msgid "Use HTMLPurifier"
 msgstr "使用HTMLPurifier"
 
-#: application/src/Form/SettingForm.php:282
+#: application/src/Form/SettingForm.php:286
 msgid "Clean up user-entered HTML."
 msgstr "清理用户输入的HTML。"
 
-#: application/src/Form/SettingForm.php:294
+#: application/src/Form/SettingForm.php:298
 msgid "Disable file validation"
 msgstr "禁用文件验证"
 
-#: application/src/Form/SettingForm.php:295
+#: application/src/Form/SettingForm.php:299
 msgid "Check this to disable file media type and extension validation."
 msgstr "点选此处以禁用文件媒体类型和后缀验证。"
 
-#: application/src/Form/SettingForm.php:304
+#: application/src/Form/SettingForm.php:308
 msgid "Allowed media types"
 msgstr "允许的媒体类型"
 
-#: application/src/Form/SettingForm.php:305
+#: application/src/Form/SettingForm.php:309
 msgid "A comma-separated list of allowed media types for file uploads."
 msgstr "文件上传允许的以逗号分隔的媒体类型列表。"
 
-#: application/src/Form/SettingForm.php:317
+#: application/src/Form/SettingForm.php:321
 msgid "Allowed file extensions"
 msgstr "允许的文件名后缀"
 
-#: application/src/Form/SettingForm.php:318
+#: application/src/Form/SettingForm.php:322
 msgid "A comma-separated list of allowed file extensions for file uploads."
 msgstr "文件上传允许的以逗号分隔的文件后缀列表。"
 
-#: application/src/Form/SettingForm.php:332
+#: application/src/Form/SettingForm.php:336
 msgid "reCAPTCHA site key"
 msgstr "reCAPTCHA网站密钥"
 
-#: application/src/Form/SettingForm.php:343
+#: application/src/Form/SettingForm.php:347
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHA密钥"
 
@@ -3362,7 +3456,7 @@ msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:39
 #, php-format
-msgid "contain at least %s symbols: %s"
+msgid "contain at least %1$s symbols: %2$s"
 msgstr ""
 
 #: application/src/Form/Element/PasswordConfirm.php:43
@@ -3389,56 +3483,6 @@ msgstr "三位或六位数十六进制色彩，或“透明的”"
 msgid "Invalid color format"
 msgstr "无效色彩格式"
 
-#: application/src/Form/Element/VocabularyFetch.php:15
-msgid "Vocabulary file"
-msgstr "词汇文件"
-
-#: application/src/Form/Element/VocabularyFetch.php:16
-msgid "Choose a RDF vocabulary file. You must choose a file or enter a URL."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:26
-msgid "Vocabulary URL"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:27
-msgid "Enter a RDF vocabulary URL. You must enter a URL or choose a file."
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:37
-msgid "File format"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:39
-msgid "[Autodetect]"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:40
-msgid "JSON-LD (.jsonld)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:41
-msgid "N-Triples (.nt)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:42
-msgid "Notation3 (.n3)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:43
-msgid "RDF/XML (.rdf)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:44
-msgid "Turtle (.ttl)"
-msgstr ""
-
-#: application/src/Form/Element/VocabularyFetch.php:57
-msgid ""
-"Enter the preferred language of the labels and comments using an IETF "
-"language tag. Defaults to the first available."
-msgstr ""
-
 #: application/src/Form/Element/Recaptcha.php:99
 msgid "You must verify that you are human by completing the CAPTCHA."
 msgstr "您必须完成CAPTCHA以证实您是人类。"
@@ -3504,15 +3548,15 @@ msgstr "用户权限已成功更新"
 msgid "Site theme successfully updated"
 msgstr "网站主题已成功更新"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:401
+#: application/src/Controller/SiteAdmin/IndexController.php:403
 msgid "Theme settings successfully updated"
 msgstr "主题设置已成功更新"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:418
+#: application/src/Controller/SiteAdmin/IndexController.php:420
 msgid "Site successfully deleted"
 msgstr "网站已成功删除"
 
-#: application/src/Controller/SiteAdmin/IndexController.php:441
+#: application/src/Controller/SiteAdmin/IndexController.php:443
 msgid "site"
 msgstr "网站"
 
@@ -3588,8 +3632,8 @@ msgstr "资源模板已成功创建。%s"
 
 #: application/src/Controller/Admin/UserController.php:44
 #: application/src/Controller/Admin/UserController.php:49
-#: application/src/Controller/Admin/ItemSetController.php:85
-#: application/src/Controller/Admin/ItemSetController.php:90
+#: application/src/Controller/Admin/ItemSetController.php:87
+#: application/src/Controller/Admin/ItemSetController.php:92
 #: application/src/Controller/Admin/MediaController.php:27
 #: application/src/Controller/Admin/MediaController.php:32
 #: application/src/Controller/Admin/ItemController.php:42
@@ -3624,9 +3668,9 @@ msgid ""
 "API key successfully created.<br><br>Here is your key ID and credential for "
 "access to the API. WARNING: \"key_credential\" will be unretrievable after "
 "you navigate away from this page.<br><br>key_identity: "
-"<code>%s</code><br>key_credential: <code>%s</code>"
+"<code>%1$s</code><br>key_credential: <code>%2$s</code>"
 msgstr ""
-"API密钥已成功创建。<br><br>这里是您访问API需要的密钥ID和凭证。警告：在您离开本页面后，“key_credential”将不再能获取。<br><br>key_identity：<code>%s</code><br>key_credential：<code>%s</code>"
+"API密钥已成功创建。<br><br>这里是您访问API需要的密钥ID和凭证。警告：在您离开本页面后，“key_credential”将不再能获取。<br><br>key_identity：<code>%1$s</code><br>key_credential：<code>%2$s</code>"
 
 #: application/src/Controller/Admin/UserController.php:268
 msgid "user"
@@ -3668,48 +3712,48 @@ msgstr ""
 msgid "Editing users. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/ItemSetController.php:31
+#: application/src/Controller/Admin/ItemSetController.php:32
 #, php-format
 msgid "Item set successfully created. %s"
 msgstr "条目集已成功创建。%s"
 
-#: application/src/Controller/Admin/ItemSetController.php:67
+#: application/src/Controller/Admin/ItemSetController.php:69
 msgid "Item set successfully updated"
 msgstr "条目集已成功更新"
 
-#: application/src/Controller/Admin/ItemSetController.php:153
+#: application/src/Controller/Admin/ItemSetController.php:155
 msgid "item set"
 msgstr "条目集"
 
-#: application/src/Controller/Admin/ItemSetController.php:168
+#: application/src/Controller/Admin/ItemSetController.php:170
 msgid "Item set successfully deleted"
 msgstr "条目集已成功删除"
 
-#: application/src/Controller/Admin/ItemSetController.php:189
+#: application/src/Controller/Admin/ItemSetController.php:191
 msgid "You must select at least one item set to batch delete."
 msgstr "您必须选择至少一个条目集以批量删除。"
 
-#: application/src/Controller/Admin/ItemSetController.php:198
+#: application/src/Controller/Admin/ItemSetController.php:200
 msgid "Item sets successfully deleted"
 msgstr "条目集已成功删除"
 
-#: application/src/Controller/Admin/ItemSetController.php:224
+#: application/src/Controller/Admin/ItemSetController.php:226
 msgid "Deleting item sets. This may take a while."
 msgstr "正在删除条目集。这需要一段时间。"
 
-#: application/src/Controller/Admin/ItemSetController.php:242
+#: application/src/Controller/Admin/ItemSetController.php:244
 msgid "You must select at least one item set to batch edit."
 msgstr "您必须选择至少一个条目集以批量编辑。"
 
-#: application/src/Controller/Admin/ItemSetController.php:262
+#: application/src/Controller/Admin/ItemSetController.php:264
 msgid "Item sets successfully edited"
 msgstr "条目集已成功编辑"
 
-#: application/src/Controller/Admin/ItemSetController.php:314
+#: application/src/Controller/Admin/ItemSetController.php:316
 msgid "Editing item sets. This may take a while."
 msgstr "正在编辑条目集。这需要一段时间。"
 
-#: application/src/Controller/Admin/VocabularyController.php:60
+#: application/src/Controller/Admin/VocabularyController.php:59
 msgid "vocabulary"
 msgstr "词汇"
 
@@ -3718,51 +3762,51 @@ msgstr "词汇"
 msgid "Vocabulary successfully imported. %s"
 msgstr "词汇已成功输入。%s"
 
-#: application/src/Controller/Admin/VocabularyController.php:170
+#: application/src/Controller/Admin/VocabularyController.php:176
 msgid "Please review these changes before you accept them."
 msgstr "在接受这些更新前，请先审核。"
 
-#: application/src/Controller/Admin/VocabularyController.php:178
+#: application/src/Controller/Admin/VocabularyController.php:184
 msgid "Vocabulary successfully updated"
 msgstr "词汇已成功更新"
 
-#: application/src/Controller/Admin/VocabularyController.php:198
+#: application/src/Controller/Admin/VocabularyController.php:204
 msgid "Changes to the vocabulary successfully made"
 msgstr "已成功完成对词汇的更新"
 
-#: application/src/Controller/Admin/VocabularyController.php:214
+#: application/src/Controller/Admin/VocabularyController.php:220
 msgid "Vocabulary successfully deleted"
 msgstr "词汇已成功删除"
 
-#: application/src/Controller/Admin/MediaController.php:57
+#: application/src/Controller/Admin/MediaController.php:59
 msgid "Media successfully updated"
 msgstr "媒体已成功更新"
 
-#: application/src/Controller/Admin/MediaController.php:123
+#: application/src/Controller/Admin/MediaController.php:125
 msgid "Media successfully deleted"
 msgstr "媒体已成功删除"
 
-#: application/src/Controller/Admin/MediaController.php:157
+#: application/src/Controller/Admin/MediaController.php:159
 msgid "You must select at least one media to batch delete."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:166
+#: application/src/Controller/Admin/MediaController.php:168
 msgid "Medias successfully deleted"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:192
+#: application/src/Controller/Admin/MediaController.php:194
 msgid "Deleting medias. This may take a while."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:210
+#: application/src/Controller/Admin/MediaController.php:212
 msgid "You must select at least one media to batch edit."
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:230
+#: application/src/Controller/Admin/MediaController.php:232
 msgid "Medias successfully edited"
 msgstr ""
 
-#: application/src/Controller/Admin/MediaController.php:282
+#: application/src/Controller/Admin/MediaController.php:284
 msgid "Editing medias. This may take a while."
 msgstr ""
 
@@ -3786,24 +3830,24 @@ msgstr "条目已成功删除"
 msgid "Deleting items. This may take a while."
 msgstr "正在删除条目。这需要一段时间。"
 
-#: application/src/Controller/Admin/ItemController.php:207
+#: application/src/Controller/Admin/ItemController.php:208
 #, php-format
 msgid "Item successfully created. %s"
 msgstr "条目已成功创建。%s"
 
-#: application/src/Controller/Admin/ItemController.php:243
+#: application/src/Controller/Admin/ItemController.php:245
 msgid "Item successfully updated"
 msgstr "条目已成功更新"
 
-#: application/src/Controller/Admin/ItemController.php:270
+#: application/src/Controller/Admin/ItemController.php:272
 msgid "You must select at least one item to batch edit."
 msgstr "您必须选择最少一个条目以批量编辑。"
 
-#: application/src/Controller/Admin/ItemController.php:290
+#: application/src/Controller/Admin/ItemController.php:292
 msgid "Items successfully edited"
 msgstr "条目已成功编辑"
 
-#: application/src/Controller/Admin/ItemController.php:342
+#: application/src/Controller/Admin/ItemController.php:344
 msgid "Editing items. This may take a while."
 msgstr "正在编辑条目。这需要一段时间。"
 
@@ -3929,14 +3973,14 @@ msgstr "上传文件"
 #, php-format
 msgid ""
 "You must upgrade Omeka S to at least version 1.0.0 before upgrading to "
-"version %s. You are currently on version %s."
+"version %1$s. You are currently on version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:54
 #, php-format
 msgid ""
-"The installed PHP version (%s) is too low. Omeka requires at least version "
-"%s."
+"The installed PHP version (%1$s) is too low. Omeka requires at least version"
+" %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:62
@@ -3947,15 +3991,15 @@ msgstr ""
 #: application/src/Stdlib/Environment.php:81
 #, php-format
 msgid ""
-"The installed MySQL version (%s) is too low. Omeka requires at least version"
-" %s."
+"The installed MySQL version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Stdlib/Environment.php:89
 #, php-format
 msgid ""
-"The installed MariaDB version (%s) is too low. Omeka requires at least "
-"version %s."
+"The installed MariaDB version (%1$s) is too low. Omeka requires at least "
+"version %2$s."
 msgstr ""
 
 #: application/src/Permissions/Acl.php:21
@@ -4010,55 +4054,63 @@ msgstr "条目陈列"
 msgid "Item with metadata"
 msgstr "有元数据的条目"
 
-#: application/src/Site/BlockLayout/Media.php:60
-msgid "Thumbnail alignment"
-msgstr "缩略图列队"
+#: application/src/Site/BlockLayout/Media.php:14
+msgid "Media Embed"
+msgstr ""
+
+#: application/src/Site/BlockLayout/Media.php:61
+msgid "Alignment"
+msgstr ""
 
 #: application/src/Site/BlockLayout/Fallback.php:28
 #, php-format
 msgid "Unknown [%s]"
 msgstr "未知的【%s】"
 
-#: application/src/Site/BlockLayout/ListOfSites.php:22
+#: application/src/Site/BlockLayout/ListOfSites.php:23
 msgid "List of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:37
+#: application/src/Site/BlockLayout/ListOfSites.php:38
 msgid "Alphabetical"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:38
+#: application/src/Site/BlockLayout/ListOfSites.php:39
 msgid "Oldest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:39
+#: application/src/Site/BlockLayout/ListOfSites.php:40
 msgid "Newest first"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:50
+#: application/src/Site/BlockLayout/ListOfSites.php:51
 msgid "Max number of sites"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:51
+#: application/src/Site/BlockLayout/ListOfSites.php:52
 msgid "An empty value means no limit."
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:55
+#: application/src/Site/BlockLayout/ListOfSites.php:56
 msgid "Unlimited"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:63
+#: application/src/Site/BlockLayout/ListOfSites.php:64
 msgid "Pagination"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:64
+#: application/src/Site/BlockLayout/ListOfSites.php:65
 msgid "Show pagination (only if a limit is set)"
 msgstr ""
 
-#: application/src/Site/BlockLayout/ListOfSites.php:74
+#: application/src/Site/BlockLayout/ListOfSites.php:75
 msgid "Show summaries"
 msgstr ""
 
+#: application/src/Site/BlockLayout/ListOfSites.php:85
+msgid "Exclude current site"
+msgstr ""
+
 #: application/src/Site/BlockLayout/BrowsePreview.php:15
 msgid "Browse preview"
 msgstr "浏览预展"
@@ -4166,8 +4218,8 @@ msgstr "媒体必须是数列"
 
 #: application/src/Api/Adapter/AbstractResourceEntityAdapter.php:168
 #, php-format
-msgid "The \"%s\" resource template requires a \"%s\" value"
-msgstr "“%s”资源模板需要一个“%s”值"
+msgid "The \"%1$s\" resource template requires a \"%2$s\" value"
+msgstr "“%1$s”资源模板需要一个“%2$s”值"
 
 #: application/src/Api/Adapter/SiteAdapter.php:230
 msgid "A site must have a title."
@@ -4185,39 +4237,39 @@ msgstr "网站必须有条目池数据。"
 msgid "A homepage must belong to its parent site."
 msgstr ""
 
-#: application/src/Api/Adapter/SiteAdapter.php:297
+#: application/src/Api/Adapter/SiteAdapter.php:304
 msgid "Invalid navigation: navigation must be an array"
 msgstr "无效导航：导航必须是数列"
 
-#: application/src/Api/Adapter/SiteAdapter.php:306
+#: application/src/Api/Adapter/SiteAdapter.php:313
 msgid "Invalid navigation: link missing type"
 msgstr "无效导航：链接缺失类型"
 
-#: application/src/Api/Adapter/SiteAdapter.php:310
+#: application/src/Api/Adapter/SiteAdapter.php:317
 msgid "Invalid navigation: link missing data"
 msgstr "无效导航：链接缺失数据"
 
-#: application/src/Api/Adapter/SiteAdapter.php:314
+#: application/src/Api/Adapter/SiteAdapter.php:321
 msgid "Invalid navigation: invalid link data"
 msgstr "无效导航：无效链接数据"
 
-#: application/src/Api/Adapter/SiteAdapter.php:319
+#: application/src/Api/Adapter/SiteAdapter.php:326
 msgid "Invalid navigation: page links must be unique"
 msgstr "无效导航：页面链接必须是唯一的"
 
-#: application/src/Api/Adapter/SiteAdapter.php:326
+#: application/src/Api/Adapter/SiteAdapter.php:333
 msgid "Invalid navigation: links must be an array"
 msgstr "无效导航：链接必须是数列"
 
-#: application/src/Api/Adapter/MediaAdapter.php:89
+#: application/src/Api/Adapter/MediaAdapter.php:97
 msgid "Media must set an ingester."
 msgstr "媒体必须设定一个获取器。"
 
-#: application/src/Api/Adapter/MediaAdapter.php:111
+#: application/src/Api/Adapter/MediaAdapter.php:119
 msgid "Media must set a valid ingester."
 msgstr "媒体必须设定一个有效获取器。"
 
-#: application/src/Api/Adapter/MediaAdapter.php:147
+#: application/src/Api/Adapter/MediaAdapter.php:155
 msgid "Media must belong to an item."
 msgstr "媒体必须属于一个条目。"
 
@@ -6144,10 +6196,6 @@ msgstr "人"
 msgid "A person."
 msgstr "一个人。"
 
-#. Class comment for Friend of a Friend:Agent
-msgid "An agent (eg. person, group, software or physical artifact)."
-msgstr "一个代理（譬如：人、群体、软件或物理人工制品）。"
-
 #. Class comment for Friend of a Friend:Document
 msgid "A document."
 msgstr "一份文件。"
@@ -6168,6 +6216,10 @@ msgstr "群组"
 msgid "A class of Agents."
 msgstr "一类代理。"
 
+#. Class comment for Friend of a Friend:Agent
+msgid "An agent (eg. person, group, software or physical artifact)."
+msgstr "一个代理（譬如：人、群体、软件或物理人工制品）。"
+
 #. Class label for Friend of a Friend:Project
 msgid "Project"
 msgstr "项目"
diff --git a/application/src/Api/Adapter/AbstractAdapter.php b/application/src/Api/Adapter/AbstractAdapter.php
index c7d12e104c..3a0e8427b4 100644
--- a/application/src/Api/Adapter/AbstractAdapter.php
+++ b/application/src/Api/Adapter/AbstractAdapter.php
@@ -4,10 +4,10 @@
 use Omeka\Api\Exception;
 use Omeka\Api\Request;
 use Omeka\Api\ResourceInterface;
-use Zend\EventManager\Event;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\Event;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Abstract API adapter.
diff --git a/application/src/Api/Adapter/AbstractEntityAdapter.php b/application/src/Api/Adapter/AbstractEntityAdapter.php
index a34f267210..458f8cf67b 100644
--- a/application/src/Api/Adapter/AbstractEntityAdapter.php
+++ b/application/src/Api/Adapter/AbstractEntityAdapter.php
@@ -10,7 +10,7 @@
 use Omeka\Entity\User;
 use Omeka\Entity\EntityInterface;
 use Omeka\Stdlib\ErrorStore;
-use Zend\EventManager\Event;
+use Laminas\EventManager\Event;
 
 /**
  * Abstract entity API adapter.
@@ -238,7 +238,7 @@ public function search(Request $request)
             $fieldNames = $this->getEntityManager()->getClassMetadata($entityClass)->getFieldNames();
             if (!in_array($scalarField, $fieldNames)) {
                 throw new Exception\BadRequestException(sprintf(
-                    $this->getTranslator()->translate('The "%s" field is not available in the %s entity class.'),
+                    $this->getTranslator()->translate('The "%1$s" field is not available in the %2$s entity class.'),
                     $scalarField, $entityClass
                 ));
             }
@@ -583,7 +583,7 @@ protected function authorize(EntityInterface $entity, $privilege)
         if (!$acl->userIsAllowed($entity, $privilege)) {
             throw new Exception\PermissionDeniedException(sprintf(
                 $this->getTranslator()->translate(
-                    'Permission denied for the current user to %s the %s resource.'
+                    'Permission denied for the current user to %1$s the %2$s resource.'
                 ),
                 $privilege, $entity->getResourceId()
             ));
@@ -625,7 +625,7 @@ public function findEntity($criteria, $request = null)
         $entity = $qb->getQuery()->getOneOrNullResult();
         if (!$entity) {
             throw new Exception\NotFoundException(sprintf(
-                $this->getTranslator()->translate('%s entity with criteria %s not found'),
+                $this->getTranslator()->translate('%1$s entity with criteria %2$s not found'),
                 $entityClass, json_encode($criteria)
             ));
         }
diff --git a/application/src/Api/Adapter/AbstractResourceEntityAdapter.php b/application/src/Api/Adapter/AbstractResourceEntityAdapter.php
index 9472ac61ec..aa40f94c8b 100644
--- a/application/src/Api/Adapter/AbstractResourceEntityAdapter.php
+++ b/application/src/Api/Adapter/AbstractResourceEntityAdapter.php
@@ -165,7 +165,7 @@ function ($key, $element) use ($requiredProp) {
                 );
                 if (!$propExists) {
                     $errorStore->addError('o:resource_template_property', new Message(
-                        'The "%s" resource template requires a "%s" value', // @translate
+                        'The "%1$s" resource template requires a "%2$s" value', // @translate
                         $resourceTemplate->getLabel(),
                         $requiredProp->getAlternateLabel()
                             ? $requiredProp->getAlternateLabel()
diff --git a/application/src/Api/Adapter/AdapterInterface.php b/application/src/Api/Adapter/AdapterInterface.php
index 960aff9834..4026502729 100644
--- a/application/src/Api/Adapter/AdapterInterface.php
+++ b/application/src/Api/Adapter/AdapterInterface.php
@@ -4,9 +4,9 @@
 use Omeka\Api\Request;
 use Omeka\Api\Response;
 use Omeka\Api\ResourceInterface as ApiResourceInterface;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * API adapter interface.
diff --git a/application/src/Api/Adapter/ItemAdapter.php b/application/src/Api/Adapter/ItemAdapter.php
index 5c583d5b61..76ed105a4d 100644
--- a/application/src/Api/Adapter/ItemAdapter.php
+++ b/application/src/Api/Adapter/ItemAdapter.php
@@ -54,20 +54,13 @@ public function buildQuery(QueryBuilder $qb, array $query)
         }
 
         if (isset($query['site_id']) && is_numeric($query['site_id'])) {
-            $siteAdapter = $this->getAdapter('sites');
-            try {
-                $site = $siteAdapter->findEntity($query['site_id']);
-                $params = $site->getItemPool();
-                if (!is_array($params)) {
-                    $params = [];
-                }
-                // Avoid potential infinite recursion
-                unset($params['site_id']);
-
-                $this->buildQuery($qb, $params);
-            } catch (Exception\NotFoundException $e) {
-                $site = null;
-            }
+            $siteAlias = $this->createAlias();
+            $qb->innerJoin(
+                'omeka_root.sites', $siteAlias, 'WITH', $qb->expr()->eq(
+                    "$siteAlias.id",
+                    $this->createNamedParameter($qb, $query['site_id'])
+                )
+            );
 
             if (isset($query['site_attachments_only']) && $query['site_attachments_only']) {
                 $siteBlockAttachmentsAlias = $this->createAlias();
@@ -95,6 +88,9 @@ public function buildQuery(QueryBuilder $qb, array $query)
                     $this->createNamedParameter($qb, $query['site_id']))
                 );
             }
+        } elseif (isset($query['in_sites']) && $query['in_sites']) {
+            $siteAlias = $this->createAlias();
+            $qb->innerJoin('omeka_root.sites', $siteAlias);
         }
     }
 
@@ -119,6 +115,7 @@ public function hydrate(Request $request, EntityInterface $entity,
     ) {
         parent::hydrate($request, $entity, $errorStore);
 
+        $isCreate = Request::CREATE === $request->getOperation();
         $isUpdate = Request::UPDATE === $request->getOperation();
         $isPartial = $isUpdate && $request->getOption('isPartial');
         $append = $isPartial && 'append' === $request->getOption('collectionAction');
@@ -162,6 +159,59 @@ public function hydrate(Request $request, EntityInterface $entity,
                 }
             }
         }
+        if ($isCreate && !is_array($request->getValue('o:site'))) {
+            // On CREATE and when no "o:site" array is passed, assign this item
+            // to all sites where assignNewItems=true.
+            $dql = '
+                SELECT site
+                FROM Omeka\Entity\Site site
+                WHERE site.assignNewItems = true';
+            $query = $this->getEntityManager()->createQuery($dql);
+            $sites = $entity->getSites();
+            foreach ($query->getResult() as $site) {
+                $sites->set($site->getId(), $site);
+            }
+        } elseif ($this->shouldHydrate($request, 'o:site')) {
+            $acl = $this->getServiceLocator()->get('Omeka\Acl');
+            $sitesData = $request->getValue('o:site', []);
+            $siteAdapter = $this->getAdapter('sites');
+            $sites = $entity->getSites();
+            $sitesToRetain = [];
+
+            foreach ($sitesData as $siteData) {
+                if (is_array($siteData) && isset($siteData['o:id'])) {
+                    $siteId = $siteData['o:id'];
+                } elseif (is_numeric($siteData)) {
+                    $siteId = $siteData;
+                } else {
+                    continue;
+                }
+                $site = $sites->get($siteId);
+                if ($remove) {
+                    if ($site && $acl->userIsAllowed($site, 'can-assign-items')) {
+                        $sites->removeElement($site);
+                    }
+                    continue;
+                }
+                if (!$site) {
+                    // Assign site that was not already assigned.
+                    $site = $siteAdapter->findEntity($siteId);
+                    if ($acl->userIsAllowed($site, 'can-assign-items')) {
+                        $sites->set($site->getId(), $site);
+                    }
+                }
+                $sitesToRetain[] = $site;
+            }
+
+            if (!$append && !$remove) {
+                // Remove sites that were not included in the passed data.
+                foreach ($sites as $site) {
+                    if (!in_array($site, $sitesToRetain) && $acl->userIsAllowed($site, 'can-assign-items')) {
+                        $sites->removeElement($site);
+                    }
+                }
+            }
+        }
 
         if ($this->shouldHydrate($request, 'o:media')) {
             $mediasData = $request->getValue('o:media', []);
diff --git a/application/src/Api/Adapter/MediaAdapter.php b/application/src/Api/Adapter/MediaAdapter.php
index 640f67617f..434b1fd5c9 100644
--- a/application/src/Api/Adapter/MediaAdapter.php
+++ b/application/src/Api/Adapter/MediaAdapter.php
@@ -19,6 +19,7 @@ class MediaAdapter extends AbstractResourceEntityAdapter
         'created' => 'created',
         'modified' => 'modified',
         'title' => 'title',
+        'media_type' => 'mediaType',
     ];
 
     public function getResourceName()
@@ -47,6 +48,27 @@ public function buildQuery(QueryBuilder $qb, array $query)
             ));
         }
 
+        if (!empty($query['media_type'])) {
+            $qb->andWhere($qb->expr()->eq(
+                'omeka_root.mediaType',
+                $this->createNamedParameter($qb, $query['media_type'])
+            ));
+        }
+
+        if (!empty($query['ingester'])) {
+            $qb->andWhere($qb->expr()->eq(
+                'omeka_root.ingester',
+                $this->createNamedParameter($qb, $query['ingester'])
+            ));
+        }
+
+        if (!empty($query['renderer'])) {
+            $qb->andWhere($qb->expr()->eq(
+                'omeka_root.renderer',
+                $this->createNamedParameter($qb, $query['renderer'])
+            ));
+        }
+
         if (isset($query['site_id']) && is_numeric($query['site_id'])) {
             $itemAlias = $this->createAlias();
             $qb->innerJoin(
diff --git a/application/src/Api/Adapter/SiteAdapter.php b/application/src/Api/Adapter/SiteAdapter.php
index af8557c66a..0bca08bc61 100644
--- a/application/src/Api/Adapter/SiteAdapter.php
+++ b/application/src/Api/Adapter/SiteAdapter.php
@@ -105,6 +105,10 @@ public function hydrate(Request $request, EntityInterface $entity,
             $entity->setIsPublic($request->getValue('o:is_public', true));
         }
 
+        if ($this->shouldHydrate($request, 'o:assign_new_items')) {
+            $entity->setAssignNewItems($request->getValue('o:assign_new_items'));
+        }
+
         if ($this->shouldHydrate($request, 'o:page')) {
             $pagesData = $request->getValue('o:page', []);
             $adapter = $this->getAdapter('site_pages');
@@ -260,6 +264,14 @@ public function validateEntity(EntityInterface $entity, ErrorStore $errorStore)
 
     public function buildQuery(QueryBuilder $qb, array $query)
     {
+        if (isset($query['item_id']) && is_numeric($query['item_id'])) {
+            $itemAlias = $this->createAlias();
+            $qb->leftJoin(
+                'omeka_root.items', $itemAlias, 'WITH',
+                $qb->expr()->eq("$itemAlias.id", $this->createNamedParameter($qb, $query['item_id']))
+            );
+        }
+
         if (isset($query['owner_id']) && is_numeric($query['owner_id'])) {
             $userAlias = $this->createAlias();
             $qb->innerJoin(
@@ -278,6 +290,20 @@ public function buildQuery(QueryBuilder $qb, array $query)
                 $this->createNamedParameter($qb, $query['slug'])
             ));
         }
+
+        if (isset($query['exclude_id'])) {
+            $qb->andWhere($qb->expr()->neq(
+                'omeka_root.id',
+                $this->createNamedParameter($qb, $query['exclude_id'])
+            ));
+        }
+
+        if (isset($query['assign_new_items'])) {
+            $qb->andWhere($qb->expr()->eq(
+                'omeka_root.assignNewItems',
+                $this->createNamedParameter($qb, (bool) $query['assign_new_items'])
+            ));
+        }
     }
 
     /**
diff --git a/application/src/Api/Adapter/UserAdapter.php b/application/src/Api/Adapter/UserAdapter.php
index 45223750cf..cd65031a36 100644
--- a/application/src/Api/Adapter/UserAdapter.php
+++ b/application/src/Api/Adapter/UserAdapter.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Adapter;
 
 use Doctrine\ORM\QueryBuilder;
-use Zend\Validator\EmailAddress;
+use Laminas\Validator\EmailAddress;
 use Omeka\Api\Request;
 use Omeka\Entity\EntityInterface;
 use Omeka\Stdlib\Message;
diff --git a/application/src/Api/Adapter/ValueHydrator.php b/application/src/Api/Adapter/ValueHydrator.php
index bcce9f4726..2c868499e6 100644
--- a/application/src/Api/Adapter/ValueHydrator.php
+++ b/application/src/Api/Adapter/ValueHydrator.php
@@ -5,7 +5,7 @@
 use Omeka\Api\Request;
 use Omeka\Entity\Resource;
 use Omeka\Entity\Value;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class ValueHydrator
 {
diff --git a/application/src/Api/Manager.php b/application/src/Api/Manager.php
index 64750c56d0..8ffae2b8e5 100644
--- a/application/src/Api/Manager.php
+++ b/application/src/Api/Manager.php
@@ -4,10 +4,10 @@
 use Omeka\Api\Adapter\AdapterInterface;
 use Omeka\Api\Adapter\Manager as AdapterManager;
 use Omeka\Permissions\Acl;
-use Zend\Log\LoggerInterface;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\EventManager\Event;
+use Laminas\Log\LoggerInterface;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\EventManager\Event;
 
 /**
  * API manager service.
@@ -206,7 +206,7 @@ public function execute(Request $request)
         // Verify that the current user has general access to this resource.
         if (!$this->acl->userIsAllowed($adapter, $request->getOperation())) {
             throw new Exception\PermissionDeniedException(sprintf(
-                $t->translate('Permission denied for the current user to %s the %s resource.'),
+                $t->translate('Permission denied for the current user to %1$s the %2$s resource.'),
                 $request->getOperation(),
                 $adapter->getResourceId()
             ));
diff --git a/application/src/Api/Representation/AbstractRepresentation.php b/application/src/Api/Representation/AbstractRepresentation.php
index 783c182a13..6dffbf8cfb 100644
--- a/application/src/Api/Representation/AbstractRepresentation.php
+++ b/application/src/Api/Representation/AbstractRepresentation.php
@@ -3,10 +3,10 @@
 
 use Omeka\Api\Adapter\AdapterInterface;
 use Omeka\Stdlib\DateTime;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\View\HelperPluginManager;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\View\HelperPluginManager;
 
 /**
  * Abstract representation.
diff --git a/application/src/Api/Representation/AbstractResourceEntityRepresentation.php b/application/src/Api/Representation/AbstractResourceEntityRepresentation.php
index 676171750a..27f7da09e3 100644
--- a/application/src/Api/Representation/AbstractResourceEntityRepresentation.php
+++ b/application/src/Api/Representation/AbstractResourceEntityRepresentation.php
@@ -170,7 +170,13 @@ public function thumbnail()
      */
     public function title()
     {
-        return $this->resource->getTitle();
+        $title = $this->resource->getTitle();
+
+        $eventManager = $this->getEventManager();
+        $args = $eventManager->prepareArgs(['title' => $title]);
+        $eventManager->trigger('rep.resource.title', $this, $args);
+
+        return $args['title'];
     }
 
     /**
@@ -262,7 +268,7 @@ public function values()
         $values = [];
         foreach ($this->resource->getValues() as $valueEntity) {
             $value = new ValueRepresentation($valueEntity, $this->getServiceLocator());
-            if ('resource' === $value->type() && null === $value->valueResource()) {
+            if ($value->isHidden()) {
                 // Skip this resource value if the resource is not available
                 // (most likely because it is private).
                 continue;
@@ -276,7 +282,7 @@ public function values()
             $values[$term]['values'][] = $value;
         }
 
-        // Order this resource's values according to the template order.
+        // Order this resource's properties according to the template order.
         $sortedValues = [];
         foreach ($values as $term => $valueInfo) {
             foreach ($templateInfo as $templateTerm => $templateAlternates) {
@@ -287,7 +293,13 @@ public function values()
             }
         }
 
-        $this->values = $sortedValues + $values;
+        $values = $sortedValues + $values;
+
+        $eventManager = $this->getEventManager();
+        $args = $eventManager->prepareArgs(['values' => $values]);
+        $eventManager->trigger('rep.resource.values', $this, $args);
+
+        $this->values = $args['values'];
         return $this->values;
     }
 
@@ -301,7 +313,7 @@ public function values()
      * - all: (false) If true, returns all values that match criteria. If false,
      *   returns the first matching value.
      * - default: (null) Default value if no values match criteria. Returns null
-     *   by default.
+     *   by default for single result, empty array for all results.
      * - lang: (null) Get values of this language only. Returns values of all
      *   languages by default.
      * @return ValueRepresentation|ValueRepresentation[]|mixed
@@ -316,7 +328,7 @@ public function value($term, array $options = [])
             $options['all'] = false;
         }
         if (!isset($options['default'])) {
-            $options['default'] = null;
+            $options['default'] = $options['all'] ? [] : null;
         }
         if (!isset($options['lang'])) {
             $options['lang'] = null;
diff --git a/application/src/Api/Representation/ItemRepresentation.php b/application/src/Api/Representation/ItemRepresentation.php
index d2d2536576..50950a7757 100644
--- a/application/src/Api/Representation/ItemRepresentation.php
+++ b/application/src/Api/Representation/ItemRepresentation.php
@@ -23,9 +23,14 @@ public function getResourceJsonLd()
         foreach ($this->itemSets() as $itemSetRepresentation) {
             $itemSets[] = $itemSetRepresentation->getReference();
         }
+        $sites = [];
+        foreach ($this->sites() as $siteRepresentation) {
+            $sites[] = $siteRepresentation->getReference();
+        }
         return [
             'o:media' => $media,
             'o:item_set' => $itemSets,
+            'o:site' => $sites,
         ];
     }
 
@@ -60,6 +65,17 @@ public function itemSets()
         return $itemSets;
     }
 
+    public function sites()
+    {
+        $sites = [];
+        $siteAdapter = $this->getAdapter('sites');
+        foreach ($this->resource->getSites() as $siteEntity) {
+            $sites[$siteEntity->getId()] =
+                $siteAdapter->getRepresentation($siteEntity);
+        }
+        return $sites;
+    }
+
     public function primaryMedia()
     {
         // Return the first media if one exists.
diff --git a/application/src/Api/Representation/RepresentationInterface.php b/application/src/Api/Representation/RepresentationInterface.php
index a44a6fb417..6e4297823d 100644
--- a/application/src/Api/Representation/RepresentationInterface.php
+++ b/application/src/Api/Representation/RepresentationInterface.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Representation;
 
 use JsonSerializable;
-use Zend\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerAwareInterface;
 
 /**
  * The representation interface
diff --git a/application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php b/application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php
index db4e0afa4b..26f2cfdd59 100644
--- a/application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php
+++ b/application/src/Api/Representation/ResourceTemplatePropertyRepresentation.php
@@ -2,8 +2,8 @@
 namespace Omeka\Api\Representation;
 
 use Omeka\Entity\ResourceTemplateProperty;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class ResourceTemplatePropertyRepresentation extends AbstractRepresentation
 {
diff --git a/application/src/Api/Representation/SiteBlockAttachmentRepresentation.php b/application/src/Api/Representation/SiteBlockAttachmentRepresentation.php
index 11dcd3e8f0..34282759e0 100644
--- a/application/src/Api/Representation/SiteBlockAttachmentRepresentation.php
+++ b/application/src/Api/Representation/SiteBlockAttachmentRepresentation.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Representation;
 
 use Omeka\Entity\SiteBlockAttachment;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class SiteBlockAttachmentRepresentation extends AbstractRepresentation
 {
diff --git a/application/src/Api/Representation/SiteItemSetRepresentation.php b/application/src/Api/Representation/SiteItemSetRepresentation.php
index e32739fe2c..e5bdb81318 100644
--- a/application/src/Api/Representation/SiteItemSetRepresentation.php
+++ b/application/src/Api/Representation/SiteItemSetRepresentation.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Representation;
 
 use Omeka\Entity\SiteItemSet;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class SiteItemSetRepresentation extends AbstractRepresentation
 {
diff --git a/application/src/Api/Representation/SitePageBlockRepresentation.php b/application/src/Api/Representation/SitePageBlockRepresentation.php
index ee8337e4cb..f51cc20b7a 100644
--- a/application/src/Api/Representation/SitePageBlockRepresentation.php
+++ b/application/src/Api/Representation/SitePageBlockRepresentation.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Representation;
 
 use Omeka\Entity\SitePageBlock;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class SitePageBlockRepresentation extends AbstractRepresentation
 {
diff --git a/application/src/Api/Representation/SitePermissionRepresentation.php b/application/src/Api/Representation/SitePermissionRepresentation.php
index efdc4c57c9..5c428b0d7c 100644
--- a/application/src/Api/Representation/SitePermissionRepresentation.php
+++ b/application/src/Api/Representation/SitePermissionRepresentation.php
@@ -2,7 +2,7 @@
 namespace Omeka\Api\Representation;
 
 use Omeka\Entity\SitePermission;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class SitePermissionRepresentation extends AbstractRepresentation
 {
diff --git a/application/src/Api/Representation/SiteRepresentation.php b/application/src/Api/Representation/SiteRepresentation.php
index 0d5b0bae37..b67bd4577d 100644
--- a/application/src/Api/Representation/SiteRepresentation.php
+++ b/application/src/Api/Representation/SiteRepresentation.php
@@ -2,12 +2,12 @@
 namespace Omeka\Api\Representation;
 
 use RecursiveIteratorIterator;
-use Zend\Navigation\Service\ConstructedNavigationFactory;
+use Laminas\Navigation\Service\ConstructedNavigationFactory;
 
 class SiteRepresentation extends AbstractEntityRepresentation
 {
     /**
-     * @var \Zend\Navigation\Navigation
+     * @var \Laminas\Navigation\Navigation
      */
     protected $publicNavContainer;
 
@@ -56,6 +56,15 @@ public function getJsonLd()
                '@type' => 'http://www.w3.org/2001/XMLSchema#dateTime',
             ];
         }
+        $url = $this->getViewHelper('Url');
+        $itemsUrl = $url(
+            'api/default',
+            ['resource' => 'items'],
+            [
+                'force_canonical' => true,
+                'query' => ['site_id' => $this->id()],
+            ]
+        );
 
         return [
             'o:slug' => $this->slug(),
@@ -69,9 +78,11 @@ public function getJsonLd()
             'o:created' => $created,
             'o:modified' => $modified,
             'o:is_public' => $this->isPublic(),
+            'o:assign_new_items' => $this->assignNewItems(),
             'o:page' => $pages,
             'o:site_permission' => $this->sitePermissions(),
             'o:site_item_set' => $this->siteItemSets(),
+            'o:site_item' => ['@id' => $itemsUrl],
         ];
     }
 
@@ -126,6 +137,11 @@ public function isPublic()
         return $this->resource->isPublic();
     }
 
+    public function assignNewItems()
+    {
+        return $this->resource->getAssignNewItems();
+    }
+
     /**
      * @return \Omeka\Api\Representation\SitePageRepresentation[]
      */
@@ -201,6 +217,21 @@ public function siteItemSets()
         return $itemSets;
     }
 
+    /**
+     * Get this site's item count.
+     *
+     * @return int
+     */
+    public function itemCount()
+    {
+        $response = $this->getServiceLocator()->get('Omeka\ApiManager')
+            ->search('items', [
+                'site_id' => $this->id(),
+                'limit' => 0,
+            ]);
+        return $response->getTotalResults();
+    }
+
     /**
      * Get the owner representation of this resource.
      *
@@ -228,12 +259,12 @@ public function siteUrl($siteSlug = null, $canonical = false)
     /**
      * Get the navigation helper for admin-side nav for this site for the current user
      *
-     * @return \Zend\View\Helper\Navigation
+     * @return \Laminas\View\Helper\Navigation
      */
     public function adminNav()
     {
         $navHelper = $this->getViewHelper('Navigation');
-        $nav = $navHelper('Zend\Navigation\Site');
+        $nav = $navHelper('Laminas\Navigation\Site');
 
         $iterator = new RecursiveIteratorIterator($nav->getContainer(), RecursiveIteratorIterator::SELF_FIRST);
         foreach ($iterator as $page) {
@@ -248,7 +279,7 @@ public function adminNav()
     /**
      * Get the navigation helper for public-side nav for this site
      *
-     * @return \Zend\View\Helper\Navigation
+     * @return \Laminas\View\Helper\Navigation
      */
     public function publicNav()
     {
@@ -266,7 +297,7 @@ public function publicNav()
     /**
      * Get the navigation container for this site's public nav
      *
-     * @return \Zend\Navigation\Navigation
+     * @return \Laminas\Navigation\Navigation
      */
     protected function getPublicNavContainer()
     {
diff --git a/application/src/Api/Representation/ValueRepresentation.php b/application/src/Api/Representation/ValueRepresentation.php
index cda22d5afb..9711f18760 100644
--- a/application/src/Api/Representation/ValueRepresentation.php
+++ b/application/src/Api/Representation/ValueRepresentation.php
@@ -1,8 +1,9 @@
 <?php
 namespace Omeka\Api\Representation;
 
+use Omeka\DataType\Resource\AbstractResource;
 use Omeka\Entity\Value;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class ValueRepresentation extends AbstractRepresentation
 {
@@ -12,7 +13,7 @@ class ValueRepresentation extends AbstractRepresentation
     protected $value;
 
     /**
-     * @var \Omeka\DataType\Manager
+     * @var \Omeka\DataType\DataTypeInterface
      */
     protected $dataType;
 
@@ -168,4 +169,19 @@ public function isPublic()
     {
         return $this->value->isPublic();
     }
+
+    /**
+     * Return whether this value should be hidden when listing values for its
+     * parent resource.
+     *
+     * Currently the only "hidden" values are resource-type values that point
+     * to unretrievable resources (i.e., private resources the current user
+     * cannot see).
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return $this->dataType instanceof AbstractResource && null === $this->value->getValueResource();
+    }
 }
diff --git a/application/src/Authentication/Adapter/KeyAdapter.php b/application/src/Authentication/Adapter/KeyAdapter.php
index 82412e362f..72cef44111 100644
--- a/application/src/Authentication/Adapter/KeyAdapter.php
+++ b/application/src/Authentication/Adapter/KeyAdapter.php
@@ -4,8 +4,8 @@
 use DateTime;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
-use Zend\Authentication\Adapter\AbstractAdapter;
-use Zend\Authentication\Result;
+use Laminas\Authentication\Adapter\AbstractAdapter;
+use Laminas\Authentication\Result;
 
 /**
  * Auth adapter for checking API keys through Doctrine.
diff --git a/application/src/Authentication/Adapter/PasswordAdapter.php b/application/src/Authentication/Adapter/PasswordAdapter.php
index 71c1efd5c8..5598439bce 100644
--- a/application/src/Authentication/Adapter/PasswordAdapter.php
+++ b/application/src/Authentication/Adapter/PasswordAdapter.php
@@ -2,8 +2,8 @@
 namespace Omeka\Authentication\Adapter;
 
 use Doctrine\ORM\EntityRepository;
-use Zend\Authentication\Adapter\AbstractAdapter;
-use Zend\Authentication\Result;
+use Laminas\Authentication\Adapter\AbstractAdapter;
+use Laminas\Authentication\Result;
 
 /**
  * Auth adapter for checking passwords through Doctrine.
diff --git a/application/src/Authentication/Storage/DoctrineWrapper.php b/application/src/Authentication/Storage/DoctrineWrapper.php
index d2dceef241..cced4b0a40 100644
--- a/application/src/Authentication/Storage/DoctrineWrapper.php
+++ b/application/src/Authentication/Storage/DoctrineWrapper.php
@@ -3,7 +3,7 @@
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\ORM\EntityRepository;
-use Zend\Authentication\Storage\StorageInterface;
+use Laminas\Authentication\Storage\StorageInterface;
 
 /**
  * Auth storage wrapper for doctrine objects.
diff --git a/application/src/Controller/Admin/AssetController.php b/application/src/Controller/Admin/AssetController.php
index 26ca342b5e..b454f0d3ff 100644
--- a/application/src/Controller/Admin/AssetController.php
+++ b/application/src/Controller/Admin/AssetController.php
@@ -4,8 +4,8 @@
 use Omeka\Api\Exception\ValidationException;
 use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
-use Zend\View\Model\ViewModel;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class AssetController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/IndexController.php b/application/src/Controller/Admin/IndexController.php
index 66c3aa5aeb..24eb3e8703 100644
--- a/application/src/Controller/Admin/IndexController.php
+++ b/application/src/Controller/Admin/IndexController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Admin;
 
-use Zend\View\Model\ViewModel;
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class IndexController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/ItemController.php b/application/src/Controller/Admin/ItemController.php
index 37f9abe205..19cfec8932 100644
--- a/application/src/Controller/Admin/ItemController.php
+++ b/application/src/Controller/Admin/ItemController.php
@@ -6,8 +6,8 @@
 use Omeka\Form\ResourceBatchUpdateForm;
 use Omeka\Media\Ingester\Manager;
 use Omeka\Stdlib\Message;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ItemController extends AbstractActionController
 {
@@ -198,6 +198,9 @@ public function addAction()
         $form->setAttribute('id', 'add-item');
         if ($this->getRequest()->isPost()) {
             $data = $this->params()->fromPost();
+            $data = $this->mergeValuesJson($data);
+            // Prevent the API from setting sites automatically if no sites are set.
+            $data['o:site'] = $data['o:site'] ?? [];
             $form->setData($data);
             if ($form->isValid()) {
                 $fileData = $this->getRequest()->getFiles()->toArray();
@@ -235,6 +238,7 @@ public function editAction()
 
         if ($this->getRequest()->isPost()) {
             $data = $this->params()->fromPost();
+            $data = $this->mergeValuesJson($data);
             $form->setData($data);
             if ($form->isValid()) {
                 $fileData = $this->getRequest()->getFiles()->toArray();
diff --git a/application/src/Controller/Admin/ItemSetController.php b/application/src/Controller/Admin/ItemSetController.php
index 99a64ee6ba..9918b451a4 100644
--- a/application/src/Controller/Admin/ItemSetController.php
+++ b/application/src/Controller/Admin/ItemSetController.php
@@ -5,8 +5,8 @@
 use Omeka\Form\ResourceForm;
 use Omeka\Form\ResourceBatchUpdateForm;
 use Omeka\Stdlib\Message;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ItemSetController extends AbstractActionController
 {
@@ -23,6 +23,7 @@ public function addAction()
         $form->setAttribute('id', 'add-item-set');
         if ($this->getRequest()->isPost()) {
             $data = $this->params()->fromPost();
+            $data = $this->mergeValuesJson($data);
             $form->setData($data);
             if ($form->isValid()) {
                 $response = $this->api($form)->create('item_sets', $data);
@@ -60,6 +61,7 @@ public function editAction()
         $view->setVariable('itemSet', $itemSet);
         if ($this->getRequest()->isPost()) {
             $data = $this->params()->fromPost();
+            $data = $this->mergeValuesJson($data);
             $form->setData($data);
             if ($form->isValid()) {
                 $response = $this->api($form)->update('item_sets', $this->params('id'), $data);
diff --git a/application/src/Controller/Admin/JobController.php b/application/src/Controller/Admin/JobController.php
index ba523ac5eb..a6c41dcddb 100644
--- a/application/src/Controller/Admin/JobController.php
+++ b/application/src/Controller/Admin/JobController.php
@@ -3,8 +3,8 @@
 
 use Omeka\Entity\Job;
 use Omeka\Form\ConfirmForm;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class JobController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/MediaController.php b/application/src/Controller/Admin/MediaController.php
index 12f92c0131..6fa44eb040 100644
--- a/application/src/Controller/Admin/MediaController.php
+++ b/application/src/Controller/Admin/MediaController.php
@@ -4,8 +4,8 @@
 use Omeka\Form\ConfirmForm;
 use Omeka\Form\ResourceForm;
 use Omeka\Form\ResourceBatchUpdateForm;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class MediaController extends AbstractActionController
 {
@@ -45,11 +45,13 @@ public function browseAction()
     public function editAction()
     {
         $form = $this->getForm(ResourceForm::class);
+        $form->setAttribute('id', 'edit-media');
         $response = $this->api()->read('media', $this->params('id'));
         $media = $response->getContent();
 
         if ($this->getRequest()->isPost()) {
             $data = $this->params()->fromPost();
+            $data = $this->mergeValuesJson($data);
             $form->setData($data);
             if ($form->isValid()) {
                 $response = $this->api($form)->update('media', $this->params('id'), $data);
diff --git a/application/src/Controller/Admin/ModuleController.php b/application/src/Controller/Admin/ModuleController.php
index 7f8996f32f..d6145a0945 100644
--- a/application/src/Controller/Admin/ModuleController.php
+++ b/application/src/Controller/Admin/ModuleController.php
@@ -5,11 +5,11 @@
 use Omeka\Form\ConfirmForm;
 use Omeka\Module\Exception\ModuleCannotInstallException;
 use Omeka\Module\Manager as OmekaModuleManager;
-use Zend\ModuleManager\ModuleManager;
+use Laminas\ModuleManager\ModuleManager;
 use Omeka\Mvc\Exception;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ModuleController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/PropertyController.php b/application/src/Controller/Admin/PropertyController.php
index d9cdf12328..2dda42cd69 100644
--- a/application/src/Controller/Admin/PropertyController.php
+++ b/application/src/Controller/Admin/PropertyController.php
@@ -2,8 +2,8 @@
 namespace Omeka\Controller\Admin;
 
 use Omeka\Mvc\Exception;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class PropertyController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/ResourceClassController.php b/application/src/Controller/Admin/ResourceClassController.php
index df33edc48c..bd272082d1 100644
--- a/application/src/Controller/Admin/ResourceClassController.php
+++ b/application/src/Controller/Admin/ResourceClassController.php
@@ -2,8 +2,8 @@
 namespace Omeka\Controller\Admin;
 
 use Omeka\Mvc\Exception;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ResourceClassController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/ResourceTemplateController.php b/application/src/Controller/Admin/ResourceTemplateController.php
index 7948a686dd..318a696562 100644
--- a/application/src/Controller/Admin/ResourceTemplateController.php
+++ b/application/src/Controller/Admin/ResourceTemplateController.php
@@ -8,8 +8,8 @@
 use Omeka\Form\ResourceTemplateReviewImportForm;
 use Omeka\Mvc\Exception\NotFoundException;
 use Omeka\Stdlib\Message;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ResourceTemplateController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/SettingController.php b/application/src/Controller/Admin/SettingController.php
index 2b14c4c222..e062c14b8c 100644
--- a/application/src/Controller/Admin/SettingController.php
+++ b/application/src/Controller/Admin/SettingController.php
@@ -2,8 +2,8 @@
 namespace Omeka\Controller\Admin;
 
 use Omeka\Form\SettingForm;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class SettingController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/SystemInfoController.php b/application/src/Controller/Admin/SystemInfoController.php
index d15670cfe4..7e08d86a36 100644
--- a/application/src/Controller/Admin/SystemInfoController.php
+++ b/application/src/Controller/Admin/SystemInfoController.php
@@ -4,8 +4,8 @@
 use PDO;
 use Doctrine\DBAL\Connection;
 use Omeka\Module;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class SystemInfoController extends AbstractActionController
 {
diff --git a/application/src/Controller/Admin/UserController.php b/application/src/Controller/Admin/UserController.php
index 77350cded0..72cac5c934 100644
--- a/application/src/Controller/Admin/UserController.php
+++ b/application/src/Controller/Admin/UserController.php
@@ -8,8 +8,8 @@
 use Omeka\Form\UserForm;
 use Omeka\Mvc\Exception;
 use Omeka\Stdlib\Message;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class UserController extends AbstractActionController
 {
@@ -239,7 +239,7 @@ public function editAction()
 
                 if ($keyPersisted) {
                     $message = new Message(
-                        'API key successfully created.<br><br>Here is your key ID and credential for access to the API. WARNING: "key_credential" will be unretrievable after you navigate away from this page.<br><br>key_identity: <code>%s</code><br>key_credential: <code>%s</code>', // @translate
+                        'API key successfully created.<br><br>Here is your key ID and credential for access to the API. WARNING: "key_credential" will be unretrievable after you navigate away from this page.<br><br>key_identity: <code>%1$s</code><br>key_credential: <code>%2$s</code>', // @translate
                         $keyId, $keyCredential
                     );
                     $message->setEscapeHtml(false);
diff --git a/application/src/Controller/Admin/VocabularyController.php b/application/src/Controller/Admin/VocabularyController.php
index be47477bf5..cbe19536d4 100644
--- a/application/src/Controller/Admin/VocabularyController.php
+++ b/application/src/Controller/Admin/VocabularyController.php
@@ -8,8 +8,8 @@
 use Omeka\Mvc\Exception;
 use Omeka\Stdlib\RdfImporter;
 use Omeka\Stdlib\Message;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class VocabularyController extends AbstractActionController
 {
diff --git a/application/src/Controller/ApiController.php b/application/src/Controller/ApiController.php
index 044f233328..ec187c345f 100644
--- a/application/src/Controller/ApiController.php
+++ b/application/src/Controller/ApiController.php
@@ -5,9 +5,9 @@
 use Omeka\Mvc\Exception;
 use Omeka\Stdlib\Paginator;
 use Omeka\View\Model\ApiJsonModel;
-use Zend\Mvc\Controller\AbstractRestfulController;
-use Zend\Mvc\MvcEvent;
-use Zend\Stdlib\RequestInterface as Request;
+use Laminas\Mvc\Controller\AbstractRestfulController;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Stdlib\RequestInterface as Request;
 
 class ApiController extends AbstractRestfulController
 {
diff --git a/application/src/Controller/IndexController.php b/application/src/Controller/IndexController.php
index cc3c0dcd1e..cf1da776c4 100644
--- a/application/src/Controller/IndexController.php
+++ b/application/src/Controller/IndexController.php
@@ -2,8 +2,8 @@
 namespace Omeka\Controller;
 
 use Omeka\Api\Exception as ApiException;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class IndexController extends AbstractActionController
 {
diff --git a/application/src/Controller/InstallController.php b/application/src/Controller/InstallController.php
index 9bb80e3c02..4a8ca57398 100644
--- a/application/src/Controller/InstallController.php
+++ b/application/src/Controller/InstallController.php
@@ -3,8 +3,8 @@
 
 use Omeka\Form\InstallationForm;
 use Omeka\Installation\Installer;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class InstallController extends AbstractActionController
 {
diff --git a/application/src/Controller/LoginController.php b/application/src/Controller/LoginController.php
index b03cecbb5d..9d55faacc9 100644
--- a/application/src/Controller/LoginController.php
+++ b/application/src/Controller/LoginController.php
@@ -6,10 +6,10 @@
 use Omeka\Form\LoginForm;
 use Omeka\Form\ActivateForm;
 use Omeka\Form\ForgotPasswordForm;
-use Zend\Authentication\AuthenticationService;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\Session\Container;
-use Zend\View\Model\ViewModel;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Session\Container;
+use Laminas\View\Model\ViewModel;
 
 class LoginController extends AbstractActionController
 {
diff --git a/application/src/Controller/MaintenanceController.php b/application/src/Controller/MaintenanceController.php
index 9b274638ed..d5c76da74f 100644
--- a/application/src/Controller/MaintenanceController.php
+++ b/application/src/Controller/MaintenanceController.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Controller;
 
-use Zend\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\AbstractActionController;
 
 class MaintenanceController extends AbstractActionController
 {
diff --git a/application/src/Controller/MigrateController.php b/application/src/Controller/MigrateController.php
index 1c57c85d69..5b2233b3f0 100644
--- a/application/src/Controller/MigrateController.php
+++ b/application/src/Controller/MigrateController.php
@@ -3,8 +3,8 @@
 
 use Omeka\Db\Migration\Manager;
 use Omeka\Stdlib\Environment;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class MigrateController extends AbstractActionController
 {
diff --git a/application/src/Controller/SearchController.php b/application/src/Controller/SearchController.php
new file mode 100644
index 0000000000..c2aad4a526
--- /dev/null
+++ b/application/src/Controller/SearchController.php
@@ -0,0 +1,46 @@
+<?php
+namespace Omeka\Controller;
+
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
+
+class SearchController extends AbstractActionController
+{
+    public function indexAction()
+    {
+    }
+
+    public function advancedAction()
+    {
+    }
+
+    public function resultsAction()
+    {
+        $query = ['fulltext_search' => $this->params()->fromQuery('fulltext_search'), 'limit' => 10];
+        $view = new ViewModel;
+        $view->setVariable('responseSitePages', $this->api()->search('site_pages', $query));
+        $view->setVariable('responseItems', $this->api()->search('items', array_merge($query, ['in_sites' => true])));
+        return $view;
+    }
+
+    public function sitePagesAction()
+    {
+        $this->setBrowseDefaults('created');
+        $response = $this->api()->search('site_pages', $this->params()->fromQuery());
+        $this->paginator($response->getTotalResults());
+        $view = new ViewModel;
+        $view->setVariable('sitePages', $response->getContent());
+        return $view;
+    }
+
+    public function itemsAction()
+    {
+        $this->setBrowseDefaults('created');
+        $query = array_merge($this->params()->fromQuery(), ['in_sites' => true]);
+        $response = $this->api()->search('items', $query);
+        $this->paginator($response->getTotalResults());
+        $view = new ViewModel;
+        $view->setVariable('items', $response->getContent());
+        return $view;
+    }
+}
diff --git a/application/src/Controller/Site/IndexController.php b/application/src/Controller/Site/IndexController.php
index e82eaff9fa..237f300b0c 100644
--- a/application/src/Controller/Site/IndexController.php
+++ b/application/src/Controller/Site/IndexController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Site;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class IndexController extends AbstractActionController
 {
@@ -37,29 +37,56 @@ public function indexAction()
     public function searchAction()
     {
         $fulltextQuery = $this->params()->fromQuery('fulltext_search');
+
+        $siteSettings = $this->siteSettings();
+
+        $resourceNames = $siteSettings->get('search_resource_names', ['site_pages', 'items']);
+
+        // Skip the intermediate result page when only one resource type is set.
+        if (count($resourceNames) === 1) {
+            $resourceName = reset($resourceNames);
+            $resourceControllers = [
+                'site_pages' => 'page',
+                'items' => 'item',
+                'item_sets' => 'item-set',
+            ];
+            return $this->redirect()->toRoute(
+                $resourceName === 'site_pages' ? 'site/page-browse' : 'site/resource',
+                ['controller' => $resourceControllers[$resourceName], 'action' => 'browse'],
+                ['query' => ['fulltext_search' => $fulltextQuery]],
+                true
+            );
+        }
+
         $query = [
             'fulltext_search' => $fulltextQuery,
             'site_id' => $this->currentSite()->id(),
             'limit' => 10,
         ];
 
-        // Get page results.
-        $pagesResponse = $this->api()->search('site_pages', $query);
-        $pages = $pagesResponse->getContent();
-
-        // Get item results.
-        if ($this->siteSettings()->get('browse_attached_items', false)) {
+        // This settings is managed only by items and media, else skipped.
+        if ($siteSettings->get('browse_attached_items', false)) {
             $query['site_attachments_only'] = true;
         }
-        $itemsResponse = $this->api()->search('items', $query);
-        $items = $itemsResponse->getContent();
+
+        $results = [];
+        foreach ($resourceNames as $resourceName) {
+            $response = $this->api()->search($resourceName, $query);
+            $results[$resourceName] = [
+                'resources' => $response->getContent(),
+                'total' => $response->getTotalResults(),
+            ];
+        }
 
         $view = new ViewModel;
-        $view->setVariable('query', $fulltextQuery);
-        $view->setVariable('pages', $pages);
-        $view->setVariable('pagesTotal', $pagesResponse->getTotalResults());
-        $view->setVariable('items', $items);
-        $view->setVariable('itemsTotal', $itemsResponse->getTotalResults());
+        $view
+            ->setVariable('query', $fulltextQuery)
+            ->setVariable('results', $results)
+            // Kept for compatibility with old themes.
+            ->setVariable('pages', @$results['site_pages']['resources'])
+            ->setVariable('pagesTotal', @$results['site_pages']['total'])
+            ->setVariable('items', @$results['items']['resources'])
+            ->setVariable('itemsTotal', @$results['site_pages']['total']);
         return $view;
     }
 }
diff --git a/application/src/Controller/Site/ItemController.php b/application/src/Controller/Site/ItemController.php
index 63e5404a94..f0831a0087 100644
--- a/application/src/Controller/Site/ItemController.php
+++ b/application/src/Controller/Site/ItemController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Site;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ItemController extends AbstractActionController
 {
diff --git a/application/src/Controller/Site/ItemSetController.php b/application/src/Controller/Site/ItemSetController.php
index 85943e1c05..4688c4fb36 100644
--- a/application/src/Controller/Site/ItemSetController.php
+++ b/application/src/Controller/Site/ItemSetController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Site;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class ItemSetController extends AbstractActionController
 {
diff --git a/application/src/Controller/Site/MediaController.php b/application/src/Controller/Site/MediaController.php
index c2ea5aaea5..9de92b5e5d 100644
--- a/application/src/Controller/Site/MediaController.php
+++ b/application/src/Controller/Site/MediaController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Site;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class MediaController extends AbstractActionController
 {
diff --git a/application/src/Controller/Site/PageController.php b/application/src/Controller/Site/PageController.php
index d7cbcc607a..c06ecddb37 100644
--- a/application/src/Controller/Site/PageController.php
+++ b/application/src/Controller/Site/PageController.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Controller\Site;
 
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class PageController extends AbstractActionController
 {
diff --git a/application/src/Controller/SiteAdmin/IndexController.php b/application/src/Controller/SiteAdmin/IndexController.php
index 195c403a76..22fb47d4e5 100644
--- a/application/src/Controller/SiteAdmin/IndexController.php
+++ b/application/src/Controller/SiteAdmin/IndexController.php
@@ -4,14 +4,15 @@
 use Omeka\Form\ConfirmForm;
 use Omeka\Form\SiteForm;
 use Omeka\Form\SitePageForm;
+use Omeka\Form\SiteResourcesForm;
 use Omeka\Form\SiteSettingsForm;
 use Omeka\Mvc\Exception;
 use Omeka\Site\Navigation\Link\Manager as LinkManager;
 use Omeka\Site\Navigation\Translator;
 use Omeka\Site\Theme\Manager as ThemeManager;
-use Zend\Form\Form;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Form\Form;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class IndexController extends AbstractActionController
 {
@@ -51,14 +52,10 @@ public function indexAction()
 
     public function addAction()
     {
-        $form = $this->getForm(SiteForm::class);
+        $form = $this->getForm(SiteForm::class, ['action' => 'add']);
         $themes = $this->themes->getThemes();
         if ($this->getRequest()->isPost()) {
             $formData = $this->params()->fromPost();
-            $itemPool = $formData;
-            unset($itemPool['csrf'], $itemPool['o:is_public'], $itemPool['o:title'], $itemPool['o:slug'],
-                $itemPool['o:theme']);
-            $formData['o:item_pool'] = $itemPool;
             $form->setData($formData);
             if ($form->isValid()) {
                 $response = $this->api($form)->create('sites', $formData);
@@ -238,19 +235,32 @@ public function navigationAction()
     public function resourcesAction()
     {
         $site = $this->currentSite();
-        $form = $this->getForm(Form::class)->setAttribute('id', 'site-form');
+        $form = $this->getForm(SiteResourcesForm::class)->setAttribute('id', 'site-form');
+        $form->get('o:assign_new_items')->setValue($site->assignNewItems());
 
         if ($this->getRequest()->isPost()) {
             $formData = $this->params()->fromPost();
             $form->setData($formData);
             if ($form->isValid()) {
+                $updateData = [
+                    'o:assign_new_items' => $formData['o:assign_new_items'],
+                    'o:site_item_set' => $formData['o:site_item_set'] ?? [],
+                ];
                 $itemPool = $formData;
-                unset($itemPool['form_csrf']);
-                unset($itemPool['site_item_set']);
-
-                $itemSets = isset($formData['o:site_item_set']) ? $formData['o:site_item_set'] : [];
-
-                $updateData = ['o:item_pool' => $itemPool, 'o:site_item_set' => $itemSets];
+                unset(
+                    $itemPool['siteresourcesform_csrf'],
+                    $itemPool['item_assignment_action'],
+                    $itemPool['save_search'],
+                    $itemPool['o:site_item_set'],
+                    $itemPool['o:assign_new_items']
+                );
+                $updateData['o:item_pool'] = $formData['save_search'] ? $itemPool : $site->itemPool();
+                if ($formData['item_assignment_action']) {
+                    $this->jobDispatcher()->dispatch('Omeka\Job\UpdateSiteItems', [
+                        'sites' => [$site->id() => $itemPool],
+                        'action' => $formData['item_assignment_action'],
+                    ]);
+                }
                 $response = $this->api($form)->update('sites', $site->id(), $updateData, [], ['isPartial' => true]);
                 if ($response) {
                     $this->messenger()->addSuccess('Site resources successfully updated'); // @translate
@@ -353,12 +363,14 @@ public function themeSettingsAction()
         }
 
         $theme = $this->themes->getTheme($site->theme());
-        $config = $theme->getConfigSpec();
+        if (!$theme->isConfigurable()) {
+            throw new Exception\RuntimeException(
+                'The current theme is not configurable.'
+            );
+        }
 
+        $config = $theme->getConfigSpec();
         $view = new ViewModel;
-        if (!($config && $config['elements'])) {
-            return $view;
-        }
 
         /** @var Form $form */
         $form = $this->getForm(Form::class)->setAttribute('id', 'site-form');
@@ -370,8 +382,8 @@ public function themeSettingsAction()
         // Fix to manage empty values for selects and multicheckboxes.
         $inputFilter = $form->getInputFilter();
         foreach ($form->getElements() as $element) {
-            if ($element instanceof \Zend\Form\Element\MultiCheckbox
-                || ($element instanceof \Zend\Form\Element\Select
+            if ($element instanceof \Laminas\Form\Element\MultiCheckbox
+                || ($element instanceof \Laminas\Form\Element\Select
                     && $element->getOption('empty_option') !== null)
             ) {
                 $inputFilter->add([
diff --git a/application/src/Controller/SiteAdmin/PageController.php b/application/src/Controller/SiteAdmin/PageController.php
index 5f935ae689..fc10965d57 100644
--- a/application/src/Controller/SiteAdmin/PageController.php
+++ b/application/src/Controller/SiteAdmin/PageController.php
@@ -3,8 +3,8 @@
 
 use Omeka\Form\ConfirmForm;
 use Omeka\Form\SitePageForm;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
 
 class PageController extends AbstractActionController
 {
diff --git a/application/src/DataType/AbstractDataType.php b/application/src/DataType/AbstractDataType.php
index 90da374b8a..bd4949b250 100644
--- a/application/src/DataType/AbstractDataType.php
+++ b/application/src/DataType/AbstractDataType.php
@@ -2,7 +2,7 @@
 namespace Omeka\DataType;
 
 use Omeka\Api\Representation\ValueRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 abstract class AbstractDataType implements DataTypeInterface
 {
diff --git a/application/src/DataType/DataTypeInterface.php b/application/src/DataType/DataTypeInterface.php
index 82775d5bc4..2ef1874c8b 100644
--- a/application/src/DataType/DataTypeInterface.php
+++ b/application/src/DataType/DataTypeInterface.php
@@ -4,7 +4,7 @@
 use Omeka\Entity\Value;
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Representation\ValueRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * Interface for data types.
diff --git a/application/src/DataType/Literal.php b/application/src/DataType/Literal.php
index 17250f9de0..dbe551ac40 100644
--- a/application/src/DataType/Literal.php
+++ b/application/src/DataType/Literal.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Representation\ValueRepresentation;
 use Omeka\Entity\Value;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Literal extends AbstractDataType
 {
diff --git a/application/src/DataType/Manager.php b/application/src/DataType/Manager.php
index e790d725b6..726e1a7c6d 100644
--- a/application/src/DataType/Manager.php
+++ b/application/src/DataType/Manager.php
@@ -3,7 +3,7 @@
 
 use Omeka\Entity\Value;
 use Omeka\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/DataType/Resource/AbstractResource.php b/application/src/DataType/Resource/AbstractResource.php
index 07188ea0cf..47fb74d247 100644
--- a/application/src/DataType/Resource/AbstractResource.php
+++ b/application/src/DataType/Resource/AbstractResource.php
@@ -6,7 +6,7 @@
 use Omeka\Api\Representation\ValueRepresentation;
 use Omeka\DataType\AbstractDataType;
 use Omeka\Entity\Value;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 use Omeka\Stdlib\Message;
 
 abstract class AbstractResource extends AbstractDataType
diff --git a/application/src/DataType/Uri.php b/application/src/DataType/Uri.php
index 6521dfdf7d..100608f93c 100644
--- a/application/src/DataType/Uri.php
+++ b/application/src/DataType/Uri.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Representation\ValueRepresentation;
 use Omeka\Entity\Value;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Uri extends AbstractDataType
 {
diff --git a/application/src/Db/Event/Subscriber/Entity.php b/application/src/Db/Event/Subscriber/Entity.php
index 4bf6e0f28e..4014d3f023 100644
--- a/application/src/Db/Event/Subscriber/Entity.php
+++ b/application/src/Db/Event/Subscriber/Entity.php
@@ -5,8 +5,8 @@
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 use Doctrine\ORM\Events as DoctrineEvent;
 use Omeka\Entity\Resource as OmekaResource;
-use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\Event as ZendEvent;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\EventManager\Event as ZendEvent;
 
 /**
  * Entity event subscriber.
diff --git a/application/src/Db/Filter/ResourceVisibilityFilter.php b/application/src/Db/Filter/ResourceVisibilityFilter.php
index 032a8b4a91..be169c31c0 100644
--- a/application/src/Db/Filter/ResourceVisibilityFilter.php
+++ b/application/src/Db/Filter/ResourceVisibilityFilter.php
@@ -4,7 +4,7 @@
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetaData;
 use Doctrine\ORM\Query\Filter\SQLFilter;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Filter resource or resource-related entities by visibility.
diff --git a/application/src/Db/Filter/ValueVisibilityFilter.php b/application/src/Db/Filter/ValueVisibilityFilter.php
index 485b251bdb..a937beac96 100644
--- a/application/src/Db/Filter/ValueVisibilityFilter.php
+++ b/application/src/Db/Filter/ValueVisibilityFilter.php
@@ -4,7 +4,7 @@
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetaData;
 use Doctrine\ORM\Query\Filter\SQLFilter;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Filter value entities by visibility.
diff --git a/application/src/Db/Migration/ConstructedMigrationInterface.php b/application/src/Db/Migration/ConstructedMigrationInterface.php
index 15b011be0a..ca552f7bf0 100644
--- a/application/src/Db/Migration/ConstructedMigrationInterface.php
+++ b/application/src/Db/Migration/ConstructedMigrationInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Db\Migration;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Interface for database migrations.
diff --git a/application/src/Db/Migration/Manager.php b/application/src/Db/Migration/Manager.php
index 473dfb2373..fbd97b75c6 100644
--- a/application/src/Db/Migration/Manager.php
+++ b/application/src/Db/Migration/Manager.php
@@ -4,8 +4,8 @@
 use Doctrine\DBAL\Connection;
 use GlobIterator;
 use PDO;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Migration manager.
diff --git a/application/src/Entity/ApiKey.php b/application/src/Entity/ApiKey.php
index cbc7dc9acd..d5d98fa6bd 100644
--- a/application/src/Entity/ApiKey.php
+++ b/application/src/Entity/ApiKey.php
@@ -2,8 +2,8 @@
 namespace Omeka\Entity;
 
 use DateTime;
-use Zend\Crypt\Password\Bcrypt;
-use Zend\Math\Rand;
+use Laminas\Crypt\Password\Bcrypt;
+use Laminas\Math\Rand;
 
 /**
  * @Entity
diff --git a/application/src/Entity/EntityInterface.php b/application/src/Entity/EntityInterface.php
index 2d76182b89..8d26a01589 100644
--- a/application/src/Entity/EntityInterface.php
+++ b/application/src/Entity/EntityInterface.php
@@ -2,7 +2,7 @@
 namespace Omeka\Entity;
 
 use Omeka\Api\ResourceInterface as OmekaApiResourceInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface as ZendAclResourceInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface as ZendAclResourceInterface;
 
 /**
  * Entity interface.
diff --git a/application/src/Entity/Item.php b/application/src/Entity/Item.php
index 60a1513c1d..b4143cd576 100644
--- a/application/src/Entity/Item.php
+++ b/application/src/Entity/Item.php
@@ -37,12 +37,19 @@ class Item extends Resource
      */
     protected $itemSets;
 
+    /**
+     * @ManyToMany(targetEntity="Site", inversedBy="items", indexBy="id")
+     * @JoinTable(name="item_site")
+     */
+    protected $sites;
+
     public function __construct()
     {
         parent::__construct();
         $this->media = new ArrayCollection;
         $this->siteBlockAttachments = new ArrayCollection;
         $this->itemSets = new ArrayCollection;
+        $this->sites = new ArrayCollection;
     }
 
     public function getResourceName()
@@ -69,4 +76,9 @@ public function getItemSets()
     {
         return $this->itemSets;
     }
+
+    public function getSites()
+    {
+        return $this->sites;
+    }
 }
diff --git a/application/src/Entity/Site.php b/application/src/Entity/Site.php
index 61b039ea63..244e9e69b0 100644
--- a/application/src/Entity/Site.php
+++ b/application/src/Entity/Site.php
@@ -73,6 +73,11 @@ class Site extends AbstractEntity
      */
     protected $isPublic = true;
 
+    /**
+     * @Column(type="boolean", options={"default":false})
+     */
+    protected $assignNewItems = false;
+
     /**
      * @OneToMany(
      *     targetEntity="SitePage",
@@ -105,12 +110,19 @@ class Site extends AbstractEntity
      */
     protected $siteItemSets;
 
+    /**
+     * @ManyToMany(targetEntity="Item", mappedBy="sites", fetch="EXTRA_LAZY")
+     * @JoinTable(name="item_site")
+     */
+    protected $items;
+
     public function __construct()
     {
         $this->siteItems = new ArrayCollection;
         $this->pages = new ArrayCollection;
         $this->sitePermissions = new ArrayCollection;
         $this->siteItemSets = new ArrayCollection;
+        $this->items = new ArrayCollection;
     }
 
     public function getId()
@@ -228,6 +240,16 @@ public function isPublic()
         return (bool) $this->isPublic;
     }
 
+    public function setAssignNewItems($assignNewItems)
+    {
+        $this->assignNewItems = (bool) $assignNewItems;
+    }
+
+    public function getAssignNewItems()
+    {
+        return $this->assignNewItems;
+    }
+
     public function getPages()
     {
         return $this->pages;
@@ -242,4 +264,9 @@ public function getSiteItemSets()
     {
         return $this->siteItemSets;
     }
+
+    public function getItems()
+    {
+        return $this->items;
+    }
 }
diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
index 85d229bb30..f48065b4a2 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -5,7 +5,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 /**
  * @Entity
diff --git a/application/src/File/Downloader.php b/application/src/File/Downloader.php
index 6b66ef9c5c..74199c2bab 100644
--- a/application/src/File/Downloader.php
+++ b/application/src/File/Downloader.php
@@ -2,8 +2,8 @@
 namespace Omeka\File;
 
 use Omeka\Stdlib\ErrorStore;
-use Zend\Log\Logger;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Log\Logger;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use Omeka\Stdlib\Message;
 
 /**
@@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $services,
      * Pass the $errorStore object if an error should raise an API validation
      * error.
      *
-     * @param string|\Zend\Uri\Http $uri
+     * @param string|\Laminas\Uri\Http $uri
      * @param null|ErrorStore $errorStore
      * @return TempFile|false False on error
      */
@@ -68,7 +68,7 @@ public function download($uri, ErrorStore $errorStore = null)
                     $this->logger->err((string) $e);
                     if ($errorStore) {
                         $message = new Message(
-                            'Error downloading %s: %s', // @translate
+                            'Error downloading %1$s: %2$s', // @translate
                             (string) $uri, $e->getMessage()
                             );
                         $errorStore->addError('download', $message);
@@ -80,7 +80,7 @@ public function download($uri, ErrorStore $errorStore = null)
 
         if (!$response->isOk()) {
             $message = sprintf(
-                'Error downloading %s: %s %s', // @translate
+                'Error downloading %1$s: %2$s %3$s', // @translate
                 (string) $uri, $response->getStatusCode(), $response->getReasonPhrase()
                 );
             if ($errorStore) {
diff --git a/application/src/File/Store/Local.php b/application/src/File/Store/Local.php
index b2f172a03b..8d3279ae33 100644
--- a/application/src/File/Store/Local.php
+++ b/application/src/File/Store/Local.php
@@ -2,7 +2,7 @@
 namespace Omeka\File\Store;
 
 use Omeka\File\Exception;
-use Zend\Log\Logger;
+use Laminas\Log\Logger;
 
 /**
  * Local filesystem file store
diff --git a/application/src/File/TempFile.php b/application/src/File/TempFile.php
index 93dcc20355..3959694409 100644
--- a/application/src/File/TempFile.php
+++ b/application/src/File/TempFile.php
@@ -2,14 +2,14 @@
 namespace Omeka\File;
 
 use finfo;
+use Laminas\EventManager\Event;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Math\Rand;
 use Omeka\Api\Request;
 use Omeka\Entity\Media;
 use Omeka\File\Store\StoreInterface;
 use Omeka\Stdlib\ErrorStore;
 use XMLReader;
-use Zend\EventManager\Event;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Math\Rand;
 
 class TempFile
 {
diff --git a/application/src/File/TempFileFactory.php b/application/src/File/TempFileFactory.php
index 9a552044da..4936c8b9a9 100644
--- a/application/src/File/TempFileFactory.php
+++ b/application/src/File/TempFileFactory.php
@@ -1,9 +1,9 @@
 <?php
 namespace Omeka\File;
 
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class TempFileFactory implements EventManagerAwareInterface
 {
diff --git a/application/src/File/ThumbnailManager.php b/application/src/File/ThumbnailManager.php
index cc9d2fdd25..ebf2869bba 100644
--- a/application/src/File/ThumbnailManager.php
+++ b/application/src/File/ThumbnailManager.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\File;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class ThumbnailManager
 {
diff --git a/application/src/File/Uploader.php b/application/src/File/Uploader.php
index cdaf4dc1aa..34f84361f4 100644
--- a/application/src/File/Uploader.php
+++ b/application/src/File/Uploader.php
@@ -2,8 +2,8 @@
 namespace Omeka\File;
 
 use Omeka\Stdlib\ErrorStore;
-use Zend\Filter\File\RenameUpload;
-use Zend\InputFilter\FileInput;
+use Laminas\Filter\File\RenameUpload;
+use Laminas\InputFilter\FileInput;
 
 /**
  * File uploader service
diff --git a/application/src/File/Validator.php b/application/src/File/Validator.php
index f98ed1d5c3..19912d4f24 100644
--- a/application/src/File/Validator.php
+++ b/application/src/File/Validator.php
@@ -62,7 +62,7 @@ public function validate(TempFile $tempFile, ErrorStore $errorStore = null)
                 $isValid = false;
                 if ($errorStore) {
                     $message = new Message(
-                        'Error validating "%s". Cannot store files with the media type "%s".', // @translate
+                        'Error validating "%1$s". Cannot store files with the media type "%2$s".', // @translate
                         $tempFile->getSourceName(), $mediaType
                         );
                     $errorStore->addError('file', $message);
@@ -75,7 +75,7 @@ public function validate(TempFile $tempFile, ErrorStore $errorStore = null)
                 $isValid = false;
                 if ($errorStore) {
                     $message = new Message(
-                        'Error validating "%s". Cannot store files with the resolved extension "%s".', // @translate
+                        'Error validating "%1$s". Cannot store files with the resolved extension "%2$s".', // @translate
                         $tempFile->getSourceName(), $extension
                         );
                     $errorStore->addError('file', $message);
diff --git a/application/src/Form/ActivateForm.php b/application/src/Form/ActivateForm.php
index eba8f9039f..13c65a68f7 100644
--- a/application/src/Form/ActivateForm.php
+++ b/application/src/Form/ActivateForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class ActivateForm extends Form
 {
diff --git a/application/src/Form/ConfirmForm.php b/application/src/Form/ConfirmForm.php
index da8b91056e..77b1b6f36a 100644
--- a/application/src/Form/ConfirmForm.php
+++ b/application/src/Form/ConfirmForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 /**
  * General form for confirming an irreversable action in a sidebar.
diff --git a/application/src/Form/Element/AbstractGroupByOwnerSelect.php b/application/src/Form/Element/AbstractGroupByOwnerSelect.php
index 1ac217c2ef..d17768ac98 100644
--- a/application/src/Form/Element/AbstractGroupByOwnerSelect.php
+++ b/application/src/Form/Element/AbstractGroupByOwnerSelect.php
@@ -3,7 +3,7 @@
 
 use Omeka\Api\Manager as ApiManager;
 use Omeka\Api\Representation\UserRepresentation;
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 
 abstract class AbstractGroupByOwnerSelect extends Select
 {
diff --git a/application/src/Form/Element/AbstractVocabularyMemberSelect.php b/application/src/Form/Element/AbstractVocabularyMemberSelect.php
index 9c65510258..e7f0c412d3 100644
--- a/application/src/Form/Element/AbstractVocabularyMemberSelect.php
+++ b/application/src/Form/Element/AbstractVocabularyMemberSelect.php
@@ -2,10 +2,10 @@
 namespace Omeka\Form\Element;
 
 use Omeka\Api\Manager as ApiManager;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Form\Element\Select;
-use Zend\I18n\Translator\TranslatorAwareTrait;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Form\Element\Select;
+use Laminas\I18n\Translator\TranslatorAwareTrait;
 
 abstract class AbstractVocabularyMemberSelect extends Select implements EventManagerAwareInterface
 {
diff --git a/application/src/Form/Element/Asset.php b/application/src/Form/Element/Asset.php
index 57df974a74..897bc90721 100644
--- a/application/src/Form/Element/Asset.php
+++ b/application/src/Form/Element/Asset.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Element;
-use Zend\InputFilter\InputProviderInterface;
+use Laminas\Form\Element;
+use Laminas\InputFilter\InputProviderInterface;
 
 /**
  * Textarea element for HTML.
diff --git a/application/src/Form/Element/ColorPicker.php b/application/src/Form/Element/ColorPicker.php
index e3c66c5304..cd5765556b 100644
--- a/application/src/Form/Element/ColorPicker.php
+++ b/application/src/Form/Element/ColorPicker.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Element\Text;
-use Zend\InputFilter\InputProviderInterface;
+use Laminas\Form\Element\Text;
+use Laminas\InputFilter\InputProviderInterface;
 
 class ColorPicker extends Text implements InputProviderInterface
 {
diff --git a/application/src/Form/Element/HtmlTextarea.php b/application/src/Form/Element/HtmlTextarea.php
index d3dacd6e0c..dbf6cbece8 100644
--- a/application/src/Form/Element/HtmlTextarea.php
+++ b/application/src/Form/Element/HtmlTextarea.php
@@ -2,8 +2,8 @@
 namespace Omeka\Form\Element;
 
 use Omeka\Stdlib\HtmlPurifier;
-use Zend\Form\Element\Textarea;
-use Zend\InputFilter\InputProviderInterface;
+use Laminas\Form\Element\Textarea;
+use Laminas\InputFilter\InputProviderInterface;
 
 /**
  * Textarea element for HTML.
diff --git a/application/src/Form/Element/PasswordConfirm.php b/application/src/Form/Element/PasswordConfirm.php
index bdf82d311f..3bf080c065 100644
--- a/application/src/Form/Element/PasswordConfirm.php
+++ b/application/src/Form/Element/PasswordConfirm.php
@@ -1,8 +1,9 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Fieldset;
-use Zend\InputFilter\InputFilterProviderInterface;
+use Laminas\Form\Fieldset;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\InputFilter\InputFilterProviderInterface;
 
 class PasswordConfirm extends Fieldset implements InputFilterProviderInterface
 {
@@ -14,33 +15,34 @@ class PasswordConfirm extends Fieldset implements InputFilterProviderInterface
     public function init()
     {
         $config = $this->getPasswordConfig();
+        $translator = $this->getTranslator();
 
         $requirements = [];
         if (isset($config['min_length']) && is_numeric($config['min_length'])) {
-            $requirements[] = sprintf('be a minimum of %s characters in length.', // @translate
+            $requirements[] = sprintf($translator->translate('be a minimum of %s characters in length.'),
                 $config['min_length']);
         }
         if (isset($config['min_lowercase']) && is_numeric($config['min_lowercase'])) {
-            $requirements[] = sprintf('contain at least %s lowercase characters.', // @translate
+            $requirements[] = sprintf($translator->translate('contain at least %s lowercase characters.'),
                 $config['min_lowercase']);
         }
         if (isset($config['min_uppercase']) && is_numeric($config['min_uppercase'])) {
-            $requirements[] = sprintf('contain at least %s uppercase characters.', // @translate
+            $requirements[] = sprintf($translator->translate('contain at least %s uppercase characters.'),
                 $config['min_uppercase']);
         }
         if (isset($config['min_number']) && is_numeric($config['min_number'])) {
-            $requirements[] = sprintf('contain at least %s numbers.', // @translate
+            $requirements[] = sprintf($translator->translate('contain at least %s numbers.'),
                 $config['min_number']);
         }
         if (isset($config['min_symbol']) && is_numeric($config['min_symbol'])
             && isset($config['symbol_list']) && is_string($config['symbol_list'])
             && strlen($config['symbol_list'])
         ) {
-            $requirements[] = sprintf('contain at least %s symbols: %s', // @translate
+            $requirements[] = sprintf($translator->translate('contain at least %1$s symbols: %2$s'),
                 $config['min_symbol'], $config['symbol_list']);
         }
 
-        $requirementsHtml = 'Password must:'; // @translate
+        $requirementsHtml = $translator->translate('Password must:');
         $requirementsHtml .= '<ul>';
         foreach ($requirements as $requirement) {
             $requirementsHtml .= '<li>' . $requirement . '</li>';
@@ -227,4 +229,14 @@ public function getPasswordConfig()
     {
         return $this->passwordConfig;
     }
+
+    public function setTranslator(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function getTranslator()
+    {
+        return $this->translator;
+    }
 }
diff --git a/application/src/Form/Element/Recaptcha.php b/application/src/Form/Element/Recaptcha.php
index 622f436864..daf2c4614d 100644
--- a/application/src/Form/Element/Recaptcha.php
+++ b/application/src/Form/Element/Recaptcha.php
@@ -1,9 +1,9 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Element;
-use Zend\Http\Client;
-use Zend\InputFilter\InputProviderInterface;
+use Laminas\Form\Element;
+use Laminas\Http\Client;
+use Laminas\InputFilter\InputProviderInterface;
 
 /**
  * A reCAPTCHA form element used to verify whether a user is human.
diff --git a/application/src/Form/Element/ResourceSelect.php b/application/src/Form/Element/ResourceSelect.php
index de163e1f3b..ba0d02eab5 100644
--- a/application/src/Form/Element/ResourceSelect.php
+++ b/application/src/Form/Element/ResourceSelect.php
@@ -2,7 +2,7 @@
 namespace Omeka\Form\Element;
 
 use Omeka\Api\Manager as ApiManager;
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 
 class ResourceSelect extends Select
 {
diff --git a/application/src/Form/Element/RestoreTextarea.php b/application/src/Form/Element/RestoreTextarea.php
index f944c93640..e8320b4726 100644
--- a/application/src/Form/Element/RestoreTextarea.php
+++ b/application/src/Form/Element/RestoreTextarea.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Element\Textarea;
+use Laminas\Form\Element\Textarea;
 
 class RestoreTextarea extends Textarea
 {
diff --git a/application/src/Form/Element/SitePageSelect.php b/application/src/Form/Element/SitePageSelect.php
index f8881ad850..ebe4e7a1c5 100644
--- a/application/src/Form/Element/SitePageSelect.php
+++ b/application/src/Form/Element/SitePageSelect.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form\Element;
 
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 
 class SitePageSelect extends Select
 {
diff --git a/application/src/Form/Element/UserSelect.php b/application/src/Form/Element/UserSelect.php
index 2362e9e917..474b60f42f 100644
--- a/application/src/Form/Element/UserSelect.php
+++ b/application/src/Form/Element/UserSelect.php
@@ -2,7 +2,7 @@
 namespace Omeka\Form\Element;
 
 use Omeka\Api\Manager as ApiManager;
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 
 class UserSelect extends Select
 {
diff --git a/application/src/Form/Factory/InvokableFactory.php b/application/src/Form/Factory/InvokableFactory.php
index 36501de7e9..4b236faec6 100644
--- a/application/src/Form/Factory/InvokableFactory.php
+++ b/application/src/Form/Factory/InvokableFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Form\Factory;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * Factory for instantiating "invokable" forms.
diff --git a/application/src/Form/ForgotPasswordForm.php b/application/src/Form/ForgotPasswordForm.php
index 2991f00f7c..b1617555ae 100644
--- a/application/src/Form/ForgotPasswordForm.php
+++ b/application/src/Form/ForgotPasswordForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class ForgotPasswordForm extends Form
 {
diff --git a/application/src/Form/Initializer/Csrf.php b/application/src/Form/Initializer/Csrf.php
index cb63853753..3e1b44dc35 100644
--- a/application/src/Form/Initializer/Csrf.php
+++ b/application/src/Form/Initializer/Csrf.php
@@ -2,9 +2,9 @@
 namespace Omeka\Form\Initializer;
 
 use Interop\Container\ContainerInterface;
-use Zend\Form\Form;
-use Zend\ServiceManager\Initializer\InitializerInterface;
-use Zend\Validator\Csrf as CsrfValidator;
+use Laminas\Form\Form;
+use Laminas\ServiceManager\Initializer\InitializerInterface;
+use Laminas\Validator\Csrf as CsrfValidator;
 
 class Csrf implements InitializerInterface
 {
diff --git a/application/src/Form/InstallationForm.php b/application/src/Form/InstallationForm.php
index 7fa552a61a..cc67203abd 100644
--- a/application/src/Form/InstallationForm.php
+++ b/application/src/Form/InstallationForm.php
@@ -2,7 +2,7 @@
 namespace Omeka\Form;
 
 use DateTimeZone;
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class InstallationForm extends Form
 {
diff --git a/application/src/Form/LoginForm.php b/application/src/Form/LoginForm.php
index de518c947b..bb33b96e03 100644
--- a/application/src/Form/LoginForm.php
+++ b/application/src/Form/LoginForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class LoginForm extends Form
 {
diff --git a/application/src/Form/ModuleStateChangeForm.php b/application/src/Form/ModuleStateChangeForm.php
index 818ec3061e..94bc6dce68 100644
--- a/application/src/Form/ModuleStateChangeForm.php
+++ b/application/src/Form/ModuleStateChangeForm.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\View\Helper\Url;
-use Zend\Form\Form;
+use Laminas\View\Helper\Url;
+use Laminas\Form\Form;
 
 class ModuleStateChangeForm extends Form
 {
diff --git a/application/src/Form/ResourceBatchUpdateForm.php b/application/src/Form/ResourceBatchUpdateForm.php
index f9e201baaa..9ae4a5750a 100644
--- a/application/src/Form/ResourceBatchUpdateForm.php
+++ b/application/src/Form/ResourceBatchUpdateForm.php
@@ -5,11 +5,11 @@
 use Omeka\Form\Element\PropertySelect;
 use Omeka\Form\Element\ResourceClassSelect;
 use Omeka\Form\Element\ResourceSelect;
-use Zend\EventManager\Event;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Form\Element;
-use Zend\Form\Form;
-use Zend\View\Helper\Url;
+use Laminas\EventManager\Event;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Form\Element;
+use Laminas\Form\Form;
+use Laminas\View\Helper\Url;
 
 class ResourceBatchUpdateForm extends Form
 {
diff --git a/application/src/Form/ResourceForm.php b/application/src/Form/ResourceForm.php
index 674938a8a2..326a45a019 100644
--- a/application/src/Form/ResourceForm.php
+++ b/application/src/Form/ResourceForm.php
@@ -3,10 +3,10 @@
 
 use Omeka\Form\Element\ResourceSelect;
 use Omeka\Form\Element\ResourceClassSelect;
-use Zend\Form\Form;
-use Zend\View\Helper\Url;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\Event;
+use Laminas\Form\Form;
+use Laminas\View\Helper\Url;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\Event;
 
 class ResourceForm extends Form
 {
diff --git a/application/src/Form/ResourceTemplateForm.php b/application/src/Form/ResourceTemplateForm.php
index 817fabb950..f7ef19c13e 100644
--- a/application/src/Form/ResourceTemplateForm.php
+++ b/application/src/Form/ResourceTemplateForm.php
@@ -2,7 +2,7 @@
 namespace Omeka\Form;
 
 use Omeka\Form\Element\ResourceClassSelect;
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class ResourceTemplateForm extends Form
 {
diff --git a/application/src/Form/ResourceTemplateImportForm.php b/application/src/Form/ResourceTemplateImportForm.php
index b24eb2daf6..ef488d456e 100644
--- a/application/src/Form/ResourceTemplateImportForm.php
+++ b/application/src/Form/ResourceTemplateImportForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class ResourceTemplateImportForm extends Form
 {
diff --git a/application/src/Form/ResourceTemplateReviewImportForm.php b/application/src/Form/ResourceTemplateReviewImportForm.php
index 4a243c4363..5d21807025 100644
--- a/application/src/Form/ResourceTemplateReviewImportForm.php
+++ b/application/src/Form/ResourceTemplateReviewImportForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class ResourceTemplateReviewImportForm extends Form
 {
diff --git a/application/src/Form/SettingForm.php b/application/src/Form/SettingForm.php
index ec5314341f..8a9931e712 100644
--- a/application/src/Form/SettingForm.php
+++ b/application/src/Form/SettingForm.php
@@ -5,9 +5,9 @@
 use Omeka\Form\Element\SiteSelect;
 use Omeka\Form\Element\RestoreTextarea;
 use Omeka\Settings\Settings;
-use Zend\Form\Form;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\Event;
+use Laminas\Form\Form;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\Event;
 
 class SettingForm extends Form
 {
@@ -34,6 +34,9 @@ class SettingForm extends Form
         'application/vnd.oasis.opendocument.presentation',
         'application/vnd.oasis.opendocument.spreadsheet',
         'application/vnd.oasis.opendocument.text',
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
         'application/x-gzip',
         'application/x-ms-wmp',
         'application/x-msdownload',
@@ -54,6 +57,7 @@ class SettingForm extends Form
         // image/*
         'image/bmp',
         'image/gif',
+        'image/jp2',
         'image/jpeg',
         'image/pjpeg',
         'image/png',
diff --git a/application/src/Form/SiteForm.php b/application/src/Form/SiteForm.php
index 1a0f80d311..172c240718 100644
--- a/application/src/Form/SiteForm.php
+++ b/application/src/Form/SiteForm.php
@@ -1,9 +1,9 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\Event;
+use Laminas\Form\Form;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\Event;
 
 class SiteForm extends Form
 {
@@ -46,6 +46,19 @@ public function init()
                 'required' => false,
             ],
         ]);
+        if ('add' === $this->getOption('action')) {
+            $this->add([
+                'name' => 'o:assign_new_items',
+                'type' => 'checkbox',
+                'options' => [
+                    'label' => 'Assign new items', // @translate
+                ],
+                'attributes' => [
+                    'id' => 'assign_new_items',
+                    'value' => true,
+                ],
+            ]);
+        }
 
         $event = new Event('form.add_elements', $this);
         $triggerResult = $this->getEventManager()->triggerEvent($event);
diff --git a/application/src/Form/SitePageForm.php b/application/src/Form/SitePageForm.php
index 3864fc4ba4..757e1adbf0 100644
--- a/application/src/Form/SitePageForm.php
+++ b/application/src/Form/SitePageForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class SitePageForm extends Form
 {
diff --git a/application/src/Form/SiteResourcesForm.php b/application/src/Form/SiteResourcesForm.php
new file mode 100644
index 0000000000..3cc2f6d702
--- /dev/null
+++ b/application/src/Form/SiteResourcesForm.php
@@ -0,0 +1,55 @@
+<?php
+namespace Omeka\Form;
+
+use Zend\Form\Form;
+
+class SiteResourcesForm extends Form
+{
+    public function init()
+    {
+        $this->add([
+            'name' => 'o:assign_new_items',
+            'type' => 'checkbox',
+            'options' => [
+                'label' => 'Assign new items', // @translate
+                'info' => 'Select this if you want newly created items to be assigned to this site. Note that item owners may unassign their items at any time.', // @translate
+            ],
+            'attributes' => [
+                'id' => 'assign_new_items',
+                'value' => true,
+            ],
+        ]);
+        $this->add([
+            'type' => 'select',
+            'name' => 'item_assignment_action',
+            'options' => [
+                'label' => 'Assignment action', // @translate
+                'empty_option' => '[No action]', // @translate
+                'value_options' => [
+                    'add' => 'Add - keep existing items and assign items from the following search', // @translate
+                    'replace' => 'Replace - unassign all items and assign items from the following search', // @translate
+                    'remove' => 'Remove - unassign items from the following search', // @translate
+                    'remove_all' => 'Remove all - unassign all items', // @translate
+                ],
+            ],
+        ]);
+        $this->add([
+            'type' => 'checkbox',
+            'name' => 'save_search',
+            'options' => [
+                'label' => 'Save this search', // @translate
+                'info' => 'Use this as a convenient way to store a commonly used query. For example, you will likely want to save a search for periodic adding, but will not want to save a search for a one-time removal.', // @translate
+            ],
+        ]);
+
+        $inputFilter = $this->getInputFilter();
+        $inputFilter->add([
+            'name' => 'item_assignment_action',
+            'allow_empty' => true,
+        ]);
+        $inputFilter->add([
+            'name' => 'save_search',
+            'allow_empty' => true,
+        ]);
+    }
+}
diff --git a/application/src/Form/SiteSettingsForm.php b/application/src/Form/SiteSettingsForm.php
index 592ef9ca73..6cc2029ae4 100644
--- a/application/src/Form/SiteSettingsForm.php
+++ b/application/src/Form/SiteSettingsForm.php
@@ -3,9 +3,9 @@
 
 use Omeka\Form\Element\PropertySelect;
 use Omeka\Settings\SiteSettings;
-use Zend\Form\Form;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\Event;
+use Laminas\Form\Form;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\Event;
 
 class SiteSettingsForm extends Form
 {
@@ -188,6 +188,25 @@ public function init()
             ],
         ]);
         $searchFieldset = $this->get('search');
+        $resourceNames = [
+            'site_pages' => 'Site pages', // @translate
+            'items' => 'Items', // @translate
+            'item_sets' => 'Item sets', // @translate
+        ];
+        $searchFieldset->add([
+            'name' => 'search_resource_names',
+            'type' => \Zend\Form\Element\MultiCheckbox::class,
+            'options' => [
+                'label' => 'Search resources', // @translate
+                'info' => 'Customize which types of resources will be searchable in the main search field.', // @translate
+                'value_options' => $resourceNames,
+            ],
+            'attributes' => [
+                'id' => 'search_resource_names',
+                'value' => $settings->get('search_resource_names', ['site_pages', 'items']),
+                'required' => false,
+            ],
+        ]);
         $searchFieldset->add([
             'type' => 'Omeka\Form\Element\ResourceTemplateSelect',
             'name' => 'search_apply_templates',
@@ -246,6 +265,11 @@ public function init()
             'required' => false,
             'allow_empty' => true,
         ]);
+        $inputFilter->get('search')->add([
+            'name' => 'search_resource_names',
+            'required' => false,
+            'allow_empty' => true,
+        ]);
         $inputFilter->get('search')->add([
             'name' => 'search_apply_templates',
             'required' => false,
diff --git a/application/src/Form/UserBatchUpdateForm.php b/application/src/Form/UserBatchUpdateForm.php
index d3ba8eb28a..2eb583b3cc 100644
--- a/application/src/Form/UserBatchUpdateForm.php
+++ b/application/src/Form/UserBatchUpdateForm.php
@@ -2,10 +2,10 @@
 namespace Omeka\Form;
 
 use Omeka\Form\Element\SiteSelect;
-use Zend\EventManager\Event;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Form\Form;
-use Zend\View\Helper\Url;
+use Laminas\EventManager\Event;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Form\Form;
+use Laminas\View\Helper\Url;
 
 class UserBatchUpdateForm extends Form
 {
diff --git a/application/src/Form/UserForm.php b/application/src/Form/UserForm.php
index 2e8809550e..91a7a0a75b 100644
--- a/application/src/Form/UserForm.php
+++ b/application/src/Form/UserForm.php
@@ -5,9 +5,9 @@
 use Omeka\Permissions\Acl;
 use Omeka\Settings\Settings;
 use Omeka\Settings\UserSettings;
-use Zend\Form\Form;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\Event;
+use Laminas\Form\Form;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\Event;
 
 class UserForm extends Form
 {
diff --git a/application/src/Form/View/Helper/FormAsset.php b/application/src/Form/View/Helper/FormAsset.php
index 6e5aa28f16..9c8105e5a0 100644
--- a/application/src/Form/View/Helper/FormAsset.php
+++ b/application/src/Form/View/Helper/FormAsset.php
@@ -2,8 +2,8 @@
 namespace Omeka\Form\View\Helper;
 
 use Omeka\Api\Representation\AssetRepresentation;
-use Zend\Form\View\Helper\AbstractHelper;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\AbstractHelper;
+use Laminas\Form\ElementInterface;
 
 class FormAsset extends AbstractHelper
 {
diff --git a/application/src/Form/View/Helper/FormCkeditor.php b/application/src/Form/View/Helper/FormCkeditor.php
index fce92b22be..8ecfd944fc 100644
--- a/application/src/Form/View/Helper/FormCkeditor.php
+++ b/application/src/Form/View/Helper/FormCkeditor.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\View\Helper;
 
-use Zend\Form\View\Helper\FormTextarea;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\FormTextarea;
+use Laminas\Form\ElementInterface;
 
 /**
  * Render a textarea with a CKEditor HTML editor enabled.
diff --git a/application/src/Form/View/Helper/FormCkeditorInline.php b/application/src/Form/View/Helper/FormCkeditorInline.php
index c537863f53..fb223d22c1 100644
--- a/application/src/Form/View/Helper/FormCkeditorInline.php
+++ b/application/src/Form/View/Helper/FormCkeditorInline.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\View\Helper;
 
-use Zend\Form\View\Helper\FormTextarea;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\FormTextarea;
+use Laminas\Form\ElementInterface;
 
 /**
  * Render a textarea with an inline CKEditor HTML editor enabled.
diff --git a/application/src/Form/View/Helper/FormColorPicker.php b/application/src/Form/View/Helper/FormColorPicker.php
index 4b67866b49..fa15128239 100644
--- a/application/src/Form/View/Helper/FormColorPicker.php
+++ b/application/src/Form/View/Helper/FormColorPicker.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\View\Helper;
 
-use Zend\Form\View\Helper\FormText;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\FormText;
+use Laminas\Form\ElementInterface;
 
 class FormColorPicker extends FormText
 {
diff --git a/application/src/Form/View/Helper/FormRecaptcha.php b/application/src/Form/View/Helper/FormRecaptcha.php
index 8146d33c94..19545c08fb 100644
--- a/application/src/Form/View/Helper/FormRecaptcha.php
+++ b/application/src/Form/View/Helper/FormRecaptcha.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\View\Helper;
 
-use Zend\Form\View\Helper\AbstractHelper;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\AbstractHelper;
+use Laminas\Form\ElementInterface;
 
 class FormRecaptcha extends AbstractHelper
 {
diff --git a/application/src/Form/View/Helper/FormRestoreTextarea.php b/application/src/Form/View/Helper/FormRestoreTextarea.php
index a45de29c9b..fc4cd847a9 100644
--- a/application/src/Form/View/Helper/FormRestoreTextarea.php
+++ b/application/src/Form/View/Helper/FormRestoreTextarea.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Form\View\Helper;
 
-use Zend\Form\View\Helper\FormTextarea;
-use Zend\Form\ElementInterface;
+use Laminas\Form\View\Helper\FormTextarea;
+use Laminas\Form\ElementInterface;
 
 class FormRestoreTextarea extends FormTextarea
 {
diff --git a/application/src/Form/VocabularyForm.php b/application/src/Form/VocabularyForm.php
index 7c1777fbd4..381b92bdc9 100644
--- a/application/src/Form/VocabularyForm.php
+++ b/application/src/Form/VocabularyForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class VocabularyForm extends Form
 {
diff --git a/application/src/Form/VocabularyUpdateForm.php b/application/src/Form/VocabularyUpdateForm.php
index 14ac765942..66cd12301c 100644
--- a/application/src/Form/VocabularyUpdateForm.php
+++ b/application/src/Form/VocabularyUpdateForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Form;
 
-use Zend\Form\Form;
+use Laminas\Form\Form;
 
 class VocabularyUpdateForm extends Form
 {
diff --git a/application/src/I18n/Translator.php b/application/src/I18n/Translator.php
index 6539b6572e..14c3ac961f 100644
--- a/application/src/I18n/Translator.php
+++ b/application/src/I18n/Translator.php
@@ -2,7 +2,7 @@
 namespace Omeka\I18n;
 
 use Omeka\Stdlib\Message;
-use Zend\I18n\Translator\TranslatorInterface;
+use Laminas\I18n\Translator\TranslatorInterface;
 
 class Translator implements TranslatorInterface
 {
diff --git a/application/src/Installation/Installer.php b/application/src/Installation/Installer.php
index f39d10e8be..e3059eacb6 100644
--- a/application/src/Installation/Installer.php
+++ b/application/src/Installation/Installer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Installation;
 
 use Omeka\Stdlib\ErrorStore;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class Installer
 {
diff --git a/application/src/Installation/Task/DestroySessionTask.php b/application/src/Installation/Task/DestroySessionTask.php
index 88a90e8cb3..c546a14505 100644
--- a/application/src/Installation/Task/DestroySessionTask.php
+++ b/application/src/Installation/Task/DestroySessionTask.php
@@ -2,7 +2,7 @@
 namespace Omeka\Installation\Task;
 
 use Omeka\Installation\Installer;
-use Zend\Session\Container;
+use Laminas\Session\Container;
 
 /**
  * Task to destroy the session.
diff --git a/application/src/Job/AbstractJob.php b/application/src/Job/AbstractJob.php
index 32c9daed2f..77ec8e6834 100644
--- a/application/src/Job/AbstractJob.php
+++ b/application/src/Job/AbstractJob.php
@@ -2,7 +2,7 @@
 namespace Omeka\Job;
 
 use Omeka\Entity\Job;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 abstract class AbstractJob implements JobInterface
 {
diff --git a/application/src/Job/DispatchStrategy/PhpCli.php b/application/src/Job/DispatchStrategy/PhpCli.php
index 56d1b95f2e..acfaf59b2e 100644
--- a/application/src/Job/DispatchStrategy/PhpCli.php
+++ b/application/src/Job/DispatchStrategy/PhpCli.php
@@ -44,8 +44,8 @@ public function __construct(Cli $cli, $basePath, $phpPath = null)
      * The perform-job script then sets them to the PHP-CLI context.
      *
      * @todo Pass the server URL, or compents required to set one
-     * @see \Zend\View\Helper\BasePath
-     * @see \Zend\View\Helper\ServerUrl
+     * @see \Laminas\View\Helper\BasePath
+     * @see \Laminas\View\Helper\ServerUrl
      *
      * {@inheritDoc}
      */
diff --git a/application/src/Job/DispatchStrategy/Synchronous.php b/application/src/Job/DispatchStrategy/Synchronous.php
index 8bbfb98da9..c8c6964b9d 100644
--- a/application/src/Job/DispatchStrategy/Synchronous.php
+++ b/application/src/Job/DispatchStrategy/Synchronous.php
@@ -4,7 +4,7 @@
 use DateTime;
 use Doctrine\ORM\EntityManager;
 use Omeka\Entity\Job;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class Synchronous implements StrategyInterface
 {
diff --git a/application/src/Job/Dispatcher.php b/application/src/Job/Dispatcher.php
index 1f8d442205..a6cb2aa648 100644
--- a/application/src/Job/Dispatcher.php
+++ b/application/src/Job/Dispatcher.php
@@ -6,8 +6,8 @@
 use Omeka\Job\DispatchStrategy\StrategyInterface;
 use Omeka\Entity\Job;
 use Omeka\Log\Writer\Job as JobWriter;
-use Zend\Authentication\AuthenticationService;
-use Zend\Log\Logger;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Log\Logger;
 
 class Dispatcher
 {
diff --git a/application/src/Job/UpdateSiteItems.php b/application/src/Job/UpdateSiteItems.php
new file mode 100644
index 0000000000..3a2aae37f7
--- /dev/null
+++ b/application/src/Job/UpdateSiteItems.php
@@ -0,0 +1,114 @@
+<?php
+namespace Omeka\Job;
+
+use Doctrine\DBAL\Connection;
+use Omeka\Job\Exception\InvalidArgumentException;
+
+/**
+ * Update item assignments for one or more site.
+ *
+ * The job accepts two arguments:
+ *
+ * - sites: An array of item queries keyed by their respective site IDs
+ * - action: The update action
+ *   - add: Keep existing items and assign the result set
+ *   - replace: Unassign all items and assign the result set
+ *   - remove: Unassign all items in the result set
+ *   - remove_all: Unassign all items
+ */
+class UpdateSiteItems extends AbstractJob
+{
+    /**
+     * @var Valid actions
+     */
+    protected $actions = ['add', 'replace', 'remove', 'remove_all'];
+
+    public function perform()
+    {
+        $services = $this->getServiceLocator();
+        $acl = $services->get('Omeka\Acl');
+        $conn = $services->get('Omeka\Connection');
+
+        $action = $this->getArg('action');
+        $sites = $this->getArg('sites');
+
+        // Grant "view-all" privileges to include private items. We need this
+        // for situations when the Job has no owner, like during a migration.
+        $acl->allow(null, 'Omeka\Entity\Resource', 'view-all');
+
+        // Validate the user data.
+        if (!is_string($action)) {
+            throw new InvalidArgumentException('No "action" string passed to the UpdateSiteItems job');
+        }
+        if (!in_array($action, $this->actions)) {
+            throw new InvalidArgumentException(sprintf('Invalid "action" string "%s" passed to the UpdateSiteItems job', $action));
+        }
+        if (!is_array($sites)) {
+            throw new InvalidArgumentException('No "sites" array passed to the UpdateSiteItems job');
+        }
+        foreach ($sites as $siteId => $query) {
+            if (!is_array($query)) {
+                // If the query is not an array, assume an all-inclusive query.
+                $sites[$siteId] = [];
+            }
+            $siteExists = $conn->fetchColumn('SELECT 1 FROM site WHERE id = ?', [$siteId], 0);
+            if (false === $siteExists) {
+                throw new InvalidArgumentException(sprintf('Invalid site ID "%s" passed to the UpdateSiteItems job', $siteId));
+            }
+        }
+
+        // Update the site-item assignments.
+        foreach ($sites as $siteId => $query) {
+            $this->updateSiteItems($siteId, $query, $action);
+        }
+    }
+
+    /**
+     * Update item assignments for one site.
+     *
+     * Note that we chunk item IDs to avoid query/buffer/packet size limits.
+     *
+     * @param int $siteId
+     * @param array $query
+     * @param string $action
+     */
+    protected function updateSiteItems(int $siteId, array $query, string $action) : void
+    {
+        $services = $this->getServiceLocator();
+        $api = $services->get('Omeka\ApiManager');
+        $conn = $services->get('Omeka\Connection');
+
+        $itemIds = $api->search('items', $query, ['returnScalar' => 'id'])->getContent();
+
+        if (in_array($action, ['replace', 'remove_all'])) {
+            $conn->delete('item_site', ['site_id' => $siteId]);
+        }
+
+        if (in_array($action, ['add', 'replace'])) {
+            foreach (array_chunk($itemIds, 1000) as $itemIdsChunk) {
+                $values = [];
+                $bindValues = [];
+                foreach ($itemIdsChunk as $itemId) {
+                    $values[] = '(?,?)';
+                    $bindValues[] = $itemId;
+                    $bindValues[] = $siteId;
+                }
+                // Note the use of IGNORE here to prevent duplicate-key errors.
+                $sql = sprintf('INSERT IGNORE INTO item_site (item_id, site_id) VALUES %s', implode(',', $values));
+                $stmt = $conn->prepare($sql);
+                foreach ($bindValues as $position => $value) {
+                    $stmt->bindValue($position + 1, $value);
+                }
+                $stmt->execute();
+            }
+        }
+
+        if (in_array($action, ['remove'])) {
+            foreach (array_chunk($itemIds, 1000) as $itemIdsChunk) {
+                $sql = sprintf('DELETE FROM item_site WHERE site_id = ? AND item_id IN (?)');
+                $stmt = $conn->executeQuery($sql, [$siteId, $itemIdsChunk], [null, Connection::PARAM_INT_ARRAY]);
+                $stmt->execute();
+            }
+        }
+    }
+}
diff --git a/application/src/Log/Writer/Job.php b/application/src/Log/Writer/Job.php
index 1883238fd9..36168cd2cb 100644
--- a/application/src/Log/Writer/Job.php
+++ b/application/src/Log/Writer/Job.php
@@ -2,8 +2,8 @@
 namespace Omeka\Log\Writer;
 
 use Omeka\Entity\Job as JobEntity;
-use Zend\Log\Writer\AbstractWriter;
-use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Laminas\Log\Writer\AbstractWriter;
+use Laminas\Log\Formatter\Simple as SimpleFormatter;
 
 class Job extends AbstractWriter
 {
diff --git a/application/src/Media/FileRenderer/AudioRenderer.php b/application/src/Media/FileRenderer/AudioRenderer.php
index d40e2b116f..d96f9f9505 100644
--- a/application/src/Media/FileRenderer/AudioRenderer.php
+++ b/application/src/Media/FileRenderer/AudioRenderer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\FileRenderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class AudioRenderer implements RendererInterface
 {
diff --git a/application/src/Media/FileRenderer/FallbackRenderer.php b/application/src/Media/FileRenderer/FallbackRenderer.php
index ce0eeba6e8..7c68e4ef9a 100644
--- a/application/src/Media/FileRenderer/FallbackRenderer.php
+++ b/application/src/Media/FileRenderer/FallbackRenderer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\FileRenderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class FallbackRenderer implements RendererInterface
 {
diff --git a/application/src/Media/FileRenderer/Manager.php b/application/src/Media/FileRenderer/Manager.php
index 8b4680c906..66fda6ef45 100644
--- a/application/src/Media/FileRenderer/Manager.php
+++ b/application/src/Media/FileRenderer/Manager.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Media\FileRenderer;
 
-use Zend\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\AbstractPluginManager;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/Media/FileRenderer/RendererInterface.php b/application/src/Media/FileRenderer/RendererInterface.php
index 2cc8b4f71f..eb5c900443 100644
--- a/application/src/Media/FileRenderer/RendererInterface.php
+++ b/application/src/Media/FileRenderer/RendererInterface.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\FileRenderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * Interface for file renderers.
diff --git a/application/src/Media/FileRenderer/ThumbnailRenderer.php b/application/src/Media/FileRenderer/ThumbnailRenderer.php
index 5e07202924..45aff18df6 100644
--- a/application/src/Media/FileRenderer/ThumbnailRenderer.php
+++ b/application/src/Media/FileRenderer/ThumbnailRenderer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\FileRenderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ThumbnailRenderer implements RendererInterface
 {
diff --git a/application/src/Media/FileRenderer/VideoRenderer.php b/application/src/Media/FileRenderer/VideoRenderer.php
index 4322559c58..0970c125e8 100644
--- a/application/src/Media/FileRenderer/VideoRenderer.php
+++ b/application/src/Media/FileRenderer/VideoRenderer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\FileRenderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class VideoRenderer implements RendererInterface
 {
diff --git a/application/src/Media/Ingester/Fallback.php b/application/src/Media/Ingester/Fallback.php
index 549cabb5f0..44d1cdc9ee 100644
--- a/application/src/Media/Ingester/Fallback.php
+++ b/application/src/Media/Ingester/Fallback.php
@@ -4,8 +4,8 @@
 use Omeka\Api\Request;
 use Omeka\Entity\Media;
 use Omeka\Stdlib\ErrorStore;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Fallback implements IngesterInterface
 {
diff --git a/application/src/Media/Ingester/Html.php b/application/src/Media/Ingester/Html.php
index 9a434d0133..3affc822a4 100644
--- a/application/src/Media/Ingester/Html.php
+++ b/application/src/Media/Ingester/Html.php
@@ -7,7 +7,7 @@
 use Omeka\Form\Element\Ckeditor;
 use Omeka\Stdlib\HtmlPurifier;
 use Omeka\Stdlib\ErrorStore;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Html implements MutableIngesterInterface
 {
diff --git a/application/src/Media/Ingester/IIIF.php b/application/src/Media/Ingester/IIIF.php
index b26b701e0d..93fb1f4b05 100644
--- a/application/src/Media/Ingester/IIIF.php
+++ b/application/src/Media/Ingester/IIIF.php
@@ -5,10 +5,10 @@
 use Omeka\Entity\Media;
 use Omeka\File\Downloader;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Element\Url as UrlElement;
-use Zend\Http\Client as HttpClient;
-use Zend\Uri\Http as HttpUri;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element\Url as UrlElement;
+use Laminas\Http\Client as HttpClient;
+use Laminas\Uri\Http as HttpUri;
+use Laminas\View\Renderer\PhpRenderer;
 
 class IIIF implements IngesterInterface
 {
diff --git a/application/src/Media/Ingester/IngesterInterface.php b/application/src/Media/Ingester/IngesterInterface.php
index c4325054d9..62f6d6e956 100644
--- a/application/src/Media/Ingester/IngesterInterface.php
+++ b/application/src/Media/Ingester/IngesterInterface.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Request;
 use Omeka\Entity\Media;
 use Omeka\Stdlib\ErrorStore;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * Interface for media ingesters.
diff --git a/application/src/Media/Ingester/Manager.php b/application/src/Media/Ingester/Manager.php
index 347e328a9c..aa43f6dca1 100644
--- a/application/src/Media/Ingester/Manager.php
+++ b/application/src/Media/Ingester/Manager.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Ingester;
 
 use Omeka\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/Media/Ingester/MutableIngesterInterface.php b/application/src/Media/Ingester/MutableIngesterInterface.php
index 2271568e94..971c342901 100644
--- a/application/src/Media/Ingester/MutableIngesterInterface.php
+++ b/application/src/Media/Ingester/MutableIngesterInterface.php
@@ -5,7 +5,7 @@
 use Omeka\Api\Request;
 use Omeka\Entity\Media;
 use Omeka\Stdlib\ErrorStore;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * Interface for media ingesters that allow updating.
diff --git a/application/src/Media/Ingester/OEmbed.php b/application/src/Media/Ingester/OEmbed.php
index b4ed147912..adf83a4573 100644
--- a/application/src/Media/Ingester/OEmbed.php
+++ b/application/src/Media/Ingester/OEmbed.php
@@ -5,11 +5,11 @@
 use Omeka\Entity\Media;
 use Omeka\File\Downloader;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Dom\Query;
-use Zend\Form\Element\Url as UrlElement;
-use Zend\Http\Client as HttpClient;
-use Zend\Uri\Http as HttpUri;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Dom\Query;
+use Laminas\Form\Element\Url as UrlElement;
+use Laminas\Http\Client as HttpClient;
+use Laminas\Uri\Http as HttpUri;
+use Laminas\View\Renderer\PhpRenderer;
 
 class OEmbed implements IngesterInterface
 {
diff --git a/application/src/Media/Ingester/Upload.php b/application/src/Media/Ingester/Upload.php
index 74f9e82535..2f8a43da5e 100644
--- a/application/src/Media/Ingester/Upload.php
+++ b/application/src/Media/Ingester/Upload.php
@@ -5,8 +5,8 @@
 use Omeka\Entity\Media;
 use Omeka\File\Uploader;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Element\File;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element\File;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Upload implements IngesterInterface
 {
diff --git a/application/src/Media/Ingester/Url.php b/application/src/Media/Ingester/Url.php
index b710a79cf6..198a52650e 100644
--- a/application/src/Media/Ingester/Url.php
+++ b/application/src/Media/Ingester/Url.php
@@ -5,9 +5,9 @@
 use Omeka\Entity\Media;
 use Omeka\File\Downloader;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Element\Url as UrlElement;
-use Zend\Uri\Http as HttpUri;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element\Url as UrlElement;
+use Laminas\Uri\Http as HttpUri;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Url implements IngesterInterface
 {
diff --git a/application/src/Media/Ingester/Youtube.php b/application/src/Media/Ingester/Youtube.php
index a952795d14..78300d0531 100644
--- a/application/src/Media/Ingester/Youtube.php
+++ b/application/src/Media/Ingester/Youtube.php
@@ -5,10 +5,10 @@
 use Omeka\Entity\Media;
 use Omeka\File\Downloader;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Element\Text;
-use Zend\Form\Element\Url as UrlElement;
-use Zend\Uri\Http as HttpUri;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Element\Url as UrlElement;
+use Laminas\Uri\Http as HttpUri;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Youtube implements IngesterInterface
 {
diff --git a/application/src/Media/Renderer/Fallback.php b/application/src/Media/Renderer/Fallback.php
index 64705cd74e..374bf2e119 100644
--- a/application/src/Media/Renderer/Fallback.php
+++ b/application/src/Media/Renderer/Fallback.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Fallback implements RendererInterface
 {
diff --git a/application/src/Media/Renderer/File.php b/application/src/Media/Renderer/File.php
index 449d04f555..79f29ad490 100644
--- a/application/src/Media/Renderer/File.php
+++ b/application/src/Media/Renderer/File.php
@@ -3,8 +3,8 @@
 
 use Omeka\Api\Representation\MediaRepresentation;
 use Omeka\Media\FileRenderer\Manager as FileRendererManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\View\Renderer\PhpRenderer;
 
 class File implements RendererInterface
 {
diff --git a/application/src/Media/Renderer/Html.php b/application/src/Media/Renderer/Html.php
index 0a7d301ae9..6673166e96 100644
--- a/application/src/Media/Renderer/Html.php
+++ b/application/src/Media/Renderer/Html.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Html implements RendererInterface
 {
diff --git a/application/src/Media/Renderer/IIIF.php b/application/src/Media/Renderer/IIIF.php
index fcc5817e5e..c746b010d6 100644
--- a/application/src/Media/Renderer/IIIF.php
+++ b/application/src/Media/Renderer/IIIF.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class IIIF implements RendererInterface
 {
diff --git a/application/src/Media/Renderer/Manager.php b/application/src/Media/Renderer/Manager.php
index 1507e58590..1be5a6daac 100644
--- a/application/src/Media/Renderer/Manager.php
+++ b/application/src/Media/Renderer/Manager.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Media\Renderer;
 
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/Media/Renderer/OEmbed.php b/application/src/Media/Renderer/OEmbed.php
index 8f8299e07b..7dfb234624 100644
--- a/application/src/Media/Renderer/OEmbed.php
+++ b/application/src/Media/Renderer/OEmbed.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class OEmbed implements RendererInterface
 {
diff --git a/application/src/Media/Renderer/RendererInterface.php b/application/src/Media/Renderer/RendererInterface.php
index 519368ace7..e620141fcb 100644
--- a/application/src/Media/Renderer/RendererInterface.php
+++ b/application/src/Media/Renderer/RendererInterface.php
@@ -2,7 +2,7 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 interface RendererInterface
 {
diff --git a/application/src/Media/Renderer/Youtube.php b/application/src/Media/Renderer/Youtube.php
index 3aae15a7d7..df79ec8d32 100644
--- a/application/src/Media/Renderer/Youtube.php
+++ b/application/src/Media/Renderer/Youtube.php
@@ -2,8 +2,8 @@
 namespace Omeka\Media\Renderer;
 
 use Omeka\Api\Representation\MediaRepresentation;
-use Zend\Uri\Http as HttpUri;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Uri\Http as HttpUri;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Youtube implements RendererInterface
 {
diff --git a/application/src/Module/AbstractModule.php b/application/src/Module/AbstractModule.php
index 6c3b75b2c5..34d7103460 100644
--- a/application/src/Module/AbstractModule.php
+++ b/application/src/Module/AbstractModule.php
@@ -2,13 +2,13 @@
 namespace Omeka\Module;
 
 use ReflectionClass;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\EventManager\SharedEventManagerInterface;
-use Zend\ModuleManager\Feature\ConfigProviderInterface;
-use Zend\Mvc\Controller\AbstractController;
-use Zend\Mvc\MvcEvent;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\SharedEventManagerInterface;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
+use Laminas\Mvc\Controller\AbstractController;
+use Laminas\Mvc\MvcEvent;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\View\Renderer\PhpRenderer;
 
 /**
  * Abstract Omeka module.
@@ -97,7 +97,7 @@ public function handleConfigForm(AbstractController $controller)
      * </code>
      *
      * The shared event callbacks receive a
-     * {@link \Zend\EventManager\EventInterface} object as its only parameter.
+     * {@link \Laminas\EventManager\EventInterface} object as its only parameter.
      *
      * @param SharedEventManagerInterface $sharedEventManager
      */
@@ -127,7 +127,7 @@ public function getAutoloaderConfig()
 
         $autoloadPath = sprintf('%1$s/modules/%2$s/src', OMEKA_PATH, $namespace);
         return [
-            'Zend\Loader\StandardAutoloader' => [
+            'Laminas\Loader\StandardAutoloader' => [
                 'namespaces' => [
                     $namespace => $autoloadPath,
                 ],
diff --git a/application/src/Module/Manager.php b/application/src/Module/Manager.php
index 437eab2e7a..9ae9f1bfc0 100644
--- a/application/src/Module/Manager.php
+++ b/application/src/Module/Manager.php
@@ -4,9 +4,9 @@
 use Doctrine\ORM\EntityManager;
 use Omeka\Entity\Module as ModuleEntity;
 use Omeka\Permissions\Exception as AclException;
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class Manager implements ResourceInterface
 {
@@ -167,7 +167,7 @@ public function activate(Module $module)
         // Only a deactivated module can be activated
         if (self::STATE_NOT_ACTIVE !== $module->getState()) {
             throw new Exception\ModuleStateInvalidException(sprintf(
-                $t->translate('Module "%s" is marked as "%s" and cannot be activated'),
+                $t->translate('Module "%1$s" is marked as "%2$s" and cannot be activated'),
                 $module->getId(), $module->getState()
             ));
         }
@@ -199,7 +199,7 @@ public function deactivate(Module $module)
         // Only an active module can be deactivated
         if (self::STATE_ACTIVE !== $module->getState()) {
             throw new Exception\ModuleStateInvalidException(sprintf(
-                $t->translate('Module "%s" is marked as "%s" and cannot be deactivated'),
+                $t->translate('Module "%1$s" is marked as "%2$s" and cannot be deactivated'),
                 $module->getId(), $module->getState()
             ));
         }
@@ -230,7 +230,7 @@ public function install(Module $module)
         // Only a not installed module can be installed
         if (self::STATE_NOT_INSTALLED !== $module->getState()) {
             throw new Exception\ModuleStateInvalidException(sprintf(
-                $this->getTranslator()->translate('Module "%s" is marked as "%s" and cannot be installed'),
+                $this->getTranslator()->translate('Module "%1$s" is marked as "%2$s" and cannot be installed'),
                 $module->getId(), $module->getState()
             ));
         }
@@ -268,7 +268,7 @@ public function uninstall(Module $module)
             self::STATE_NOT_ACTIVE,
         ])) {
             throw new Exception\ModuleStateInvalidException(sprintf(
-                $t->translate('Module "%s" is marked as "%s" and cannot be uninstalled'),
+                $t->translate('Module "%1$s" is marked as "%2$s" and cannot be uninstalled'),
                 $module->getId(), $module->getState()
             ));
         }
@@ -306,7 +306,7 @@ public function upgrade(Module $module)
         // Only a module marked for upgrade can be upgraded
         if (self::STATE_NEEDS_UPGRADE !== $module->getState()) {
             throw new Exception\ModuleStateInvalidException(sprintf(
-                $t->translate('Module "%s" is marked as "%s" and cannot be upgraded'),
+                $t->translate('Module "%1$s" is marked as "%2$s" and cannot be upgraded'),
                 $module->getId(), $module->getState()
             ));
         }
@@ -407,7 +407,7 @@ protected function authorize(Module $module, $privilege)
         if (!$acl->userIsAllowed($this, $privilege)) {
             throw new AclException\PermissionDeniedException(sprintf(
                 $this->getTranslator()->translate(
-                    'Permission denied for the current user to %s the %s module.'
+                    'Permission denied for the current user to %1$s the %2$s module.'
                 ),
                 $privilege, $module->getId()
             ));
diff --git a/application/src/Mvc/Application.php b/application/src/Mvc/Application.php
index 091718eb45..a35fe86ae0 100644
--- a/application/src/Mvc/Application.php
+++ b/application/src/Mvc/Application.php
@@ -2,9 +2,9 @@
 namespace Omeka\Mvc;
 
 use Omeka\Module\Manager as ModuleManager;
-use Zend\Mvc\Application as ZendApplication;
-use Zend\Mvc\Service;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\Mvc\Application as ZendApplication;
+use Laminas\Mvc\Service;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
  * Application class for invoking the Omeka application.
diff --git a/application/src/Mvc/Controller/Plugin/Api.php b/application/src/Mvc/Controller/Plugin/Api.php
index 619ff787fa..8075a95d08 100644
--- a/application/src/Mvc/Controller/Plugin/Api.php
+++ b/application/src/Mvc/Controller/Plugin/Api.php
@@ -5,8 +5,8 @@
 use Omeka\Api\Manager;
 use Omeka\Api\Response;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Form;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Form\Form;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for providing passthrough methods to the API manager.
diff --git a/application/src/Mvc/Controller/Plugin/CurrentSite.php b/application/src/Mvc/Controller/Plugin/CurrentSite.php
index a0c55eadb1..d047a700fe 100644
--- a/application/src/Mvc/Controller/Plugin/CurrentSite.php
+++ b/application/src/Mvc/Controller/Plugin/CurrentSite.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Api\Representation\SiteRepresentation;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting the current site representation.
diff --git a/application/src/Mvc/Controller/Plugin/GetForm.php b/application/src/Mvc/Controller/Plugin/GetForm.php
index a720947616..f8034e5cfa 100644
--- a/application/src/Mvc/Controller/Plugin/GetForm.php
+++ b/application/src/Mvc/Controller/Plugin/GetForm.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Controller plugin for getting a form from the form element manager.
@@ -26,7 +26,7 @@ public function __construct(ServiceLocatorInterface $formElementManager)
      *
      * @param string $class
      * @param array $options
-     * @return \Zend\Form\Form
+     * @return \Laminas\Form\Form
      */
     public function __invoke($class, array $options = null)
     {
diff --git a/application/src/Mvc/Controller/Plugin/JobDispatcher.php b/application/src/Mvc/Controller/Plugin/JobDispatcher.php
index 54a1dbb418..75295101f9 100644
--- a/application/src/Mvc/Controller/Plugin/JobDispatcher.php
+++ b/application/src/Mvc/Controller/Plugin/JobDispatcher.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Job\Dispatcher;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting the job dispatcher.
diff --git a/application/src/Mvc/Controller/Plugin/Logger.php b/application/src/Mvc/Controller/Plugin/Logger.php
index 18baae6691..f5a845d37f 100644
--- a/application/src/Mvc/Controller/Plugin/Logger.php
+++ b/application/src/Mvc/Controller/Plugin/Logger.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Log\LoggerInterface;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Log\LoggerInterface;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting the logger.
diff --git a/application/src/Mvc/Controller/Plugin/Mailer.php b/application/src/Mvc/Controller/Plugin/Mailer.php
index 4d6a184261..4d051d50ba 100644
--- a/application/src/Mvc/Controller/Plugin/Mailer.php
+++ b/application/src/Mvc/Controller/Plugin/Mailer.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Stdlib\Mailer as MailerService;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting the mailer service.
diff --git a/application/src/Mvc/Controller/Plugin/MergeValuesJson.php b/application/src/Mvc/Controller/Plugin/MergeValuesJson.php
new file mode 100644
index 0000000000..b97f973923
--- /dev/null
+++ b/application/src/Mvc/Controller/Plugin/MergeValuesJson.php
@@ -0,0 +1,32 @@
+<?php
+namespace Omeka\Mvc\Controller\Plugin;
+
+use Omeka\Mvc\Exception;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
+
+/**
+ * Controller plugin for getting a form from the form element manager.
+ */
+class MergeValuesJson extends AbstractPlugin
+{
+    /**
+     * Merge separated JSON-encoded value data back into the main data array.
+     *
+     * @param array $data POST data
+     * @return array
+     */
+    public function __invoke($data)
+    {
+        // Don't even try to continue if the values are missing, throw an error
+        // instead of possibly deleting data because of a client-side error
+        if (!isset($data['values_json']) || !$data['values_json']) {
+            throw new Exception\RuntimeException('No JSON values data found in input.');
+        }
+        $jsonData = json_decode($data['values_json'], true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw new Exception\InvalidJsonException('JSON error: ' . json_last_error_msg());
+        }
+        unset($data['values-json']);
+        return array_merge($data, $jsonData);
+    }
+}
diff --git a/application/src/Mvc/Controller/Plugin/Messenger.php b/application/src/Mvc/Controller/Plugin/Messenger.php
index 7ea4fc84c5..514ff3576d 100644
--- a/application/src/Mvc/Controller/Plugin/Messenger.php
+++ b/application/src/Mvc/Controller/Plugin/Messenger.php
@@ -1,9 +1,9 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Form\Fieldset;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\Session\Container;
+use Laminas\Form\Fieldset;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Session\Container;
 
 /**
  * Controller plugin for implementing session-based messages.
diff --git a/application/src/Mvc/Controller/Plugin/Paginator.php b/application/src/Mvc/Controller/Plugin/Paginator.php
index 8d1123c2ec..ce4ebd204e 100644
--- a/application/src/Mvc/Controller/Plugin/Paginator.php
+++ b/application/src/Mvc/Controller/Plugin/Paginator.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\View\HelperPluginManager;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\View\HelperPluginManager;
 
 /**
  * Controller plugin for setting variables to the pagination view helper.
diff --git a/application/src/Mvc/Controller/Plugin/SetBrowseDefaults.php b/application/src/Mvc/Controller/Plugin/SetBrowseDefaults.php
index 0c06f41f50..0dd9022919 100644
--- a/application/src/Mvc/Controller/Plugin/SetBrowseDefaults.php
+++ b/application/src/Mvc/Controller/Plugin/SetBrowseDefaults.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for setting browse default parameters.
@@ -14,7 +14,7 @@ class SetBrowseDefaults extends AbstractPlugin
      * @param string $sortBy
      * @param string $sortOrder
      * @param int $page
-     * @return \Zend\Stdlib\Parameters
+     * @return \Laminas\Stdlib\Parameters
      */
     public function __invoke($sortBy, $sortOrder = 'desc', $page = 1)
     {
diff --git a/application/src/Mvc/Controller/Plugin/Settings.php b/application/src/Mvc/Controller/Plugin/Settings.php
index fd218b3354..fe39444d3b 100644
--- a/application/src/Mvc/Controller/Plugin/Settings.php
+++ b/application/src/Mvc/Controller/Plugin/Settings.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Settings\SettingsInterface;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting settings.
diff --git a/application/src/Mvc/Controller/Plugin/Status.php b/application/src/Mvc/Controller/Plugin/Status.php
index 2fbe1d3269..570439249b 100644
--- a/application/src/Mvc/Controller/Plugin/Status.php
+++ b/application/src/Mvc/Controller/Plugin/Status.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Mvc\Status as StatusService;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for getting the status service.
diff --git a/application/src/Mvc/Controller/Plugin/Translate.php b/application/src/Mvc/Controller/Plugin/Translate.php
index a6fc5aca2a..5894e5e028 100644
--- a/application/src/Mvc/Controller/Plugin/Translate.php
+++ b/application/src/Mvc/Controller/Plugin/Translate.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for translating a message.
diff --git a/application/src/Mvc/Controller/Plugin/UserIsAllowed.php b/application/src/Mvc/Controller/Plugin/UserIsAllowed.php
index 7fb025a5a3..2820e2d50f 100644
--- a/application/src/Mvc/Controller/Plugin/UserIsAllowed.php
+++ b/application/src/Mvc/Controller/Plugin/UserIsAllowed.php
@@ -2,7 +2,7 @@
 namespace Omeka\Mvc\Controller\Plugin;
 
 use Omeka\Permissions\Acl;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
 
 /**
  * Controller plugin for authorize the current user.
@@ -27,7 +27,7 @@ public function __construct(Acl $acl)
     /**
      * Authorize the current user.
      *
-     * @param \Zend\Permissions\Acl\Resource\ResourceInterface|string $resource
+     * @param \Laminas\Permissions\Acl\Resource\ResourceInterface|string $resource
      * @param string $privilege
      * @return bool
      */
diff --git a/application/src/Mvc/Controller/Plugin/ViewHelpers.php b/application/src/Mvc/Controller/Plugin/ViewHelpers.php
index d34134147f..94123d5a0a 100644
--- a/application/src/Mvc/Controller/Plugin/ViewHelpers.php
+++ b/application/src/Mvc/Controller/Plugin/ViewHelpers.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Mvc\Controller\Plugin;
 
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\View\HelperPluginManager;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\View\HelperPluginManager;
 
 /**
  * Controller plugin for getting the view helper plugin manager.
diff --git a/application/src/Mvc/ExceptionListener.php b/application/src/Mvc/ExceptionListener.php
index 63e0608d39..d4b8b93de2 100644
--- a/application/src/Mvc/ExceptionListener.php
+++ b/application/src/Mvc/ExceptionListener.php
@@ -5,13 +5,13 @@
 use Omeka\Api\Exception as ApiException;
 use Omeka\Mvc\Exception as MvcException;
 use Omeka\Permissions\Exception as AclException;
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Http\Response;
-use Zend\Mvc\Application as ZendApplication;
-use Zend\Mvc\MvcEvent;
-use Zend\Stdlib\ResponseInterface;
-use Zend\View\Model\ViewModel;
+use Laminas\EventManager\AbstractListenerAggregate;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\Http\Response;
+use Laminas\Mvc\Application as ZendApplication;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Stdlib\ResponseInterface;
+use Laminas\View\Model\ViewModel;
 
 /**
  * MVC listener for handling specific exception types with "pretty" pages.
diff --git a/application/src/Mvc/MvcListeners.php b/application/src/Mvc/MvcListeners.php
index a1f0ec9e64..b55b31bf15 100644
--- a/application/src/Mvc/MvcListeners.php
+++ b/application/src/Mvc/MvcListeners.php
@@ -6,14 +6,14 @@
 use Omeka\Session\SaveHandler\Db;
 use Omeka\Site\Theme\Manager;
 use Omeka\Site\Theme\Theme;
-use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\Mvc\Application as ZendApplication;
-use Zend\Mvc\MvcEvent;
-use Zend\Session\Config\SessionConfig;
-use Zend\Session\Container;
-use Zend\Session\SessionManager;
-use Zend\Validator\AbstractValidator;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\EventManager\AbstractListenerAggregate;
+use Laminas\Mvc\Application as ZendApplication;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Session\Config\SessionConfig;
+use Laminas\Session\Container;
+use Laminas\Session\SessionManager;
+use Laminas\Validator\AbstractValidator;
 
 class MvcListeners extends AbstractListenerAggregate
 {
@@ -144,7 +144,7 @@ public function bootstrapLocale(MvcEvent $event)
      * Redirect all requests to install route if Omeka is not installed.
      *
      * @param MvcEvent $event
-     * @return \Zend\Http\PhpEnvironment\Response
+     * @return \Laminas\Http\PhpEnvironment\Response
      */
     public function redirectToInstallation(MvcEvent $event)
     {
@@ -175,7 +175,7 @@ public function redirectToInstallation(MvcEvent $event)
      * on all other routes.
      *
      * @param MvcEvent $event
-     * @return \Zend\Http\PhpEnvironment\Response
+     * @return \Laminas\Http\PhpEnvironment\Response
      */
     public function redirectToMigration(MvcEvent $event)
     {
@@ -221,7 +221,7 @@ public function redirectToMigration(MvcEvent $event)
      * Redirect all admin requests to login route if user not logged in.
      *
      * @param MvcEvent $event
-     * @return \Zend\Http\PhpEnvironment\Response
+     * @return \Laminas\Http\PhpEnvironment\Response
      */
     public function redirectToLogin(MvcEvent $event)
     {
diff --git a/application/src/Mvc/Status.php b/application/src/Mvc/Status.php
index 9d6b444968..a870367e3e 100644
--- a/application/src/Mvc/Status.php
+++ b/application/src/Mvc/Status.php
@@ -3,7 +3,7 @@
 
 use Composer\Semver\Comparator;
 use Omeka\Module as OmekaModule;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class Status
 {
@@ -64,7 +64,7 @@ public function setIsInstalled($isInstalled)
     /**
      * Get the route match.
      *
-     * @return Zend\Router\Http\RouteMatch
+     * @return Laminas\Router\Http\RouteMatch
      */
     public function getRouteMatch()
     {
diff --git a/application/src/Permissions/Acl.php b/application/src/Permissions/Acl.php
index 2b5500ae46..68345a3bef 100644
--- a/application/src/Permissions/Acl.php
+++ b/application/src/Permissions/Acl.php
@@ -2,8 +2,8 @@
 namespace Omeka\Permissions;
 
 use Omeka\Api\ResourceInterface;
-use Zend\Authentication\AuthenticationServiceInterface;
-use Zend\Permissions\Acl\Acl as ZendAcl;
+use Laminas\Authentication\AuthenticationServiceInterface;
+use Laminas\Permissions\Acl\Acl as ZendAcl;
 
 class Acl extends ZendAcl
 {
diff --git a/application/src/Permissions/Assertion/AssertionNegation.php b/application/src/Permissions/Assertion/AssertionNegation.php
index d17c9bd336..ff1e0bdec5 100644
--- a/application/src/Permissions/Assertion/AssertionNegation.php
+++ b/application/src/Permissions/Assertion/AssertionNegation.php
@@ -1,10 +1,10 @@
 <?php
 namespace Omeka\Permissions\Assertion;
 
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 /**
  * Simple wrapper that negates an existing assertion.
diff --git a/application/src/Permissions/Assertion/HasSitePermissionAssertion.php b/application/src/Permissions/Assertion/HasSitePermissionAssertion.php
index ceb413b24c..a949b80625 100644
--- a/application/src/Permissions/Assertion/HasSitePermissionAssertion.php
+++ b/application/src/Permissions/Assertion/HasSitePermissionAssertion.php
@@ -4,10 +4,10 @@
 use Doctrine\Common\Collections\Criteria;
 use Omeka\Entity\Site;
 use Omeka\Entity\SitePermission;
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 class HasSitePermissionAssertion implements AssertionInterface
 {
diff --git a/application/src/Permissions/Assertion/IsSelfAssertion.php b/application/src/Permissions/Assertion/IsSelfAssertion.php
index b8120ad7b7..32ca27da29 100644
--- a/application/src/Permissions/Assertion/IsSelfAssertion.php
+++ b/application/src/Permissions/Assertion/IsSelfAssertion.php
@@ -1,10 +1,10 @@
 <?php
 namespace Omeka\Permissions\Assertion;
 
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 class IsSelfAssertion implements AssertionInterface
 {
diff --git a/application/src/Permissions/Assertion/OwnsEntityAssertion.php b/application/src/Permissions/Assertion/OwnsEntityAssertion.php
index dffd504b50..f148ea69cd 100644
--- a/application/src/Permissions/Assertion/OwnsEntityAssertion.php
+++ b/application/src/Permissions/Assertion/OwnsEntityAssertion.php
@@ -2,10 +2,10 @@
 namespace Omeka\Permissions\Assertion;
 
 use Omeka\Entity\Value;
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 class OwnsEntityAssertion implements AssertionInterface
 {
diff --git a/application/src/Permissions/Assertion/SiteIsPublicAssertion.php b/application/src/Permissions/Assertion/SiteIsPublicAssertion.php
index 424da4dfe9..244fca6f3f 100644
--- a/application/src/Permissions/Assertion/SiteIsPublicAssertion.php
+++ b/application/src/Permissions/Assertion/SiteIsPublicAssertion.php
@@ -2,10 +2,10 @@
 namespace Omeka\Permissions\Assertion;
 
 use Omeka\Entity\Site;
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 class SiteIsPublicAssertion implements AssertionInterface
 {
diff --git a/application/src/Permissions/Assertion/UserIsAdminAssertion.php b/application/src/Permissions/Assertion/UserIsAdminAssertion.php
index b9ef8a468a..20917a595c 100644
--- a/application/src/Permissions/Assertion/UserIsAdminAssertion.php
+++ b/application/src/Permissions/Assertion/UserIsAdminAssertion.php
@@ -2,10 +2,10 @@
 namespace Omeka\Permissions\Assertion;
 
 use Omeka\Entity\User;
-use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Assertion\AssertionInterface;
-use Zend\Permissions\Acl\Resource\ResourceInterface;
-use Zend\Permissions\Acl\Role\RoleInterface;
+use Laminas\Permissions\Acl\Acl;
+use Laminas\Permissions\Acl\Assertion\AssertionInterface;
+use Laminas\Permissions\Acl\Resource\ResourceInterface;
+use Laminas\Permissions\Acl\Role\RoleInterface;
 
 class UserIsAdminAssertion implements AssertionInterface
 {
diff --git a/application/src/Service/AclFactory.php b/application/src/Service/AclFactory.php
index 8436362bc8..9a13ca6bee 100644
--- a/application/src/Service/AclFactory.php
+++ b/application/src/Service/AclFactory.php
@@ -9,8 +9,8 @@
 use Omeka\Permissions\Assertion\IsSelfAssertion;
 use Omeka\Permissions\Assertion\OwnsEntityAssertion;
 use Omeka\Permissions\Assertion\UserIsAdminAssertion;
-use Zend\Permissions\Acl\Assertion\AssertionAggregate;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Permissions\Acl\Assertion\AssertionAggregate;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * Access control list factory.
@@ -102,7 +102,7 @@ protected function addResources(Acl $acl, ContainerInterface $serviceLocator)
         $entities = $serviceLocator->get('Omeka\EntityManager')->getConfiguration()
             ->getMetadataDriverImpl()->getAllClassNames();
         foreach ($entities as $entityClass) {
-            if (is_subclass_of($entityClass, 'Zend\Permissions\Acl\Resource\ResourceInterface')) {
+            if (is_subclass_of($entityClass, 'Laminas\Permissions\Acl\Resource\ResourceInterface')) {
                 $acl->addResource($entityClass);
             }
         }
@@ -220,6 +220,18 @@ protected function addRulesForSites(Acl $acl)
             'read',
             $viewerAssertion
         );
+
+        $canAssignItemsAssertion = $this->aggregate([
+            new OwnsEntityAssertion,
+            new HasSitePermissionAssertion('admin'),
+            new HasSitePermissionAssertion('editor'),
+        ], AssertionAggregate::MODE_AT_LEAST_ONE);
+        $acl->allow(
+            null,
+            'Omeka\Entity\Site',
+            'can-assign-items',
+            $canAssignItemsAssertion
+        );
     }
 
     /**
@@ -697,6 +709,30 @@ protected function addRulesForEditor(Acl $acl)
                 'delete',
             ]
         );
+        $acl->allow(
+            'editor',
+            [
+                'Omeka\Api\Adapter\ItemAdapter',
+                'Omeka\Api\Adapter\ItemSetAdapter',
+                'Omeka\Api\Adapter\MediaAdapter',
+            ],
+            [
+                'batch_update',
+                'batch_delete',
+            ]
+        );
+        $acl->allow(
+            'editor',
+            [
+                'Omeka\Controller\Admin\Item',
+                'Omeka\Controller\Admin\ItemSet',
+                'Omeka\Controller\Admin\Media',
+            ],
+            [
+                'batch-edit',
+                'batch-delete',
+            ]
+        );
         $acl->allow(
             'editor',
             'Omeka\Entity\Resource',
diff --git a/application/src/Service/ApiAdapterManagerFactory.php b/application/src/Service/ApiAdapterManagerFactory.php
index 3ba2ec7810..f1a942e804 100644
--- a/application/src/Service/ApiAdapterManagerFactory.php
+++ b/application/src/Service/ApiAdapterManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Api\Adapter\Manager as AdapterManager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ApiManagerFactory.php b/application/src/Service/ApiManagerFactory.php
index 15eebb0e6c..69d08f84c0 100644
--- a/application/src/Service/ApiManagerFactory.php
+++ b/application/src/Service/ApiManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Api\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ApiManagerFactory implements FactoryInterface
diff --git a/application/src/Service/AuthenticationServiceFactory.php b/application/src/Service/AuthenticationServiceFactory.php
index 346ce06283..2088b3dbac 100644
--- a/application/src/Service/AuthenticationServiceFactory.php
+++ b/application/src/Service/AuthenticationServiceFactory.php
@@ -4,11 +4,11 @@
 use Omeka\Authentication\Adapter\KeyAdapter;
 use Omeka\Authentication\Adapter\PasswordAdapter;
 use Omeka\Authentication\Storage\DoctrineWrapper;
-use Zend\Authentication\AuthenticationService;
-use Zend\Authentication\Adapter\Callback;
-use Zend\Authentication\Storage\NonPersistent;
-use Zend\Authentication\Storage\Session;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Authentication\AuthenticationService;
+use Laminas\Authentication\Adapter\Callback;
+use Laminas\Authentication\Storage\NonPersistent;
+use Laminas\Authentication\Storage\Session;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/BlockLayout/HtmlFactory.php b/application/src/Service/BlockLayout/HtmlFactory.php
index ee7efeb5de..5729222e53 100644
--- a/application/src/Service/BlockLayout/HtmlFactory.php
+++ b/application/src/Service/BlockLayout/HtmlFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Site\BlockLayout\Html;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class HtmlFactory implements FactoryInterface
 {
diff --git a/application/src/Service/BlockLayoutManagerFactory.php b/application/src/Service/BlockLayoutManagerFactory.php
index 8a5e77cd8e..26425bc5f0 100644
--- a/application/src/Service/BlockLayoutManagerFactory.php
+++ b/application/src/Service/BlockLayoutManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Site\BlockLayout\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class BlockLayoutManagerFactory implements FactoryInterface
diff --git a/application/src/Service/CliFactory.php b/application/src/Service/CliFactory.php
index 3bd4979a0a..958c96f982 100644
--- a/application/src/Service/CliFactory.php
+++ b/application/src/Service/CliFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\Cli;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class CliFactory implements FactoryInterface
diff --git a/application/src/Service/ConnectionFactory.php b/application/src/Service/ConnectionFactory.php
index b0f4d70979..737af9add8 100644
--- a/application/src/Service/ConnectionFactory.php
+++ b/application/src/Service/ConnectionFactory.php
@@ -5,7 +5,7 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Omeka\Db\Logging\FileSqlLogger;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/Controller/Admin/ItemControllerFactory.php b/application/src/Service/Controller/Admin/ItemControllerFactory.php
index a2fb4037ca..745b942009 100644
--- a/application/src/Service/Controller/Admin/ItemControllerFactory.php
+++ b/application/src/Service/Controller/Admin/ItemControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\ItemController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ItemControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/Admin/ModuleControllerFactory.php b/application/src/Service/Controller/Admin/ModuleControllerFactory.php
index a324ac5565..644539994d 100644
--- a/application/src/Service/Controller/Admin/ModuleControllerFactory.php
+++ b/application/src/Service/Controller/Admin/ModuleControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\ModuleController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ModuleControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/Admin/ResourceTemplateControllerFactory.php b/application/src/Service/Controller/Admin/ResourceTemplateControllerFactory.php
index df688ce184..648b72e3cb 100644
--- a/application/src/Service/Controller/Admin/ResourceTemplateControllerFactory.php
+++ b/application/src/Service/Controller/Admin/ResourceTemplateControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\ResourceTemplateController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ResourceTemplateControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/Admin/SystemInfoControllerFactory.php b/application/src/Service/Controller/Admin/SystemInfoControllerFactory.php
index 9b4572d297..4e2cf485e4 100644
--- a/application/src/Service/Controller/Admin/SystemInfoControllerFactory.php
+++ b/application/src/Service/Controller/Admin/SystemInfoControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\SystemInfoController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SystemInfoControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/Admin/UserControllerFactory.php b/application/src/Service/Controller/Admin/UserControllerFactory.php
index 0ffcc09b38..2711704e36 100644
--- a/application/src/Service/Controller/Admin/UserControllerFactory.php
+++ b/application/src/Service/Controller/Admin/UserControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\UserController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class UserControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/Admin/VocabularyControllerFactory.php b/application/src/Service/Controller/Admin/VocabularyControllerFactory.php
index c91f711605..c1cf3c5d42 100644
--- a/application/src/Service/Controller/Admin/VocabularyControllerFactory.php
+++ b/application/src/Service/Controller/Admin/VocabularyControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\Admin\VocabularyController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class VocabularyControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/ApiControllerFactory.php b/application/src/Service/Controller/ApiControllerFactory.php
index 193d4ec7ca..f8d56de426 100644
--- a/application/src/Service/Controller/ApiControllerFactory.php
+++ b/application/src/Service/Controller/ApiControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\ApiController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ApiControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/InstallControllerFactory.php b/application/src/Service/Controller/InstallControllerFactory.php
index 84c001eedd..be3c1f114a 100644
--- a/application/src/Service/Controller/InstallControllerFactory.php
+++ b/application/src/Service/Controller/InstallControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\InstallController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class InstallControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/LoginControllerFactory.php b/application/src/Service/Controller/LoginControllerFactory.php
index 16366ad01d..d9954cac5b 100644
--- a/application/src/Service/Controller/LoginControllerFactory.php
+++ b/application/src/Service/Controller/LoginControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\LoginController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class LoginControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/MigrateControllerFactory.php b/application/src/Service/Controller/MigrateControllerFactory.php
index 26d7945528..f86931d4c7 100644
--- a/application/src/Service/Controller/MigrateControllerFactory.php
+++ b/application/src/Service/Controller/MigrateControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\MigrateController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class MigrateControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Controller/SiteAdmin/IndexControllerFactory.php b/application/src/Service/Controller/SiteAdmin/IndexControllerFactory.php
index 0a91f01fbd..b37244ff17 100644
--- a/application/src/Service/Controller/SiteAdmin/IndexControllerFactory.php
+++ b/application/src/Service/Controller/SiteAdmin/IndexControllerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Controller\SiteAdmin\IndexController;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class IndexControllerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/ApiFactory.php b/application/src/Service/ControllerPlugin/ApiFactory.php
index 5aa6eb208a..9bf3105c30 100644
--- a/application/src/Service/ControllerPlugin/ApiFactory.php
+++ b/application/src/Service/ControllerPlugin/ApiFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Api;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ApiFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/GetFormFactory.php b/application/src/Service/ControllerPlugin/GetFormFactory.php
index 68981668c5..dc70a6050f 100644
--- a/application/src/Service/ControllerPlugin/GetFormFactory.php
+++ b/application/src/Service/ControllerPlugin/GetFormFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\GetForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class GetFormFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/JobDispatcherFactory.php b/application/src/Service/ControllerPlugin/JobDispatcherFactory.php
index a7d65039b0..93bdeaacfd 100644
--- a/application/src/Service/ControllerPlugin/JobDispatcherFactory.php
+++ b/application/src/Service/ControllerPlugin/JobDispatcherFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\JobDispatcher;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class JobDispatcherFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/LoggerFactory.php b/application/src/Service/ControllerPlugin/LoggerFactory.php
index 116bb65e50..8ddf3d6355 100644
--- a/application/src/Service/ControllerPlugin/LoggerFactory.php
+++ b/application/src/Service/ControllerPlugin/LoggerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Logger;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class LoggerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/MailerFactory.php b/application/src/Service/ControllerPlugin/MailerFactory.php
index 6484ef1d56..802b3a0b6e 100644
--- a/application/src/Service/ControllerPlugin/MailerFactory.php
+++ b/application/src/Service/ControllerPlugin/MailerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Mailer;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class MailerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/PaginatorFactory.php b/application/src/Service/ControllerPlugin/PaginatorFactory.php
index 34b2bd5215..7a08736942 100644
--- a/application/src/Service/ControllerPlugin/PaginatorFactory.php
+++ b/application/src/Service/ControllerPlugin/PaginatorFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Paginator;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class PaginatorFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/SettingsFactory.php b/application/src/Service/ControllerPlugin/SettingsFactory.php
index 842db8e3a9..8dfea52630 100644
--- a/application/src/Service/ControllerPlugin/SettingsFactory.php
+++ b/application/src/Service/ControllerPlugin/SettingsFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Settings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SettingsFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/SiteSettingsFactory.php b/application/src/Service/ControllerPlugin/SiteSettingsFactory.php
index 2c5f6427cc..41ce4f41cf 100644
--- a/application/src/Service/ControllerPlugin/SiteSettingsFactory.php
+++ b/application/src/Service/ControllerPlugin/SiteSettingsFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Settings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SiteSettingsFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/StatusFactory.php b/application/src/Service/ControllerPlugin/StatusFactory.php
index 11066cb1ad..2d80c0cf16 100644
--- a/application/src/Service/ControllerPlugin/StatusFactory.php
+++ b/application/src/Service/ControllerPlugin/StatusFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Status;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class StatusFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/TranslateFactory.php b/application/src/Service/ControllerPlugin/TranslateFactory.php
index 1673504b2b..caaa514531 100644
--- a/application/src/Service/ControllerPlugin/TranslateFactory.php
+++ b/application/src/Service/ControllerPlugin/TranslateFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Translate;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class TranslateFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/UserIsAllowedFactory.php b/application/src/Service/ControllerPlugin/UserIsAllowedFactory.php
index 3e4ebbe3a8..e0ca114939 100644
--- a/application/src/Service/ControllerPlugin/UserIsAllowedFactory.php
+++ b/application/src/Service/ControllerPlugin/UserIsAllowedFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\UserIsAllowed;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class UserIsAllowedFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/UserSettingsFactory.php b/application/src/Service/ControllerPlugin/UserSettingsFactory.php
index 53fbbda8fc..cebe24eb9e 100644
--- a/application/src/Service/ControllerPlugin/UserSettingsFactory.php
+++ b/application/src/Service/ControllerPlugin/UserSettingsFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\Settings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class UserSettingsFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ControllerPlugin/ViewHelpersFactory.php b/application/src/Service/ControllerPlugin/ViewHelpersFactory.php
index e41bdf994a..0c5df97a51 100644
--- a/application/src/Service/ControllerPlugin/ViewHelpersFactory.php
+++ b/application/src/Service/ControllerPlugin/ViewHelpersFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Mvc\Controller\Plugin\ViewHelpers;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ViewHelpersFactory implements FactoryInterface
 {
diff --git a/application/src/Service/DataTypeManagerFactory.php b/application/src/Service/DataTypeManagerFactory.php
index 1de8d8e2e0..0a1165f09b 100644
--- a/application/src/Service/DataTypeManagerFactory.php
+++ b/application/src/Service/DataTypeManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\DataType\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class DataTypeManagerFactory implements FactoryInterface
diff --git a/application/src/Service/Delegator/FormElementDelegatorFactory.php b/application/src/Service/Delegator/FormElementDelegatorFactory.php
index bf3b2eb1dc..c0056b8d54 100644
--- a/application/src/Service/Delegator/FormElementDelegatorFactory.php
+++ b/application/src/Service/Delegator/FormElementDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 /**
  * Map custom element types to the view helpers that render them.
diff --git a/application/src/Service/Delegator/FormRowDelegatorFactory.php b/application/src/Service/Delegator/FormRowDelegatorFactory.php
index f0a93bd0e8..533428bb10 100644
--- a/application/src/Service/Delegator/FormRowDelegatorFactory.php
+++ b/application/src/Service/Delegator/FormRowDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 /**
  * Set the custom form row partial.
diff --git a/application/src/Service/Delegator/FormSelectDelegatorFactory.php b/application/src/Service/Delegator/FormSelectDelegatorFactory.php
index 09f70498a5..fffed49a50 100644
--- a/application/src/Service/Delegator/FormSelectDelegatorFactory.php
+++ b/application/src/Service/Delegator/FormSelectDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 class FormSelectDelegatorFactory implements DelegatorFactoryInterface
 {
diff --git a/application/src/Service/Delegator/HeadTitleDelegatorFactory.php b/application/src/Service/Delegator/HeadTitleDelegatorFactory.php
index c9d370c7cf..dee7824627 100644
--- a/application/src/Service/Delegator/HeadTitleDelegatorFactory.php
+++ b/application/src/Service/Delegator/HeadTitleDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 /**
  * Disable automatic translation for the <title> element.
diff --git a/application/src/Service/Delegator/NavigationDelegatorFactory.php b/application/src/Service/Delegator/NavigationDelegatorFactory.php
index 7ca2e1817b..a512439d26 100644
--- a/application/src/Service/Delegator/NavigationDelegatorFactory.php
+++ b/application/src/Service/Delegator/NavigationDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 /**
  * Set the ACL to the navigation helper.
diff --git a/application/src/Service/Delegator/SitePaginatorDelegatorFactory.php b/application/src/Service/Delegator/SitePaginatorDelegatorFactory.php
index 6b1452e063..cab45a57e8 100644
--- a/application/src/Service/Delegator/SitePaginatorDelegatorFactory.php
+++ b/application/src/Service/Delegator/SitePaginatorDelegatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Delegator;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 class SitePaginatorDelegatorFactory implements DelegatorFactoryInterface
 {
diff --git a/application/src/Service/Delegator/TranslatorDelegatorFactory.php b/application/src/Service/Delegator/TranslatorDelegatorFactory.php
index c861aa891f..5e3de122fe 100644
--- a/application/src/Service/Delegator/TranslatorDelegatorFactory.php
+++ b/application/src/Service/Delegator/TranslatorDelegatorFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\I18n\Translator;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
 
 class TranslatorDelegatorFactory implements DelegatorFactoryInterface
 {
diff --git a/application/src/Service/EntityManagerFactory.php b/application/src/Service/EntityManagerFactory.php
index 47b2278396..550f03cc3f 100644
--- a/application/src/Service/EntityManagerFactory.php
+++ b/application/src/Service/EntityManagerFactory.php
@@ -11,7 +11,7 @@
 use Omeka\Db\Event\Listener\ResourceDiscriminatorMap;
 use Omeka\Db\Event\Subscriber\Entity;
 use Omeka\Db\ProxyAutoloader;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
@@ -52,10 +52,11 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, arr
             $isDevMode = self::IS_DEV_MODE;
         }
 
+        $arrayCache = new ArrayCache();
         if (extension_loaded('apcu') && !$isDevMode) {
             $cache = new ApcuCache();
         } else {
-            $cache = new ArrayCache();
+            $cache = $arrayCache;
         }
 
         // Set up the entity manager configuration.
@@ -64,6 +65,10 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, arr
         );
         $emConfig->setProxyDir(OMEKA_PATH . '/application/data/doctrine-proxies');
 
+        // Force non-persistent query cache, workaround for issue with SQL filters
+        // that vary by user, permission level
+        $emConfig->setQueryCacheImpl($arrayCache);
+
         // Use the underscore naming strategy to preempt potential compatibility
         // issues with the case sensitivity of various operating systems.
         // @see http://dev.mysql.com/doc/refman/5.7/en/identifier-case-sensitivity.html
diff --git a/application/src/Service/EnvironmentFactory.php b/application/src/Service/EnvironmentFactory.php
index 886b25cee5..d2a7ce6373 100644
--- a/application/src/Service/EnvironmentFactory.php
+++ b/application/src/Service/EnvironmentFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\Environment;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class EnvironmentFactory implements FactoryInterface
diff --git a/application/src/Service/File/DownloaderFactory.php b/application/src/Service/File/DownloaderFactory.php
index 415c6f129b..061b595ac6 100644
--- a/application/src/Service/File/DownloaderFactory.php
+++ b/application/src/Service/File/DownloaderFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File;
 
 use Omeka\File\Downloader;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class DownloaderFactory implements FactoryInterface
diff --git a/application/src/Service/File/Store/LocalFactory.php b/application/src/Service/File/Store/LocalFactory.php
index f8fcb30bd6..6df666d599 100644
--- a/application/src/Service/File/Store/LocalFactory.php
+++ b/application/src/Service/File/Store/LocalFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File\Store;
 
 use Omeka\File\Store\Local;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/File/TempFileFactoryFactory.php b/application/src/Service/File/TempFileFactoryFactory.php
index b3a9a5ecc8..95f5152139 100644
--- a/application/src/Service/File/TempFileFactoryFactory.php
+++ b/application/src/Service/File/TempFileFactoryFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File;
 
 use Omeka\File\TempFileFactory;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class TempFileFactoryFactory implements FactoryInterface
diff --git a/application/src/Service/File/ThumbnailManagerFactory.php b/application/src/Service/File/ThumbnailManagerFactory.php
index c8e3663556..86764aa228 100644
--- a/application/src/Service/File/ThumbnailManagerFactory.php
+++ b/application/src/Service/File/ThumbnailManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File;
 
 use Omeka\File\ThumbnailManager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ThumbnailManagerFactory implements FactoryInterface
diff --git a/application/src/Service/File/Thumbnailer/GdFactory.php b/application/src/Service/File/Thumbnailer/GdFactory.php
index b95a0cd278..612c0ccd9a 100644
--- a/application/src/Service/File/Thumbnailer/GdFactory.php
+++ b/application/src/Service/File/Thumbnailer/GdFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\File\Thumbnailer\Gd;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class GdFactory implements FactoryInterface
 {
diff --git a/application/src/Service/File/Thumbnailer/ImageMagickFactory.php b/application/src/Service/File/Thumbnailer/ImageMagickFactory.php
index c43d03f8c3..d5c91883dc 100644
--- a/application/src/Service/File/Thumbnailer/ImageMagickFactory.php
+++ b/application/src/Service/File/Thumbnailer/ImageMagickFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\File\Thumbnailer\ImageMagick;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ImageMagickFactory implements FactoryInterface
 {
diff --git a/application/src/Service/File/Thumbnailer/ImagickFactory.php b/application/src/Service/File/Thumbnailer/ImagickFactory.php
index d790e4c070..419c836a2b 100644
--- a/application/src/Service/File/Thumbnailer/ImagickFactory.php
+++ b/application/src/Service/File/Thumbnailer/ImagickFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\File\Thumbnailer\Imagick;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ImagickFactory implements FactoryInterface
 {
diff --git a/application/src/Service/File/Thumbnailer/NoThumbnailFactory.php b/application/src/Service/File/Thumbnailer/NoThumbnailFactory.php
index 1849e71bd4..9b6aee3c07 100644
--- a/application/src/Service/File/Thumbnailer/NoThumbnailFactory.php
+++ b/application/src/Service/File/Thumbnailer/NoThumbnailFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\File\Thumbnailer\NoThumbnail;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class NothumbnailFactory implements FactoryInterface
 {
diff --git a/application/src/Service/File/UploaderFactory.php b/application/src/Service/File/UploaderFactory.php
index 78901ec133..5c011d0489 100644
--- a/application/src/Service/File/UploaderFactory.php
+++ b/application/src/Service/File/UploaderFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File;
 
 use Omeka\File\Uploader;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UploaderFactory implements FactoryInterface
diff --git a/application/src/Service/File/ValidatorFactory.php b/application/src/Service/File/ValidatorFactory.php
index 880a1af4cb..b0427f2224 100644
--- a/application/src/Service/File/ValidatorFactory.php
+++ b/application/src/Service/File/ValidatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\File;
 
 use Omeka\File\Validator;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ValidatorFactory implements FactoryInterface
diff --git a/application/src/Service/Form/Element/CkeditorFactory.php b/application/src/Service/Form/Element/CkeditorFactory.php
index 315a6ca94b..dc76415ac0 100644
--- a/application/src/Service/Form/Element/CkeditorFactory.php
+++ b/application/src/Service/Form/Element/CkeditorFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\Ckeditor;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class CkeditorFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/CkeditorInlineFactory.php b/application/src/Service/Form/Element/CkeditorInlineFactory.php
index 47ccfd19ef..1c93dc7076 100644
--- a/application/src/Service/Form/Element/CkeditorInlineFactory.php
+++ b/application/src/Service/Form/Element/CkeditorInlineFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\CkeditorInline;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class CkeditorInlineFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/HtmlTextareaFactory.php b/application/src/Service/Form/Element/HtmlTextareaFactory.php
index b2dacf3a52..b2ebcde770 100644
--- a/application/src/Service/Form/Element/HtmlTextareaFactory.php
+++ b/application/src/Service/Form/Element/HtmlTextareaFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\HtmlTextarea;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class HtmlTextareaFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/ItemSetSelectFactory.php b/application/src/Service/Form/Element/ItemSetSelectFactory.php
index a5eeece60a..9fde5c010c 100644
--- a/application/src/Service/Form/Element/ItemSetSelectFactory.php
+++ b/application/src/Service/Form/Element/ItemSetSelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\ItemSetSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ItemSetSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/LocaleSelectFactory.php b/application/src/Service/Form/Element/LocaleSelectFactory.php
index 3d57c72748..c405118131 100644
--- a/application/src/Service/Form/Element/LocaleSelectFactory.php
+++ b/application/src/Service/Form/Element/LocaleSelectFactory.php
@@ -2,8 +2,8 @@
 namespace Omeka\Service\Form\Element;
 
 use Interop\Container\ContainerInterface;
-use Zend\Form\Element\Select;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Form\Element\Select;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class LocaleSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/PasswordConfirmFactory.php b/application/src/Service/Form/Element/PasswordConfirmFactory.php
index cbfd2a8b16..b16ad1944e 100644
--- a/application/src/Service/Form/Element/PasswordConfirmFactory.php
+++ b/application/src/Service/Form/Element/PasswordConfirmFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\PasswordConfirm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class PasswordConfirmFactory implements FactoryInterface
 {
@@ -13,6 +13,7 @@ public function __invoke(ContainerInterface $services, $requestedName, array $op
         $passwordConfig = isset($config['password']) ? $config['password'] : [];
         $fieldset = new PasswordConfirm;
         $fieldset->setPasswordConfig($passwordConfig);
+        $fieldset->setTranslator($services->get('MvcTranslator'));
         return $fieldset;
     }
 }
diff --git a/application/src/Service/Form/Element/PropertySelectFactory.php b/application/src/Service/Form/Element/PropertySelectFactory.php
index f850786bbd..c034c45dbf 100644
--- a/application/src/Service/Form/Element/PropertySelectFactory.php
+++ b/application/src/Service/Form/Element/PropertySelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\PropertySelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class PropertySelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/RecaptchaFactory.php b/application/src/Service/Form/Element/RecaptchaFactory.php
index 2f8d23b024..a01fbf705d 100644
--- a/application/src/Service/Form/Element/RecaptchaFactory.php
+++ b/application/src/Service/Form/Element/RecaptchaFactory.php
@@ -2,8 +2,8 @@
 namespace Omeka\Service\Form\Element;
 
 use Omeka\Form\Element\Recaptcha;
-use Zend\Http\PhpEnvironment\RemoteAddress;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Http\PhpEnvironment\RemoteAddress;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class RecaptchaFactory implements FactoryInterface
diff --git a/application/src/Service/Form/Element/ResourceClassSelectFactory.php b/application/src/Service/Form/Element/ResourceClassSelectFactory.php
index 966b4abd35..408e2ed5fd 100644
--- a/application/src/Service/Form/Element/ResourceClassSelectFactory.php
+++ b/application/src/Service/Form/Element/ResourceClassSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form\Element;
 
 use Omeka\Form\Element\ResourceClassSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceClassSelectFactory implements FactoryInterface
diff --git a/application/src/Service/Form/Element/ResourceSelectFactory.php b/application/src/Service/Form/Element/ResourceSelectFactory.php
index bcd8c12c27..45d73c5ddf 100644
--- a/application/src/Service/Form/Element/ResourceSelectFactory.php
+++ b/application/src/Service/Form/Element/ResourceSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form\Element;
 
 use Omeka\Form\Element\ResourceSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceSelectFactory implements FactoryInterface
diff --git a/application/src/Service/Form/Element/ResourceTemplateSelectFactory.php b/application/src/Service/Form/Element/ResourceTemplateSelectFactory.php
index c443e70086..ee1b5cb925 100644
--- a/application/src/Service/Form/Element/ResourceTemplateSelectFactory.php
+++ b/application/src/Service/Form/Element/ResourceTemplateSelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\ResourceTemplateSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class ResourceTemplateSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/RoleSelectFactory.php b/application/src/Service/Form/Element/RoleSelectFactory.php
index ec18ecb4ef..3ea63345e7 100644
--- a/application/src/Service/Form/Element/RoleSelectFactory.php
+++ b/application/src/Service/Form/Element/RoleSelectFactory.php
@@ -2,8 +2,8 @@
 namespace Omeka\Service\Form\Element;
 
 use Interop\Container\ContainerInterface;
-use Zend\Form\Element\Select;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Form\Element\Select;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class RoleSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/SitePageSelectFactory.php b/application/src/Service/Form/Element/SitePageSelectFactory.php
index 2a0e69641b..a71dc0dd36 100644
--- a/application/src/Service/Form/Element/SitePageSelectFactory.php
+++ b/application/src/Service/Form/Element/SitePageSelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\SitePageSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SitePageSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/SiteSelectFactory.php b/application/src/Service/Form/Element/SiteSelectFactory.php
index 86081c9175..0626fdad8c 100644
--- a/application/src/Service/Form/Element/SiteSelectFactory.php
+++ b/application/src/Service/Form/Element/SiteSelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\SiteSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SiteSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/Element/UserSelectFactory.php b/application/src/Service/Form/Element/UserSelectFactory.php
index e942e38b97..0fa6e71eb7 100644
--- a/application/src/Service/Form/Element/UserSelectFactory.php
+++ b/application/src/Service/Form/Element/UserSelectFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\Element\UserSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class UserSelectFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/ModuleStateChangeFormFactory.php b/application/src/Service/Form/ModuleStateChangeFormFactory.php
index 5bea6c6e6d..e61677d15e 100644
--- a/application/src/Service/Form/ModuleStateChangeFormFactory.php
+++ b/application/src/Service/Form/ModuleStateChangeFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\ModuleStateChangeForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ModuleStateChangeFormFactory implements FactoryInterface
diff --git a/application/src/Service/Form/ResourceBatchUpdateFormFactory.php b/application/src/Service/Form/ResourceBatchUpdateFormFactory.php
index 528bad87ca..2a1498611b 100644
--- a/application/src/Service/Form/ResourceBatchUpdateFormFactory.php
+++ b/application/src/Service/Form/ResourceBatchUpdateFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\ResourceBatchUpdateForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceBatchUpdateFormFactory implements FactoryInterface
diff --git a/application/src/Service/Form/ResourceFormFactory.php b/application/src/Service/Form/ResourceFormFactory.php
index 4c83bf35f8..567e14e572 100644
--- a/application/src/Service/Form/ResourceFormFactory.php
+++ b/application/src/Service/Form/ResourceFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\ResourceForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceFormFactory implements FactoryInterface
diff --git a/application/src/Service/Form/SettingFormFactory.php b/application/src/Service/Form/SettingFormFactory.php
index 90641176f6..6a769537d4 100644
--- a/application/src/Service/Form/SettingFormFactory.php
+++ b/application/src/Service/Form/SettingFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\SettingForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SettingFormFactory implements FactoryInterface
diff --git a/application/src/Service/Form/SiteFormFactory.php b/application/src/Service/Form/SiteFormFactory.php
index 5170292575..c16cc54900 100644
--- a/application/src/Service/Form/SiteFormFactory.php
+++ b/application/src/Service/Form/SiteFormFactory.php
@@ -2,14 +2,14 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\SiteForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SiteFormFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $services, $requestedName, array $options = null)
     {
-        $form = new SiteForm;
+        $form = new SiteForm(null, $options);
         $form->setEventManager($services->get('EventManager'));
         return $form;
     }
diff --git a/application/src/Service/Form/SiteSettingsFormFactory.php b/application/src/Service/Form/SiteSettingsFormFactory.php
index 49b77f123e..9fc1c8beb1 100644
--- a/application/src/Service/Form/SiteSettingsFormFactory.php
+++ b/application/src/Service/Form/SiteSettingsFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\SiteSettingsForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SiteSettingsFormFactory implements FactoryInterface
diff --git a/application/src/Service/Form/UserBatchUpdateFormFactory.php b/application/src/Service/Form/UserBatchUpdateFormFactory.php
index fa74074864..0be06430d1 100644
--- a/application/src/Service/Form/UserBatchUpdateFormFactory.php
+++ b/application/src/Service/Form/UserBatchUpdateFormFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Form\UserBatchUpdateForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class UserBatchUpdateFormFactory implements FactoryInterface
 {
diff --git a/application/src/Service/Form/UserFormFactory.php b/application/src/Service/Form/UserFormFactory.php
index 04dc5680ca..077f114a40 100644
--- a/application/src/Service/Form/UserFormFactory.php
+++ b/application/src/Service/Form/UserFormFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Form;
 
 use Omeka\Form\UserForm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UserFormFactory implements FactoryInterface
diff --git a/application/src/Service/FulltextSearchFactory.php b/application/src/Service/FulltextSearchFactory.php
index 0a673b27bb..2c8a705ebb 100644
--- a/application/src/Service/FulltextSearchFactory.php
+++ b/application/src/Service/FulltextSearchFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\FulltextSearch;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class FulltextSearchFactory implements FactoryInterface
diff --git a/application/src/Service/HtmlPurifierFactory.php b/application/src/Service/HtmlPurifierFactory.php
index 464751a20f..a048d41e0f 100644
--- a/application/src/Service/HtmlPurifierFactory.php
+++ b/application/src/Service/HtmlPurifierFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\HtmlPurifier;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class HtmlPurifierFactory implements FactoryInterface
diff --git a/application/src/Service/HttpClientFactory.php b/application/src/Service/HttpClientFactory.php
index d42e853be0..5780f1495d 100644
--- a/application/src/Service/HttpClientFactory.php
+++ b/application/src/Service/HttpClientFactory.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Service;
 
-use Zend\Http\Client;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Http\Client;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class HttpClientFactory implements FactoryInterface
diff --git a/application/src/Service/InstallerFactory.php b/application/src/Service/InstallerFactory.php
index 83ea5db6b7..35d088fc36 100644
--- a/application/src/Service/InstallerFactory.php
+++ b/application/src/Service/InstallerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Installation\Installer;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class InstallerFactory implements FactoryInterface
diff --git a/application/src/Service/Job/DispatchStrategy/PhpCliFactory.php b/application/src/Service/Job/DispatchStrategy/PhpCliFactory.php
index 76b9828b31..c5e3748075 100644
--- a/application/src/Service/Job/DispatchStrategy/PhpCliFactory.php
+++ b/application/src/Service/Job/DispatchStrategy/PhpCliFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Job\DispatchStrategy;
 
 use Omeka\Job\DispatchStrategy\PhpCli;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class PhpCliFactory implements FactoryInterface
diff --git a/application/src/Service/Job/DispatchStrategy/SynchronousFactory.php b/application/src/Service/Job/DispatchStrategy/SynchronousFactory.php
index f1a559db89..d353724460 100644
--- a/application/src/Service/Job/DispatchStrategy/SynchronousFactory.php
+++ b/application/src/Service/Job/DispatchStrategy/SynchronousFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Job\DispatchStrategy;
 
 use Omeka\Job\DispatchStrategy\Synchronous;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SynchronousFactory implements FactoryInterface
diff --git a/application/src/Service/Job/DispatcherFactory.php b/application/src/Service/Job/DispatcherFactory.php
index 8aa652e72c..3fe780d38c 100644
--- a/application/src/Service/Job/DispatcherFactory.php
+++ b/application/src/Service/Job/DispatcherFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Job;
 
 use Omeka\Job\Dispatcher;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class DispatcherFactory implements FactoryInterface
diff --git a/application/src/Service/LoggerFactory.php b/application/src/Service/LoggerFactory.php
index 326e6457ce..d5b4b76102 100644
--- a/application/src/Service/LoggerFactory.php
+++ b/application/src/Service/LoggerFactory.php
@@ -1,11 +1,11 @@
 <?php
 namespace Omeka\Service;
 
-use Zend\Log\Logger;
-use Zend\Log\Writer\Noop;
-use Zend\Log\Writer\Stream;
-use Zend\Log\Filter\Priority;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Log\Logger;
+use Laminas\Log\Writer\Noop;
+use Laminas\Log\Writer\Stream;
+use Laminas\Log\Filter\Priority;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/MailerFactory.php b/application/src/Service/MailerFactory.php
index e55c91ae19..9a0e2df58b 100644
--- a/application/src/Service/MailerFactory.php
+++ b/application/src/Service/MailerFactory.php
@@ -2,8 +2,8 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\Mailer;
-use Zend\Mail\Transport\Factory as TransportFactory;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Mail\Transport\Factory as TransportFactory;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class MailerFactory implements FactoryInterface
diff --git a/application/src/Service/Media/FileRenderer/ManagerFactory.php b/application/src/Service/Media/FileRenderer/ManagerFactory.php
index 6665256155..6436108d3e 100644
--- a/application/src/Service/Media/FileRenderer/ManagerFactory.php
+++ b/application/src/Service/Media/FileRenderer/ManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\FileRenderer;
 
 use Omeka\Media\FileRenderer\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/Media/Ingester/HtmlFactory.php b/application/src/Service/Media/Ingester/HtmlFactory.php
index 0888fc87dd..c22b3ab8f6 100644
--- a/application/src/Service/Media/Ingester/HtmlFactory.php
+++ b/application/src/Service/Media/Ingester/HtmlFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\Html;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class HtmlFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/IIIFFactory.php b/application/src/Service/Media/Ingester/IIIFFactory.php
index ebcfcec7e5..b634e2699f 100644
--- a/application/src/Service/Media/Ingester/IIIFFactory.php
+++ b/application/src/Service/Media/Ingester/IIIFFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\IIIF;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class IIIFFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/ManagerFactory.php b/application/src/Service/Media/Ingester/ManagerFactory.php
index 70b0495211..b31326c911 100644
--- a/application/src/Service/Media/Ingester/ManagerFactory.php
+++ b/application/src/Service/Media/Ingester/ManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ManagerFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/OEmbedFactory.php b/application/src/Service/Media/Ingester/OEmbedFactory.php
index 9f7a04e4b9..2781df0373 100644
--- a/application/src/Service/Media/Ingester/OEmbedFactory.php
+++ b/application/src/Service/Media/Ingester/OEmbedFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\OEmbed;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class OEmbedFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/UploadFactory.php b/application/src/Service/Media/Ingester/UploadFactory.php
index d1e144c3e0..75a1931bd3 100644
--- a/application/src/Service/Media/Ingester/UploadFactory.php
+++ b/application/src/Service/Media/Ingester/UploadFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\Upload;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UploadFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/UrlFactory.php b/application/src/Service/Media/Ingester/UrlFactory.php
index 461493fd7e..577cf13969 100644
--- a/application/src/Service/Media/Ingester/UrlFactory.php
+++ b/application/src/Service/Media/Ingester/UrlFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\Url;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UrlFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Ingester/YoutubeFactory.php b/application/src/Service/Media/Ingester/YoutubeFactory.php
index bdb62dbe7c..8acf2ac8ba 100644
--- a/application/src/Service/Media/Ingester/YoutubeFactory.php
+++ b/application/src/Service/Media/Ingester/YoutubeFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Ingester;
 
 use Omeka\Media\Ingester\Youtube;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class YoutubeFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Renderer/FileFactory.php b/application/src/Service/Media/Renderer/FileFactory.php
index 3072036325..ba13fd8158 100644
--- a/application/src/Service/Media/Renderer/FileFactory.php
+++ b/application/src/Service/Media/Renderer/FileFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Renderer;
 
 use Omeka\Media\Renderer\File;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class FileFactory implements FactoryInterface
diff --git a/application/src/Service/Media/Renderer/ManagerFactory.php b/application/src/Service/Media/Renderer/ManagerFactory.php
index e679002eeb..edbc3e272f 100644
--- a/application/src/Service/Media/Renderer/ManagerFactory.php
+++ b/application/src/Service/Media/Renderer/ManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Media\Renderer;
 
 use Omeka\Media\Renderer\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ManagerFactory implements FactoryInterface
diff --git a/application/src/Service/MediaTypeMapFactory.php b/application/src/Service/MediaTypeMapFactory.php
index f9a507edda..88640dd343 100644
--- a/application/src/Service/MediaTypeMapFactory.php
+++ b/application/src/Service/MediaTypeMapFactory.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Service;
 
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class MediaTypeMapFactory implements FactoryInterface
diff --git a/application/src/Service/MigrationManagerFactory.php b/application/src/Service/MigrationManagerFactory.php
index 1b76b3a8dc..d1397776e6 100644
--- a/application/src/Service/MigrationManagerFactory.php
+++ b/application/src/Service/MigrationManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Db\Migration\Manager as MigrationManager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ModuleManagerFactory.php b/application/src/Service/ModuleManagerFactory.php
index d4a3c2d553..9467591287 100644
--- a/application/src/Service/ModuleManagerFactory.php
+++ b/application/src/Service/ModuleManagerFactory.php
@@ -10,8 +10,8 @@
 use Omeka\Module as CoreModule;
 use Omeka\Module\Manager as ModuleManager;
 use SplFileInfo;
-use Zend\Config\Reader\Ini as IniReader;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Config\Reader\Ini as IniReader;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * Factory for creating Omeka's module manager
diff --git a/application/src/Service/NavigationLinkManagerFactory.php b/application/src/Service/NavigationLinkManagerFactory.php
index c38ce6828d..aaaa453981 100644
--- a/application/src/Service/NavigationLinkManagerFactory.php
+++ b/application/src/Service/NavigationLinkManagerFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Site\Navigation\Link\Manager;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class NavigationLinkManagerFactory implements FactoryInterface
diff --git a/application/src/Service/PaginatorFactory.php b/application/src/Service/PaginatorFactory.php
index b68b619b32..fd9ceec2a6 100644
--- a/application/src/Service/PaginatorFactory.php
+++ b/application/src/Service/PaginatorFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\Paginator;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class PaginatorFactory implements FactoryInterface
diff --git a/application/src/Service/RdfImporterFactory.php b/application/src/Service/RdfImporterFactory.php
index c50927bfb1..5090055977 100644
--- a/application/src/Service/RdfImporterFactory.php
+++ b/application/src/Service/RdfImporterFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Stdlib\RdfImporter;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class RdfImporterFactory implements FactoryInterface
diff --git a/application/src/Service/Settings/SettingsFactory.php b/application/src/Service/Settings/SettingsFactory.php
index 36e0661f72..df6ee95011 100644
--- a/application/src/Service/Settings/SettingsFactory.php
+++ b/application/src/Service/Settings/SettingsFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Settings;
 
 use Omeka\Settings\Settings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SettingsFactory implements FactoryInterface
diff --git a/application/src/Service/Settings/SiteSettingsFactory.php b/application/src/Service/Settings/SiteSettingsFactory.php
index 87dee2b571..2e027e4131 100644
--- a/application/src/Service/Settings/SiteSettingsFactory.php
+++ b/application/src/Service/Settings/SiteSettingsFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Settings;
 
 use Omeka\Settings\SiteSettings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SiteSettingsFactory implements FactoryInterface
diff --git a/application/src/Service/Settings/UserSettingsFactory.php b/application/src/Service/Settings/UserSettingsFactory.php
index 1234fe7a89..75570eee78 100644
--- a/application/src/Service/Settings/UserSettingsFactory.php
+++ b/application/src/Service/Settings/UserSettingsFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\Settings;
 
 use Omeka\Settings\UserSettings;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UserSettingsFactory implements FactoryInterface
diff --git a/application/src/Service/SiteNavigationTranslatorFactory.php b/application/src/Service/SiteNavigationTranslatorFactory.php
index 461570a955..fdd8ba8d06 100644
--- a/application/src/Service/SiteNavigationTranslatorFactory.php
+++ b/application/src/Service/SiteNavigationTranslatorFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\Site\Navigation\Translator;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class SiteNavigationTranslatorFactory implements FactoryInterface
 {
diff --git a/application/src/Service/StatusFactory.php b/application/src/Service/StatusFactory.php
index d59ea96724..0ea6aecd7e 100644
--- a/application/src/Service/StatusFactory.php
+++ b/application/src/Service/StatusFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service;
 
 use Omeka\Mvc\Status;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ThemeManagerFactory.php b/application/src/Service/ThemeManagerFactory.php
index d1621884ac..5102e41d0a 100644
--- a/application/src/Service/ThemeManagerFactory.php
+++ b/application/src/Service/ThemeManagerFactory.php
@@ -6,8 +6,8 @@
 use Composer\Semver\Semver;
 use Omeka\Module as CoreModule;
 use Omeka\Site\Theme\Manager as ThemeManager;
-use Zend\Config\Reader\Ini as IniReader;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Config\Reader\Ini as IniReader;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ThemeManagerFactory implements FactoryInterface
diff --git a/application/src/Service/ViewApiJsonStrategyFactory.php b/application/src/Service/ViewApiJsonStrategyFactory.php
index d2d71f30a1..feae4a6bb1 100644
--- a/application/src/Service/ViewApiJsonStrategyFactory.php
+++ b/application/src/Service/ViewApiJsonStrategyFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service;
 
 use Omeka\View\Strategy\ApiJsonStrategy;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/ApiFactory.php b/application/src/Service/ViewHelper/ApiFactory.php
index 726dd76de0..225df6ea5e 100644
--- a/application/src/Service/ViewHelper/ApiFactory.php
+++ b/application/src/Service/ViewHelper/ApiFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Api;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/AssetUrlFactory.php b/application/src/Service/ViewHelper/AssetUrlFactory.php
index e0963b2435..be2aa567df 100644
--- a/application/src/Service/ViewHelper/AssetUrlFactory.php
+++ b/application/src/Service/ViewHelper/AssetUrlFactory.php
@@ -4,7 +4,7 @@
 
 use Omeka\Module\Manager as ModuleManager;
 use Omeka\View\Helper\AssetUrl;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/BlockLayoutFactory.php b/application/src/Service/ViewHelper/BlockLayoutFactory.php
index 3e0c49bd43..fbbfae1abd 100644
--- a/application/src/Service/ViewHelper/BlockLayoutFactory.php
+++ b/application/src/Service/ViewHelper/BlockLayoutFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\BlockLayout;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/BlockThumbnailTypeSelectFactory.php b/application/src/Service/ViewHelper/BlockThumbnailTypeSelectFactory.php
index acc516af43..e63bd84172 100644
--- a/application/src/Service/ViewHelper/BlockThumbnailTypeSelectFactory.php
+++ b/application/src/Service/ViewHelper/BlockThumbnailTypeSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\BlockThumbnailTypeSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/DataTypeFactory.php b/application/src/Service/ViewHelper/DataTypeFactory.php
index 6a5ac7990f..a436a67131 100644
--- a/application/src/Service/ViewHelper/DataTypeFactory.php
+++ b/application/src/Service/ViewHelper/DataTypeFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\DataType;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/DeleteConfirmFactory.php b/application/src/Service/ViewHelper/DeleteConfirmFactory.php
index 6168415ce5..74dc4de354 100644
--- a/application/src/Service/ViewHelper/DeleteConfirmFactory.php
+++ b/application/src/Service/ViewHelper/DeleteConfirmFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\DeleteConfirm;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class DeleteConfirmFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/I18nFactory.php b/application/src/Service/ViewHelper/I18nFactory.php
index 9d5a9cd999..6403368bb8 100644
--- a/application/src/Service/ViewHelper/I18nFactory.php
+++ b/application/src/Service/ViewHelper/I18nFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\I18n;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/ItemSetSelectFactory.php b/application/src/Service/ViewHelper/ItemSetSelectFactory.php
index 81f0371b64..725583f05b 100644
--- a/application/src/Service/ViewHelper/ItemSetSelectFactory.php
+++ b/application/src/Service/ViewHelper/ItemSetSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\ItemSetSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ItemSetSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/JsTranslateFactory.php b/application/src/Service/ViewHelper/JsTranslateFactory.php
index 843f38be1a..3257b06936 100644
--- a/application/src/Service/ViewHelper/JsTranslateFactory.php
+++ b/application/src/Service/ViewHelper/JsTranslateFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\JsTranslate;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class JsTranslateFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/LangFactory.php b/application/src/Service/ViewHelper/LangFactory.php
index 958a93deb3..94faeb091f 100644
--- a/application/src/Service/ViewHelper/LangFactory.php
+++ b/application/src/Service/ViewHelper/LangFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Lang;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class LangFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/LoggerFactory.php b/application/src/Service/ViewHelper/LoggerFactory.php
index d51a70b142..26c79e16e5 100644
--- a/application/src/Service/ViewHelper/LoggerFactory.php
+++ b/application/src/Service/ViewHelper/LoggerFactory.php
@@ -3,7 +3,7 @@
 
 use Interop\Container\ContainerInterface;
 use Omeka\View\Helper\Logger;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class LoggerFactory implements FactoryInterface
 {
diff --git a/application/src/Service/ViewHelper/MediaFactory.php b/application/src/Service/ViewHelper/MediaFactory.php
index bf2117f078..9418e11b79 100644
--- a/application/src/Service/ViewHelper/MediaFactory.php
+++ b/application/src/Service/ViewHelper/MediaFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Media;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/NavigationLinkFactory.php b/application/src/Service/ViewHelper/NavigationLinkFactory.php
index fc4e41d16f..d77b682a95 100644
--- a/application/src/Service/ViewHelper/NavigationLinkFactory.php
+++ b/application/src/Service/ViewHelper/NavigationLinkFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\NavigationLink;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/PaginationFactory.php b/application/src/Service/ViewHelper/PaginationFactory.php
index c50e898517..722f9e7590 100644
--- a/application/src/Service/ViewHelper/PaginationFactory.php
+++ b/application/src/Service/ViewHelper/PaginationFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Pagination;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/ParamsFactory.php b/application/src/Service/ViewHelper/ParamsFactory.php
index cf30614471..0f8d5a4bc3 100644
--- a/application/src/Service/ViewHelper/ParamsFactory.php
+++ b/application/src/Service/ViewHelper/ParamsFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Params;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/PasswordRequirementsFactory.php b/application/src/Service/ViewHelper/PasswordRequirementsFactory.php
index 6f93696536..3d77ba68cf 100644
--- a/application/src/Service/ViewHelper/PasswordRequirementsFactory.php
+++ b/application/src/Service/ViewHelper/PasswordRequirementsFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\PasswordRequirements;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class PasswordRequirementsFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/PropertySelectFactory.php b/application/src/Service/ViewHelper/PropertySelectFactory.php
index ad45ff7b14..6581b595fc 100644
--- a/application/src/Service/ViewHelper/PropertySelectFactory.php
+++ b/application/src/Service/ViewHelper/PropertySelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\PropertySelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class PropertySelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/ResourceClassSelectFactory.php b/application/src/Service/ViewHelper/ResourceClassSelectFactory.php
index 89e9a6a095..4ee490ddee 100644
--- a/application/src/Service/ViewHelper/ResourceClassSelectFactory.php
+++ b/application/src/Service/ViewHelper/ResourceClassSelectFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\ResourceClassSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceClassSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/ResourceSelectFactory.php b/application/src/Service/ViewHelper/ResourceSelectFactory.php
index 0f0d93dbb3..e0bc654cd5 100644
--- a/application/src/Service/ViewHelper/ResourceSelectFactory.php
+++ b/application/src/Service/ViewHelper/ResourceSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\ResourceSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/ResourceTemplateSelectFactory.php b/application/src/Service/ViewHelper/ResourceTemplateSelectFactory.php
index 11e924b043..220fa64b2d 100644
--- a/application/src/Service/ViewHelper/ResourceTemplateSelectFactory.php
+++ b/application/src/Service/ViewHelper/ResourceTemplateSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\ResourceTemplateSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class ResourceTemplateSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/RoleSelectFactory.php b/application/src/Service/ViewHelper/RoleSelectFactory.php
index d6bc093093..4bc1ad3bf1 100644
--- a/application/src/Service/ViewHelper/RoleSelectFactory.php
+++ b/application/src/Service/ViewHelper/RoleSelectFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\RoleSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class RoleSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/SearchUserFiltersFactory.php b/application/src/Service/ViewHelper/SearchUserFiltersFactory.php
index cbfaabb7ed..733febb3ad 100644
--- a/application/src/Service/ViewHelper/SearchUserFiltersFactory.php
+++ b/application/src/Service/ViewHelper/SearchUserFiltersFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\SearchUserFilters;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/SettingFactory.php b/application/src/Service/ViewHelper/SettingFactory.php
index e4f7945786..a041a6143c 100644
--- a/application/src/Service/ViewHelper/SettingFactory.php
+++ b/application/src/Service/ViewHelper/SettingFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Setting;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/SiteSelectFactory.php b/application/src/Service/ViewHelper/SiteSelectFactory.php
index 9ff9067a62..04f2ca13dc 100644
--- a/application/src/Service/ViewHelper/SiteSelectFactory.php
+++ b/application/src/Service/ViewHelper/SiteSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\SiteSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class SiteSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/SiteSettingFactory.php b/application/src/Service/ViewHelper/SiteSettingFactory.php
index ea276ef0ef..0b7394a708 100644
--- a/application/src/Service/ViewHelper/SiteSettingFactory.php
+++ b/application/src/Service/ViewHelper/SiteSettingFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Setting;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/StatusFactory.php b/application/src/Service/ViewHelper/StatusFactory.php
index ced9d0e4f8..03f3add695 100644
--- a/application/src/Service/ViewHelper/StatusFactory.php
+++ b/application/src/Service/ViewHelper/StatusFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Status;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/ThemeSettingFactory.php b/application/src/Service/ViewHelper/ThemeSettingFactory.php
index 5f34e324f9..6eaad12320 100644
--- a/application/src/Service/ViewHelper/ThemeSettingFactory.php
+++ b/application/src/Service/ViewHelper/ThemeSettingFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\ThemeSetting;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/TriggerFactory.php b/application/src/Service/ViewHelper/TriggerFactory.php
index 3f53e39839..549c35bf1a 100644
--- a/application/src/Service/ViewHelper/TriggerFactory.php
+++ b/application/src/Service/ViewHelper/TriggerFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Trigger;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/UserIsAllowedFactory.php b/application/src/Service/ViewHelper/UserIsAllowedFactory.php
index 60c9645656..bfd4ae43a4 100644
--- a/application/src/Service/ViewHelper/UserIsAllowedFactory.php
+++ b/application/src/Service/ViewHelper/UserIsAllowedFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\UserIsAllowed;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 /**
diff --git a/application/src/Service/ViewHelper/UserSelectFactory.php b/application/src/Service/ViewHelper/UserSelectFactory.php
index 07ab977185..cd267db82b 100644
--- a/application/src/Service/ViewHelper/UserSelectFactory.php
+++ b/application/src/Service/ViewHelper/UserSelectFactory.php
@@ -2,7 +2,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\UserSelect;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UserSelectFactory implements FactoryInterface
diff --git a/application/src/Service/ViewHelper/UserSettingFactory.php b/application/src/Service/ViewHelper/UserSettingFactory.php
index 1943ceb7ab..b0a6d540d7 100644
--- a/application/src/Service/ViewHelper/UserSettingFactory.php
+++ b/application/src/Service/ViewHelper/UserSettingFactory.php
@@ -3,7 +3,7 @@
 namespace Omeka\Service\ViewHelper;
 
 use Omeka\View\Helper\Setting;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Interop\Container\ContainerInterface;
 
 class UserSettingFactory implements FactoryInterface
diff --git a/application/src/ServiceManager/AbstractPluginManager.php b/application/src/ServiceManager/AbstractPluginManager.php
index 4ffacd53e2..a83aa5b28c 100644
--- a/application/src/ServiceManager/AbstractPluginManager.php
+++ b/application/src/ServiceManager/AbstractPluginManager.php
@@ -1,9 +1,9 @@
 <?php
 namespace Omeka\ServiceManager;
 
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\ServiceManager\AbstractPluginManager as ZendAbstractPluginManager;
-use Zend\EventManager\Event;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\ServiceManager\AbstractPluginManager as ZendAbstractPluginManager;
+use Laminas\EventManager\Event;
 
 abstract class AbstractPluginManager extends ZendAbstractPluginManager
 {
diff --git a/application/src/Session/SaveHandler/Db.php b/application/src/Session/SaveHandler/Db.php
index a527b1a436..05b77d92b2 100644
--- a/application/src/Session/SaveHandler/Db.php
+++ b/application/src/Session/SaveHandler/Db.php
@@ -2,7 +2,7 @@
 namespace Omeka\Session\SaveHandler;
 
 use Doctrine\DBAL\Connection;
-use Zend\Session\SaveHandler\SaveHandlerInterface;
+use Laminas\Session\SaveHandler\SaveHandlerInterface;
 
 class Db implements SaveHandlerInterface
 {
diff --git a/application/src/Site/BlockLayout/AbstractBlockLayout.php b/application/src/Site/BlockLayout/AbstractBlockLayout.php
index 15d79abeed..1905e99a3a 100644
--- a/application/src/Site/BlockLayout/AbstractBlockLayout.php
+++ b/application/src/Site/BlockLayout/AbstractBlockLayout.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Representation\SitePageBlockRepresentation;
 use Omeka\Entity\SitePageBlock;
 use Omeka\Stdlib\ErrorStore;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 abstract class AbstractBlockLayout implements BlockLayoutInterface
 {
diff --git a/application/src/Site/BlockLayout/BlockLayoutInterface.php b/application/src/Site/BlockLayout/BlockLayoutInterface.php
index ac3b49d742..7976007b87 100644
--- a/application/src/Site/BlockLayout/BlockLayoutInterface.php
+++ b/application/src/Site/BlockLayout/BlockLayoutInterface.php
@@ -6,7 +6,7 @@
 use Omeka\Api\Representation\SitePageBlockRepresentation;
 use Omeka\Entity\SitePageBlock;
 use Omeka\Stdlib\ErrorStore;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 interface BlockLayoutInterface
 {
diff --git a/application/src/Site/BlockLayout/BrowsePreview.php b/application/src/Site/BlockLayout/BrowsePreview.php
index 0b243dc081..f2a91dfb4b 100644
--- a/application/src/Site/BlockLayout/BrowsePreview.php
+++ b/application/src/Site/BlockLayout/BrowsePreview.php
@@ -4,9 +4,9 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\Form\Element;
-use Zend\Form\Form;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element;
+use Laminas\Form\Form;
+use Laminas\View\Renderer\PhpRenderer;
 
 class BrowsePreview extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/Fallback.php b/application/src/Site/BlockLayout/Fallback.php
index 6c368806c0..76d75feea9 100644
--- a/application/src/Site/BlockLayout/Fallback.php
+++ b/application/src/Site/BlockLayout/Fallback.php
@@ -5,7 +5,7 @@
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
 use Omeka\Stdlib\Message;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Fallback extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/Html.php b/application/src/Site/BlockLayout/Html.php
index e6116771cb..49bb6176e4 100644
--- a/application/src/Site/BlockLayout/Html.php
+++ b/application/src/Site/BlockLayout/Html.php
@@ -7,8 +7,8 @@
 use Omeka\Entity\SitePageBlock;
 use Omeka\Stdlib\HtmlPurifier;
 use Omeka\Stdlib\ErrorStore;
-use Zend\Form\Element\Textarea;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element\Textarea;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Html extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/ItemShowcase.php b/application/src/Site/BlockLayout/ItemShowcase.php
index dda2814c4c..9f376883e6 100644
--- a/application/src/Site/BlockLayout/ItemShowcase.php
+++ b/application/src/Site/BlockLayout/ItemShowcase.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ItemShowcase extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/ItemWithMetadata.php b/application/src/Site/BlockLayout/ItemWithMetadata.php
index daf5ab6723..8f398fd6f0 100644
--- a/application/src/Site/BlockLayout/ItemWithMetadata.php
+++ b/application/src/Site/BlockLayout/ItemWithMetadata.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ItemWithMetadata extends AbstractBlockLayout
 {
@@ -16,7 +16,7 @@ public function getLabel()
     public function form(PhpRenderer $view, SiteRepresentation $site,
         SitePageRepresentation $page = null, SitePageBlockRepresentation $block = null
     ) {
-        return $view->blockAttachmentsForm($block);
+        return $view->blockAttachmentsForm($block, true);
     }
 
     public function render(PhpRenderer $view, SitePageBlockRepresentation $block)
diff --git a/application/src/Site/BlockLayout/LineBreak.php b/application/src/Site/BlockLayout/LineBreak.php
index 25b708c773..9c03dbc0be 100644
--- a/application/src/Site/BlockLayout/LineBreak.php
+++ b/application/src/Site/BlockLayout/LineBreak.php
@@ -1,11 +1,11 @@
 <?php
 namespace Omeka\Site\BlockLayout;
 
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class LineBreak extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/ListOfSites.php b/application/src/Site/BlockLayout/ListOfSites.php
index ff69d4d2cf..5b5b410e26 100644
--- a/application/src/Site/BlockLayout/ListOfSites.php
+++ b/application/src/Site/BlockLayout/ListOfSites.php
@@ -4,9 +4,9 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\Form\Element;
-use Zend\Form\Form;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Form\Element;
+use Laminas\Form\Form;
+use Laminas\View\Renderer\PhpRenderer;
 
 class ListOfSites extends AbstractBlockLayout
 {
@@ -15,6 +15,7 @@ class ListOfSites extends AbstractBlockLayout
         'limit' => null,
         'pagination' => false,
         'summaries' => true,
+        'exclude_current' => true,
     ];
 
     public function getLabel()
@@ -77,12 +78,23 @@ public function form(PhpRenderer $view, SiteRepresentation $site,
                 'id' => 'list-of-sites-summaries',
             ],
         ]);
+        $form->add([
+            'name' => 'o:block[__blockIndex__][o:data][exclude_current]',
+            'type' => Element\Checkbox::class,
+            'options' => [
+                'label' => 'Exclude current site', // @translate
+            ],
+            'attributes' => [
+                'id' => 'list-of-sites-exclude-current',
+            ],
+        ]);
 
         $form->setData([
             'o:block[__blockIndex__][o:data][sort]' => $data['sort'],
             'o:block[__blockIndex__][o:data][limit]' => $data['limit'],
             'o:block[__blockIndex__][o:data][pagination]' => $data['pagination'],
             'o:block[__blockIndex__][o:data][summaries]' => $data['summaries'],
+            'o:block[__blockIndex__][o:data][exclude_current]' => $data['exclude_current'],
         ]);
 
         return $view->formCollection($form, false);
@@ -94,6 +106,7 @@ public function render(PhpRenderer $view, SitePageBlockRepresentation $block)
         $limit = $block->dataValue('limit', $this->defaults['limit']);
         $pagination = $limit && $block->dataValue('pagination', $this->defaults['pagination']);
         $summaries = $block->dataValue('summaries', $this->defaults['summaries']);
+        $excludeCurrent = $block->dataValue('exclude_current', $this->defaults['exclude_current']);
 
         $data = [];
         if ($pagination) {
@@ -104,6 +117,10 @@ public function render(PhpRenderer $view, SitePageBlockRepresentation $block)
             $data['limit'] = $limit;
         }
 
+        if ($excludeCurrent) {
+            $data['exclude_id'] = $block->page()->site()->id();
+        }
+
         switch ($sort) {
             case 'oldest':
                 $data['sort_by'] = 'created';
diff --git a/application/src/Site/BlockLayout/Manager.php b/application/src/Site/BlockLayout/Manager.php
index 25879427da..d220b1b0d6 100644
--- a/application/src/Site/BlockLayout/Manager.php
+++ b/application/src/Site/BlockLayout/Manager.php
@@ -2,7 +2,7 @@
 namespace Omeka\Site\BlockLayout;
 
 use Omeka\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/Site/BlockLayout/Media.php b/application/src/Site/BlockLayout/Media.php
index af2a5c312d..a6dc92c0c8 100644
--- a/application/src/Site/BlockLayout/Media.php
+++ b/application/src/Site/BlockLayout/Media.php
@@ -1,17 +1,17 @@
 <?php
 namespace Omeka\Site\BlockLayout;
 
-use Zend\Form\Element\Select;
+use Laminas\Form\Element\Select;
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Media extends AbstractBlockLayout
 {
     public function getLabel()
     {
-        return 'Media'; // @translate
+        return 'Media Embed'; // @translate
     }
 
     public function form(PhpRenderer $view, SiteRepresentation $site,
@@ -53,11 +53,12 @@ public function render(PhpRenderer $view, SitePageBlockRepresentation $block)
     public function alignmentClassSelect(PhpRenderer $view,
         SitePageBlockRepresentation $block = null
     ) {
-        $alignments = ['left', 'right'];
+        $alignmentLabels = ['float left', 'float right', 'center'];
+        $alignmentValues = ['left', 'right', 'center'];
         $alignment = $block ? $block->dataValue('alignment', 'left') : 'left';
         $select = new Select('o:block[__blockIndex__][o:data][alignment]');
-        $select->setValueOptions(array_combine($alignments, $alignments))->setValue($alignment);
-        $selectLabel = 'Thumbnail alignment'; // @translate
+        $select->setValueOptions(array_combine($alignmentValues, $alignmentLabels))->setValue($alignment);
+        $selectLabel = 'Alignment'; // @translate
         $select->setAttributes(['title' => $selectLabel, 'aria-label' => $selectLabel]);
         $html = '<div class="field"><div class="field-meta">';
         $html .= '<label class="thumbnail-option" for="o:block[__blockIndex__][o:data][alignment]">' . $selectLabel . '</label></div>';
diff --git a/application/src/Site/BlockLayout/PageTitle.php b/application/src/Site/BlockLayout/PageTitle.php
index 452013be49..a007a3869f 100644
--- a/application/src/Site/BlockLayout/PageTitle.php
+++ b/application/src/Site/BlockLayout/PageTitle.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class PageTitle extends AbstractBlockLayout
 {
diff --git a/application/src/Site/BlockLayout/TableOfContents.php b/application/src/Site/BlockLayout/TableOfContents.php
index ee8744af85..c4ff544d80 100644
--- a/application/src/Site/BlockLayout/TableOfContents.php
+++ b/application/src/Site/BlockLayout/TableOfContents.php
@@ -4,9 +4,9 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\Navigation\Navigation;
-use Zend\Form\Element\Number;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Navigation\Navigation;
+use Laminas\Form\Element\Number;
+use Laminas\View\Renderer\PhpRenderer;
 
 class TableOfContents extends AbstractBlockLayout
 {
diff --git a/application/src/Site/Navigation/Link/Manager.php b/application/src/Site/Navigation/Link/Manager.php
index 0f79a30837..b21cc0013e 100644
--- a/application/src/Site/Navigation/Link/Manager.php
+++ b/application/src/Site/Navigation/Link/Manager.php
@@ -2,7 +2,7 @@
 namespace Omeka\Site\Navigation\Link;
 
 use Omeka\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class Manager extends AbstractPluginManager
 {
diff --git a/application/src/Site/Navigation/Translator.php b/application/src/Site/Navigation/Translator.php
index 5bc8f423ed..35d4220dec 100644
--- a/application/src/Site/Navigation/Translator.php
+++ b/application/src/Site/Navigation/Translator.php
@@ -4,8 +4,8 @@
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Site\Navigation\Link\LinkInterface;
 use Omeka\Site\Navigation\Link\Manager as LinkManager;
-use Zend\Mvc\I18n\Translator as I18n;
-use Zend\View\Helper\Url;
+use Laminas\Mvc\I18n\Translator as I18n;
+use Laminas\View\Helper\Url;
 
 class Translator
 {
diff --git a/application/src/Site/Theme/Theme.php b/application/src/Site/Theme/Theme.php
index c6bfb203e6..7e116e9352 100644
--- a/application/src/Site/Theme/Theme.php
+++ b/application/src/Site/Theme/Theme.php
@@ -127,4 +127,18 @@ public function getThumbnail($key = null)
         }
         return '/themes/' . $this->id . "/theme.jpg";
     }
+
+    /**
+     * Return whether this theme is user-configurable.
+     *
+     * A configurable theme needs a [config] section in its INI file and at
+     * least one element defined there.
+     *
+     * @return bool
+     */
+    public function isConfigurable()
+    {
+        $configSpec = $this->getConfigSpec();
+        return $configSpec && $configSpec['elements'];
+    }
 }
diff --git a/application/src/Stdlib/Cli.php b/application/src/Stdlib/Cli.php
index 8427be90c8..17a665e03d 100644
--- a/application/src/Stdlib/Cli.php
+++ b/application/src/Stdlib/Cli.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Stdlib;
 
-use Zend\Log\LoggerInterface;
+use Laminas\Log\LoggerInterface;
 
 class Cli
 {
diff --git a/application/src/Stdlib/Environment.php b/application/src/Stdlib/Environment.php
index 306ad02485..03bb147466 100644
--- a/application/src/Stdlib/Environment.php
+++ b/application/src/Stdlib/Environment.php
@@ -44,14 +44,14 @@ public function __construct(Connection $connection, Settings $settings)
             && version_compare($dbVersion, 1, '<')
         ) {
             $this->errorMessages[] = new Message(
-                'You must upgrade Omeka S to at least version 1.0.0 before upgrading to version %s. You are currently on version %s.', // @translate
+                'You must upgrade Omeka S to at least version 1.0.0 before upgrading to version %1$s. You are currently on version %2$s.', // @translate
                 $codeVersion,
                 $dbVersion
             );
         }
         if (!version_compare(PHP_VERSION, self::PHP_MINIMUM_VERSION, '>=')) {
             $this->errorMessages[] = new Message(
-                'The installed PHP version (%s) is too low. Omeka requires at least version %s.', // @translate
+                'The installed PHP version (%1$s) is too low. Omeka requires at least version %2$s.', // @translate
                 PHP_VERSION,
                 self::PHP_MINIMUM_VERSION
             );
@@ -78,7 +78,7 @@ public function __construct(Connection $connection, Settings $settings)
         if (strpos($mysqlVersion, 'MariaDB') === false) {
             if (!version_compare($mysqlVersion, self::MYSQL_MINIMUM_VERSION, '>=')) {
                 $this->errorMessages[] = new Message(
-                    'The installed MySQL version (%s) is too low. Omeka requires at least version %s.', // @translate
+                    'The installed MySQL version (%1$s) is too low. Omeka requires at least version %2$s.', // @translate
                     $mysqlVersion,
                     self::MYSQL_MINIMUM_VERSION
                 );
@@ -86,7 +86,7 @@ public function __construct(Connection $connection, Settings $settings)
         } else {
             if (!version_compare($mysqlVersion, self::MARIADB_MINIMUM_VERSION, '>=')) {
                 $this->errorMessages[] = new Message(
-                    'The installed MariaDB version (%s) is too low. Omeka requires at least version %s.', // @translate
+                    'The installed MariaDB version (%1$s) is too low. Omeka requires at least version %2$s.', // @translate
                     $mysqlVersion,
                     self::MARIADB_MINIMUM_VERSION
                 );
diff --git a/application/src/Stdlib/HtmlPurifier.php b/application/src/Stdlib/HtmlPurifier.php
index b3c08739bc..e695b77619 100644
--- a/application/src/Stdlib/HtmlPurifier.php
+++ b/application/src/Stdlib/HtmlPurifier.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\Stdlib;
 
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerAwareTrait;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerAwareTrait;
 
 class HtmlPurifier implements EventManagerAwareInterface
 {
diff --git a/application/src/Stdlib/Mailer.php b/application/src/Stdlib/Mailer.php
index 1a7d829467..9ae9bd71f4 100644
--- a/application/src/Stdlib/Mailer.php
+++ b/application/src/Stdlib/Mailer.php
@@ -5,11 +5,11 @@
 use Omeka\Entity\User;
 use Omeka\Entity\PasswordCreation;
 use Traversable;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Mail\Message;
-use Zend\Mail\MessageFactory;
-use Zend\Mail\Transport\TransportInterface;
-use Zend\View\HelperPluginManager;
+use Laminas\Stdlib\ArrayUtils;
+use Laminas\Mail\Message;
+use Laminas\Mail\MessageFactory;
+use Laminas\Mail\Transport\TransportInterface;
+use Laminas\View\HelperPluginManager;
 
 class Mailer
 {
diff --git a/application/src/Stdlib/Paginator.php b/application/src/Stdlib/Paginator.php
index c5fe922cbc..b530eb4689 100644
--- a/application/src/Stdlib/Paginator.php
+++ b/application/src/Stdlib/Paginator.php
@@ -22,7 +22,7 @@ class Paginator
     const TOTAL_COUNT = 0;
 
     /**
-     * @var \Zend\ServiceManager\ServiceLocatorInterface
+     * @var \Laminas\ServiceManager\ServiceLocatorInterface
      */
     protected $services;
 
diff --git a/application/src/Stdlib/RdfImporter.php b/application/src/Stdlib/RdfImporter.php
index 3fe023b92d..1e40934232 100644
--- a/application/src/Stdlib/RdfImporter.php
+++ b/application/src/Stdlib/RdfImporter.php
@@ -2,8 +2,8 @@
 namespace Omeka\Stdlib;
 
 use Doctrine\ORM\EntityManager;
-use EasyRdf_Graph;
-use EasyRdf_Resource;
+use EasyRdf\Graph as RdfGraph;
+use EasyRdf\Resource as RdfResource;
 use Omeka\Api\Exception\ValidationException;
 use Omeka\Api\Manager as ApiManager;
 use Omeka\Entity\Property;
@@ -90,7 +90,7 @@ public function getMembers($strategy, $namespaceUri, array $options = [])
         }
 
         // Get the full RDF graph from EasyRdf.
-        $graph = new EasyRdf_Graph;
+        $graph = new RdfGraph;
         switch ($strategy) {
             case 'file':
                 // Import from a file
@@ -103,7 +103,7 @@ public function getMembers($strategy, $namespaceUri, array $options = [])
                 }
                 try {
                     $graph->parseFile($file, $options['format'], $namespaceUri);
-                } catch (\EasyRdf_Exception $e) {
+                } catch (\EasyRdf\Exception $e) {
                     throw new ValidationException($e->getMessage(), $e->getCode(), $e);
                 }
                 break;
@@ -114,7 +114,7 @@ public function getMembers($strategy, $namespaceUri, array $options = [])
                 }
                 try {
                     $graph->load($options['url'], $options['format']);
-                } catch (\EasyRdf_Exception $e) {
+                } catch (\EasyRdf\Exception $e) {
                     throw new ValidationException($e->getMessage(), $e->getCode(), $e);
                 }
                 break;
@@ -321,14 +321,14 @@ protected function calculateDiff(array $from, array $to)
     /**
      * Get all members of the specified types.
      *
-     * @param EasyRdf_Graph $graph
+     * @param RdfGraph $graph
      * @param array $types
      * @param string $namespaceUri
      * @param string $labelProperty
      * @param string $commentProperty
      * @param string $lang
      */
-    protected function getMembersOfTypes(EasyRdf_Graph $graph, array $types,
+    protected function getMembersOfTypes(RdfGraph $graph, array $types,
         $namespaceUri, $labelProperty, $commentProperty, $lang
     ) {
         $members = [];
@@ -353,13 +353,13 @@ protected function getMembersOfTypes(EasyRdf_Graph $graph, array $types,
      * Attempts to get the label of the passed language. If one does not exist
      * it defaults to the first available label, if any.
      *
-     * @param EasyRdf_Resource $resource
+     * @param RdfResource $resource
      * @param string $labelProperty
      * @param string $lang
      * @param string $default
      * @return string
      */
-    protected function getLabel(EasyRdf_Resource $resource, $labelProperty, $lang, $default)
+    protected function getLabel(RdfResource $resource, $labelProperty, $lang, $default)
     {
         $label = $resource->get($labelProperty, 'literal', $lang) ?: $resource->get($labelProperty, 'literal');
         if ($label) {
@@ -377,12 +377,12 @@ protected function getLabel(EasyRdf_Resource $resource, $labelProperty, $lang, $
      * Attempts to get the comment of the passed language. If one does not exist
      * it defaults to the first available comment, if any.
      *
-     * @param EasyRdf_Resource $resource
+     * @param RdfResource $resource
      * @param string $commentProperty
      * @param string $lang
      * @return string
      */
-    protected function getComment(EasyRdf_Resource $resource, $commentProperty, $lang)
+    protected function getComment(RdfResource $resource, $commentProperty, $lang)
     {
         $comment = $resource->get($commentProperty, 'literal', $lang) ?: $resource->get($commentProperty, 'literal');
         if ($comment) {
diff --git a/application/src/Test/AbstractHttpControllerTestCase.php b/application/src/Test/AbstractHttpControllerTestCase.php
index c9591e841d..ef1ba7959b 100644
--- a/application/src/Test/AbstractHttpControllerTestCase.php
+++ b/application/src/Test/AbstractHttpControllerTestCase.php
@@ -2,7 +2,7 @@
 
 namespace Omeka\Test;
 
-use Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase as ZendAbstractHttpControllerTestCase;
+use Laminas\Test\PHPUnit\Controller\AbstractHttpControllerTestCase as ZendAbstractHttpControllerTestCase;
 
 abstract class AbstractHttpControllerTestCase extends ZendAbstractHttpControllerTestCase
 {
@@ -13,13 +13,13 @@ public function getApplication()
             return $this->application;
         }
         $config = require OMEKA_PATH . '/application/config/application.config.php';
-        $reader = new \Zend\Config\Reader\Ini;
+        $reader = new \Laminas\Config\Reader\Ini;
         $testConfig = [
             'connection' => $reader->fromFile(OMEKA_PATH . '/application/test/config/database.ini'),
         ];
         $config = array_merge($config, $testConfig);
 
-        \Zend\Console\Console::overrideIsConsole($this->getUseConsoleRequest());
+        \Laminas\Console\Console::overrideIsConsole($this->getUseConsoleRequest());
         $this->application = \Omeka\Mvc\Application::init($config);
 
         $events = $this->application->getEventManager();
diff --git a/application/src/Test/DbTestCase.php b/application/src/Test/DbTestCase.php
index cc8ac38987..161cfa1502 100644
--- a/application/src/Test/DbTestCase.php
+++ b/application/src/Test/DbTestCase.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\Test;
 
-use Zend\Mvc\Application;
+use Laminas\Mvc\Application;
 
 /**
  * Database test case.
@@ -52,12 +52,12 @@ public static function getApplication()
             return self::$application;
         }
         $config = require OMEKA_PATH . '/application/config/application.config.php';
-        $reader = new \Zend\Config\Reader\Ini;
+        $reader = new \Laminas\Config\Reader\Ini;
         $testConfig = [
             'connection' => $reader->fromFile(OMEKA_PATH . '/application/test/config/database.ini'),
         ];
         $config = array_merge($config, $testConfig);
-        \Zend\Console\Console::overrideIsConsole(false);
+        \Laminas\Console\Console::overrideIsConsole(false);
         self::$application = Application::init($config);
         return self::$application;
     }
@@ -92,7 +92,7 @@ public static function installSchema()
             // Without this, at some point during install the view helper Url
             // will throw an exception 'Request URI has not been set'
             $router = $serviceLocator->get('Router');
-            $router->setRequestUri(new \Zend\Uri\Http('http://example.com'));
+            $router->setRequestUri(new \Laminas\Uri\Http('http://example.com'));
 
             $installer = $serviceLocator->get('Omeka\Installer');
             $installer->registerVars(
diff --git a/application/src/Test/TestCase.php b/application/src/Test/TestCase.php
index 60ad323e76..72b4e24b2b 100644
--- a/application/src/Test/TestCase.php
+++ b/application/src/Test/TestCase.php
@@ -3,7 +3,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\QueryBuilder;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
  * Helper methods for building commonly used mock objects for testing.
@@ -14,7 +14,7 @@
 class TestCase extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Get a mock Zend\ServiceManager\ServiceManager (ServiceLocator) object.
+     * Get a mock Laminas\ServiceManager\ServiceManager (ServiceLocator) object.
      *
      * Pass mock service objects that should be accessible via the mocked
      * ServiceManager::get().
@@ -25,7 +25,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
      */
     public function getServiceManager(array $services = [])
     {
-        $serviceManager = $this->createMock('Zend\ServiceManager\ServiceManager');
+        $serviceManager = $this->createMock('Laminas\ServiceManager\ServiceManager');
         $serviceManager->expects($this->any())
             ->method('get')
             ->with($this->callback(function ($subject) use ($services) {
diff --git a/application/src/View/Helper/Api.php b/application/src/View/Helper/Api.php
index 2b42147147..1ecec96395 100644
--- a/application/src/View/Helper/Api.php
+++ b/application/src/View/Helper/Api.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Manager as ApiManager;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for direct access to API read and search operations.
diff --git a/application/src/View/Helper/AssetUrl.php b/application/src/View/Helper/AssetUrl.php
index 8862a08696..84c80c9f5e 100644
--- a/application/src/View/Helper/AssetUrl.php
+++ b/application/src/View/Helper/AssetUrl.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Module;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for returning a path to an asset.
diff --git a/application/src/View/Helper/BlockAttachmentsForm.php b/application/src/View/Helper/BlockAttachmentsForm.php
index 19d9f7bb27..3670d94af3 100644
--- a/application/src/View/Helper/BlockAttachmentsForm.php
+++ b/application/src/View/Helper/BlockAttachmentsForm.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a form for adding/editing block attachments.
diff --git a/application/src/View/Helper/BlockLayout.php b/application/src/View/Helper/BlockLayout.php
index 4b7022dd3d..5f979905be 100644
--- a/application/src/View/Helper/BlockLayout.php
+++ b/application/src/View/Helper/BlockLayout.php
@@ -5,7 +5,7 @@
 use Omeka\Api\Representation\SitePageRepresentation;
 use Omeka\Api\Representation\SitePageBlockRepresentation;
 use Omeka\Site\BlockLayout\Manager as BlockLayoutManager;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering block layouts.
diff --git a/application/src/View/Helper/BlockShowTitleSelect.php b/application/src/View/Helper/BlockShowTitleSelect.php
index 2a0b3d0e18..a572df9bef 100644
--- a/application/src/View/Helper/BlockShowTitleSelect.php
+++ b/application/src/View/Helper/BlockShowTitleSelect.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\Form\Element\Select;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Form\Element\Select;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering an attachment title display select element.
diff --git a/application/src/View/Helper/BlockThumbnailTypeSelect.php b/application/src/View/Helper/BlockThumbnailTypeSelect.php
index 5343e784ed..ee39f45e62 100644
--- a/application/src/View/Helper/BlockThumbnailTypeSelect.php
+++ b/application/src/View/Helper/BlockThumbnailTypeSelect.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Representation\SitePageBlockRepresentation;
-use Zend\Form\Element\Select;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Form\Element\Select;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a thumbnail type select element.
diff --git a/application/src/View/Helper/CancelButton.php b/application/src/View/Helper/CancelButton.php
index 50fa6044b1..6d869bc6b3 100644
--- a/application/src/View/Helper/CancelButton.php
+++ b/application/src/View/Helper/CancelButton.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a cancel button.
diff --git a/application/src/View/Helper/CkEditor.php b/application/src/View/Helper/CkEditor.php
index b4ce5df126..96045330c2 100644
--- a/application/src/View/Helper/CkEditor.php
+++ b/application/src/View/Helper/CkEditor.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for loading scripts necessary to use CKEditor on a page.
diff --git a/application/src/View/Helper/DataType.php b/application/src/View/Helper/DataType.php
index afe2a35723..d3c21e9f30 100644
--- a/application/src/View/Helper/DataType.php
+++ b/application/src/View/Helper/DataType.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use Omeka\DataType\Manager as DataTypeManager;
-use Zend\Form\Element\Select;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Form\Element\Select;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering data types.
diff --git a/application/src/View/Helper/DeleteConfirm.php b/application/src/View/Helper/DeleteConfirm.php
index f8c18d4378..cc99b312d5 100644
--- a/application/src/View/Helper/DeleteConfirm.php
+++ b/application/src/View/Helper/DeleteConfirm.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\ConfirmForm;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering the delete confirm partial.
diff --git a/application/src/View/Helper/FilterSelector.php b/application/src/View/Helper/FilterSelector.php
index 467433cb94..212e039d1f 100644
--- a/application/src/View/Helper/FilterSelector.php
+++ b/application/src/View/Helper/FilterSelector.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a browse filtering form.
diff --git a/application/src/View/Helper/HtmlElement.php b/application/src/View/Helper/HtmlElement.php
index ff80dad0e9..29a7ab78ce 100644
--- a/application/src/View/Helper/HtmlElement.php
+++ b/application/src/View/Helper/HtmlElement.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHtmlElement;
+use Laminas\View\Helper\AbstractHtmlElement;
 
 /**
  * View helper for rendering a HTML element.
diff --git a/application/src/View/Helper/Hyperlink.php b/application/src/View/Helper/Hyperlink.php
index c5f7eb95d6..0aa5d7219c 100644
--- a/application/src/View/Helper/Hyperlink.php
+++ b/application/src/View/Helper/Hyperlink.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHtmlElement;
+use Laminas\View\Helper\AbstractHtmlElement;
 
 /**
  * View helper for rendering a HTML hyperlink.
diff --git a/application/src/View/Helper/I18n.php b/application/src/View/Helper/I18n.php
index 17dcc3f424..345ab9467b 100644
--- a/application/src/View/Helper/I18n.php
+++ b/application/src/View/Helper/I18n.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use DateTime;
-use Zend\I18n\View\Helper\DateFormat;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\I18n\View\Helper\DateFormat;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering localized data.
diff --git a/application/src/View/Helper/ItemSetSelect.php b/application/src/View/Helper/ItemSetSelect.php
index f89e874d15..9811efbcca 100644
--- a/application/src/View/Helper/ItemSetSelect.php
+++ b/application/src/View/Helper/ItemSetSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\ItemSetSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all item sets.
diff --git a/application/src/View/Helper/ItemSetSelector.php b/application/src/View/Helper/ItemSetSelector.php
index d559356245..dbf624d3bc 100644
--- a/application/src/View/Helper/ItemSetSelector.php
+++ b/application/src/View/Helper/ItemSetSelector.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering the item set selector form control.
@@ -11,11 +11,16 @@ class ItemSetSelector extends AbstractHelper
     /**
      * Return the item set selector form control.
      *
+     * @param bool $includeClosedSets Whether to include closed
+     *  sets in the options available from the selector.
      * @return string
      */
-    public function __invoke()
+    public function __invoke($includeClosedSets = false)
     {
-        $query = ['is_open' => true, 'sort_by' => 'owner_name'];
+        $query = ['sort_by' => 'owner_name'];
+        if (!$includeClosedSets) {
+            $query['is_open'] = true;
+        }
         $response = $this->getView()->api()->search('item_sets', $query);
 
         // Organize items sets by owner.
diff --git a/application/src/View/Helper/JsTranslate.php b/application/src/View/Helper/JsTranslate.php
index e768d721f6..59cfab90d1 100644
--- a/application/src/View/Helper/JsTranslate.php
+++ b/application/src/View/Helper/JsTranslate.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering translations for JavaScript strings.
diff --git a/application/src/View/Helper/Lang.php b/application/src/View/Helper/Lang.php
index dbe58d58f8..1b72499515 100644
--- a/application/src/View/Helper/Lang.php
+++ b/application/src/View/Helper/Lang.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\I18n\Translator\TranslatorInterface;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\I18n\Translator\TranslatorInterface;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting a BCP 47-compliant value for the lang attribute.
diff --git a/application/src/View/Helper/Logger.php b/application/src/View/Helper/Logger.php
index 8b9fa1e6fa..e688c78072 100644
--- a/application/src/View/Helper/Logger.php
+++ b/application/src/View/Helper/Logger.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\Log\LoggerInterface;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Log\LoggerInterface;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting the Zend logger.
diff --git a/application/src/View/Helper/Media.php b/application/src/View/Helper/Media.php
index 888f7ce269..d031e6fcc5 100644
--- a/application/src/View/Helper/Media.php
+++ b/application/src/View/Helper/Media.php
@@ -5,10 +5,10 @@
 use Omeka\Media\Ingester\Manager as IngesterManager;
 use Omeka\Media\Ingester\MutableIngesterInterface;
 use Omeka\Media\Renderer\Manager as RendererManager;
-use Zend\Form\Element\Hidden;
-use Zend\Form\Element\Text;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Form\Element\Hidden;
+use Laminas\Form\Element\Text;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering media.
diff --git a/application/src/View/Helper/Messages.php b/application/src/View/Helper/Messages.php
index 1e010f8c17..95310cab82 100644
--- a/application/src/View/Helper/Messages.php
+++ b/application/src/View/Helper/Messages.php
@@ -3,7 +3,7 @@
 
 use Omeka\Mvc\Controller\Plugin\Messenger;
 use Omeka\Stdlib\Message;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for proxing the messenger controller plugin.
diff --git a/application/src/View/Helper/NavigationLink.php b/application/src/View/Helper/NavigationLink.php
index a21fe3968b..7c1d80ddb5 100644
--- a/application/src/View/Helper/NavigationLink.php
+++ b/application/src/View/Helper/NavigationLink.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Site\Navigation\Link\Manager;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a navigation links.
diff --git a/application/src/View/Helper/PageTitle.php b/application/src/View/Helper/PageTitle.php
index e3fddfcdfa..de4cb9abcb 100644
--- a/application/src/View/Helper/PageTitle.php
+++ b/application/src/View/Helper/PageTitle.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
-use Zend\View\Helper\Placeholder\Container\AbstractContainer;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\View\Helper\Placeholder\Container\AbstractContainer;
 
 /**
  * View helper for rendering a title heading for a page.
diff --git a/application/src/View/Helper/Pagination.php b/application/src/View/Helper/Pagination.php
index d21008e781..1a9f762114 100644
--- a/application/src/View/Helper/Pagination.php
+++ b/application/src/View/Helper/Pagination.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Stdlib\Paginator;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering pagination.
@@ -22,7 +22,7 @@ class Pagination extends AbstractHelper
     /**
      * Name of view script, or a view model
      *
-     * @var string|\Zend\View\Model\ModelInterface
+     * @var string|\Laminas\View\Model\ModelInterface
      */
     protected $partialName;
 
diff --git a/application/src/View/Helper/Params.php b/application/src/View/Helper/Params.php
index 42d0d55109..892b55f2e4 100644
--- a/application/src/View/Helper/Params.php
+++ b/application/src/View/Helper/Params.php
@@ -1,8 +1,8 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\Mvc\Controller\Plugin\Params as ParamsPlugin;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\Mvc\Controller\Plugin\Params as ParamsPlugin;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting params from the request.
diff --git a/application/src/View/Helper/PasswordRequirements.php b/application/src/View/Helper/PasswordRequirements.php
index 0c5564616a..86c8faf06a 100644
--- a/application/src/View/Helper/PasswordRequirements.php
+++ b/application/src/View/Helper/PasswordRequirements.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering the password requirements.
@@ -64,7 +64,7 @@ public function __invoke()
             && strlen($config['symbol_list'])
         ) {
             $requirements[] = sprintf(
-                $view->translate('Password must contain at least %s symbols: <code>%s</code>'),
+                $view->translate('Password must contain at least %1$s symbols: <code>%2$s</code>'),
                 $config['min_symbol'],
                 $config['symbol_list']
             );
diff --git a/application/src/View/Helper/PropertySelect.php b/application/src/View/Helper/PropertySelect.php
index 630a6b7719..585b890345 100644
--- a/application/src/View/Helper/PropertySelect.php
+++ b/application/src/View/Helper/PropertySelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\PropertySelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all properties.
diff --git a/application/src/View/Helper/PropertySelector.php b/application/src/View/Helper/PropertySelector.php
index be6b633cff..811bbc5857 100644
--- a/application/src/View/Helper/PropertySelector.php
+++ b/application/src/View/Helper/PropertySelector.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering the property selector.
diff --git a/application/src/View/Helper/QueryToHiddenInputs.php b/application/src/View/Helper/QueryToHiddenInputs.php
index 04e1a11cbe..bafe00b3ab 100644
--- a/application/src/View/Helper/QueryToHiddenInputs.php
+++ b/application/src/View/Helper/QueryToHiddenInputs.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHtmlElement;
+use Laminas\View\Helper\AbstractHtmlElement;
 
 /**
  * View helper for building a hidden form input for every query in the URL query
diff --git a/application/src/View/Helper/ResourceClassSelect.php b/application/src/View/Helper/ResourceClassSelect.php
index f10bea9b1f..cf7b37c60c 100644
--- a/application/src/View/Helper/ResourceClassSelect.php
+++ b/application/src/View/Helper/ResourceClassSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\ResourceClassSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all resource classes.
diff --git a/application/src/View/Helper/ResourceSelect.php b/application/src/View/Helper/ResourceSelect.php
index 6eb494344c..442175653a 100644
--- a/application/src/View/Helper/ResourceSelect.php
+++ b/application/src/View/Helper/ResourceSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\ResourceSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all of some resource.
diff --git a/application/src/View/Helper/ResourceTemplateSelect.php b/application/src/View/Helper/ResourceTemplateSelect.php
index 3977769adb..cb9705d97f 100644
--- a/application/src/View/Helper/ResourceTemplateSelect.php
+++ b/application/src/View/Helper/ResourceTemplateSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\ResourceTemplateSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all resource templates.
diff --git a/application/src/View/Helper/RoleSelect.php b/application/src/View/Helper/RoleSelect.php
index 852b4a9f64..3213ce898c 100644
--- a/application/src/View/Helper/RoleSelect.php
+++ b/application/src/View/Helper/RoleSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\RoleSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all roles.
diff --git a/application/src/View/Helper/SearchFilters.php b/application/src/View/Helper/SearchFilters.php
index e776bc73f0..cdaae5a760 100644
--- a/application/src/View/Helper/SearchFilters.php
+++ b/application/src/View/Helper/SearchFilters.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Exception\NotFoundException;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering search filters.
diff --git a/application/src/View/Helper/SearchUserFilters.php b/application/src/View/Helper/SearchUserFilters.php
index b55813ac21..64d08b83ea 100644
--- a/application/src/View/Helper/SearchUserFilters.php
+++ b/application/src/View/Helper/SearchUserFilters.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering search user filters.
diff --git a/application/src/View/Helper/SectionNav.php b/application/src/View/Helper/SectionNav.php
index 0b8f8b6721..d7157d858f 100644
--- a/application/src/View/Helper/SectionNav.php
+++ b/application/src/View/Helper/SectionNav.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering section navigation.
diff --git a/application/src/View/Helper/Setting.php b/application/src/View/Helper/Setting.php
index 7cc346a954..c1aaecbc01 100644
--- a/application/src/View/Helper/Setting.php
+++ b/application/src/View/Helper/Setting.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Settings\SettingsInterface;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting settings.
diff --git a/application/src/View/Helper/SitePagePagination.php b/application/src/View/Helper/SitePagePagination.php
index 3c48cffc9c..eeb662c94c 100644
--- a/application/src/View/Helper/SitePagePagination.php
+++ b/application/src/View/Helper/SitePagePagination.php
@@ -2,8 +2,8 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Representation\SitePageRepresentation;
-use Zend\View\Exception;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Exception;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering site page pagination.
diff --git a/application/src/View/Helper/SiteSelect.php b/application/src/View/Helper/SiteSelect.php
index fa775e6281..600928622c 100644
--- a/application/src/View/Helper/SiteSelect.php
+++ b/application/src/View/Helper/SiteSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\SiteSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all sites.
diff --git a/application/src/View/Helper/SiteSelector.php b/application/src/View/Helper/SiteSelector.php
new file mode 100644
index 0000000000..9e0b453528
--- /dev/null
+++ b/application/src/View/Helper/SiteSelector.php
@@ -0,0 +1,32 @@
+<?php
+namespace Omeka\View\Helper;
+
+use Zend\View\Helper\AbstractHelper;
+
+class SiteSelector extends AbstractHelper
+{
+    public function __invoke()
+    {
+        $view = $this->getView();
+        $sites = $view->api()->search('sites', ['sort_by' => 'title'])->getContent();
+        $sitesByOwner = [];
+        $totalCount = 0;
+        foreach ($sites as $site) {
+            if ($site->userIsAllowed('can-assign-items')) {
+                $owner = $site->owner();
+                $email = $owner ? $owner->email() : null;
+                $sitesByOwner[$email]['owner'] = $owner;
+                $sitesByOwner[$email]['sites'][] = $site;
+                $totalCount++;
+            }
+        }
+        ksort($sitesByOwner);
+        return $view->partial(
+            'common/site-selector',
+            [
+                'sitesByOwner' => $sitesByOwner,
+                'totalCount' => $totalCount,
+            ]
+        );
+    }
+}
diff --git a/application/src/View/Helper/SortLink.php b/application/src/View/Helper/SortLink.php
index 2ca22fd13e..4f05af3504 100644
--- a/application/src/View/Helper/SortLink.php
+++ b/application/src/View/Helper/SortLink.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a sortable link.
diff --git a/application/src/View/Helper/SortSelector.php b/application/src/View/Helper/SortSelector.php
index 41a68c7f01..11c68f7815 100644
--- a/application/src/View/Helper/SortSelector.php
+++ b/application/src/View/Helper/SortSelector.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering a sorting form.
@@ -36,6 +36,6 @@ public function __invoke($sortBy, $partialName = null)
         ];
         $args = $view->trigger('view.sort-selector', $args, true);
 
-        return $view->partial($partialName, $args);
+        return $view->partial($partialName, (array) $args);
     }
 }
diff --git a/application/src/View/Helper/Status.php b/application/src/View/Helper/Status.php
index 1e905a5cbd..e2349335c3 100644
--- a/application/src/View/Helper/Status.php
+++ b/application/src/View/Helper/Status.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Mvc\Status as MvcStatus;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting MVC status.
diff --git a/application/src/View/Helper/ThemeSetting.php b/application/src/View/Helper/ThemeSetting.php
index ea3367ed64..2ad63e6f29 100644
--- a/application/src/View/Helper/ThemeSetting.php
+++ b/application/src/View/Helper/ThemeSetting.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting theme settings.
diff --git a/application/src/View/Helper/ThemeSettingAssetUrl.php b/application/src/View/Helper/ThemeSettingAssetUrl.php
index 5168f3eab0..b15fe91b2b 100644
--- a/application/src/View/Helper/ThemeSettingAssetUrl.php
+++ b/application/src/View/Helper/ThemeSettingAssetUrl.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Exception as ApiException;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for getting a path to a theme setting asset.
diff --git a/application/src/View/Helper/Thumbnail.php b/application/src/View/Helper/Thumbnail.php
index 6a5864c44e..293db2bddb 100644
--- a/application/src/View/Helper/Thumbnail.php
+++ b/application/src/View/Helper/Thumbnail.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Api\Representation\AbstractRepresentation;
-use Zend\View\Helper\AbstractHtmlElement;
+use Laminas\View\Helper\AbstractHtmlElement;
 
 /**
  * View helper for rendering a thumbnail image.
diff --git a/application/src/View/Helper/Trigger.php b/application/src/View/Helper/Trigger.php
index 7f04011937..362729130f 100644
--- a/application/src/View/Helper/Trigger.php
+++ b/application/src/View/Helper/Trigger.php
@@ -1,10 +1,10 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\EventManager\EventManagerInterface;
-use Zend\Mvc\Controller\PluginManager as ControllerPluginManager;
-use Zend\View\Helper\AbstractHelper;
-use Zend\EventManager\Event;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\Mvc\Controller\PluginManager as ControllerPluginManager;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\EventManager\Event;
 
 /**
  * View helper for triggering a view event.
diff --git a/application/src/View/Helper/UploadLimit.php b/application/src/View/Helper/UploadLimit.php
index dde96a1278..18c7b66f11 100644
--- a/application/src/View/Helper/UploadLimit.php
+++ b/application/src/View/Helper/UploadLimit.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering the upload size limit.
diff --git a/application/src/View/Helper/UserBar.php b/application/src/View/Helper/UserBar.php
index 2d254524a8..a64ac8084c 100644
--- a/application/src/View/Helper/UserBar.php
+++ b/application/src/View/Helper/UserBar.php
@@ -1,10 +1,11 @@
 <?php
 namespace Omeka\View\Helper;
 
+use Omeka\Api\Exception as ApiException;
 use Omeka\Api\Representation\SiteRepresentation;
 use Omeka\Entity\User;
-use Zend\View\Helper\AbstractHelper;
-use Zend\View\Renderer\RendererInterface;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\View\Renderer\RendererInterface;
 
 /**
  * View helper for rendering the user bar.
@@ -110,14 +111,18 @@ protected function links(RendererInterface $view, SiteRepresentation $site, User
                     'text' => $translate($mapPluralLabels[$controller]),
                     'url' => $url('admin/site/slug/action', ['site-slug' => $site->slug(), 'action' => 'page']),
                 ];
-                $page = $view->api()->read('site_pages', ['site' => $site->id(), 'slug' => $routeParams['page-slug']])->getContent();
-                if ($page->userIsAllowed('edit')) {
-                    $links[] = [
-                        'resource' => $controller,
-                        'action' => 'edit',
-                        'text' => $translate('Edit'),
-                        'url' => $page->adminUrl('edit'),
-                    ];
+                try {
+                    $page = $view->api()->read('site_pages', ['site' => $site->id(), 'slug' => $routeParams['page-slug']])->getContent();
+                    if ($page->userIsAllowed('edit')) {
+                        $links[] = [
+                            'resource' => $controller,
+                            'action' => 'edit',
+                            'text' => $translate('Edit'),
+                            'url' => $page->adminUrl('edit'),
+                        ];
+                    }
+                } catch (ApiException\NotFoundException $e) {
+                    // do nothing
                 }
             }
         } else {
diff --git a/application/src/View/Helper/UserIsAllowed.php b/application/src/View/Helper/UserIsAllowed.php
index 2af7b9723f..67abdb7245 100644
--- a/application/src/View/Helper/UserIsAllowed.php
+++ b/application/src/View/Helper/UserIsAllowed.php
@@ -2,7 +2,7 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Permissions\Acl;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for authorizing the current user.
diff --git a/application/src/View/Helper/UserSelect.php b/application/src/View/Helper/UserSelect.php
index dd357c4604..5b80c32948 100644
--- a/application/src/View/Helper/UserSelect.php
+++ b/application/src/View/Helper/UserSelect.php
@@ -2,9 +2,9 @@
 namespace Omeka\View\Helper;
 
 use Omeka\Form\Element\UserSelect as Select;
-use Zend\Form\Factory;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Factory;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * View helper for rendering a select menu containing all users.
diff --git a/application/src/View/Helper/UserSelector.php b/application/src/View/Helper/UserSelector.php
index 9941f525b3..ecef65ad16 100644
--- a/application/src/View/Helper/UserSelector.php
+++ b/application/src/View/Helper/UserSelector.php
@@ -1,7 +1,7 @@
 <?php
 namespace Omeka\View\Helper;
 
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
 
 /**
  * View helper for rendering the user selector.
diff --git a/application/src/View/Model/ApiJsonModel.php b/application/src/View/Model/ApiJsonModel.php
index e124e06b14..fa0c5e51ba 100644
--- a/application/src/View/Model/ApiJsonModel.php
+++ b/application/src/View/Model/ApiJsonModel.php
@@ -2,7 +2,7 @@
 
 namespace Omeka\View\Model;
 
-use Zend\View\Model\JsonModel;
+use Laminas\View\Model\JsonModel;
 
 /**
  * View model for JSON responses from the API.
diff --git a/application/src/View/Renderer/ApiJsonRenderer.php b/application/src/View/Renderer/ApiJsonRenderer.php
index 435dcd2850..5e654453b7 100644
--- a/application/src/View/Renderer/ApiJsonRenderer.php
+++ b/application/src/View/Renderer/ApiJsonRenderer.php
@@ -3,8 +3,8 @@
 
 use Omeka\Api\Exception\ValidationException;
 use Omeka\Api\Response;
-use Zend\Json\Json;
-use Zend\View\Renderer\JsonRenderer;
+use Laminas\Json\Json;
+use Laminas\View\Renderer\JsonRenderer;
 
 /**
  * JSON renderer for API responses.
diff --git a/application/src/View/Strategy/ApiJsonStrategy.php b/application/src/View/Strategy/ApiJsonStrategy.php
index df6d45c3a3..6056c8810a 100644
--- a/application/src/View/Strategy/ApiJsonStrategy.php
+++ b/application/src/View/Strategy/ApiJsonStrategy.php
@@ -8,8 +8,8 @@
 use Omeka\Mvc\Exception as MvcException;
 use Omeka\View\Model\ApiJsonModel;
 use Omeka\View\Renderer\ApiJsonRenderer;
-use Zend\View\Strategy\JsonStrategy;
-use Zend\View\ViewEvent;
+use Laminas\View\Strategy\JsonStrategy;
+use Laminas\View\ViewEvent;
 
 /**
  * View strategy for returning JSON from the API.
diff --git a/application/test/OmekaTest/Api/Adapter/AbstractAdapterTest.php b/application/test/OmekaTest/Api/Adapter/AbstractAdapterTest.php
index 20ce6dd10a..ea87a21fbc 100644
--- a/application/test/OmekaTest/Api/Adapter/AbstractAdapterTest.php
+++ b/application/test/OmekaTest/Api/Adapter/AbstractAdapterTest.php
@@ -61,7 +61,7 @@ public function testDeleteRequiresImplementation()
     protected function setServiceManager()
     {
         // MvcTranslator
-        $mockTranslator = $this->createMock('Zend\I18n\Translator\Translator');
+        $mockTranslator = $this->createMock('Laminas\I18n\Translator\Translator');
         $mockTranslator->expects($this->any())
             ->method('translate')
             ->will($this->returnArgument(0));
@@ -77,7 +77,7 @@ protected function setServiceManager()
         $serviceManager = $this->getServiceManager([
             'MvcTranslator' => $mockTranslator,
             'Omeka\ApiAdapterManager' => $mockAdapterManager,
-            'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+            'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
         ]);
         $this->adapter->setServiceLocator($serviceManager);
     }
diff --git a/application/test/OmekaTest/Api/Adapter/Entity/AbstractEntityAdapterTest.php b/application/test/OmekaTest/Api/Adapter/Entity/AbstractEntityAdapterTest.php
index 28b846fb83..b098ab0ef5 100644
--- a/application/test/OmekaTest/Api/Adapter/Entity/AbstractEntityAdapterTest.php
+++ b/application/test/OmekaTest/Api/Adapter/Entity/AbstractEntityAdapterTest.php
@@ -4,8 +4,8 @@
 use Omeka\Api\Representation\RepresentationInterface;
 use Omeka\Entity\AbstractEntity;
 use Omeka\Test\TestCase;
-use Zend\EventManager\EventManagerInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class AbstractEntityAdapterTest extends TestCase
 {
@@ -39,7 +39,7 @@ public function testCreate()
             ->with($this->isInstanceOf('Omeka\Entity\EntityInterface'));
 
         // Service: MvcTranslator
-        $translator = $this->createMock('Zend\I18n\Translator\Translator');
+        $translator = $this->createMock('Laminas\I18n\Translator\Translator');
 
         // Service: Omeka\Acl
         $acl = $this->createMock('Omeka\Permissions\Acl');
@@ -51,10 +51,10 @@ public function testCreate()
             )
             ->will($this->returnValue(true));
 
-        $eventManager = $this->createMock('Zend\EventManager\EventManager');
+        $eventManager = $this->createMock('Laminas\EventManager\EventManager');
         $eventManager->expects($this->exactly(2))
             ->method('triggerEvent')
-            ->with($this->isInstanceOf('Zend\EventManager\Event'));
+            ->with($this->isInstanceOf('Laminas\EventManager\Event'));
 
         $serviceManager = $this->getServiceManager([
             'Omeka\EntityManager' => $entityManager,
diff --git a/application/test/OmekaTest/Api/Adapter/ManagerTest.php b/application/test/OmekaTest/Api/Adapter/ManagerTest.php
index 7c2187d7a8..4ddcb0a3bb 100644
--- a/application/test/OmekaTest/Api/Adapter/ManagerTest.php
+++ b/application/test/OmekaTest/Api/Adapter/ManagerTest.php
@@ -11,14 +11,14 @@ class ManagerTest extends TestCase
     public function setUp()
     {
         $serviceManager = $this->getServiceManager([
-            'EventManager' => $this->getMockForAbstractClass('Zend\EventManager\EventManagerInterface'),
+            'EventManager' => $this->getMockForAbstractClass('Laminas\EventManager\EventManagerInterface'),
         ]);
         $this->manager = new Manager($serviceManager);
     }
 
     public function testValidateRequiresAdapterInterface()
     {
-        $this->expectException('Zend\ServiceManager\Exception\InvalidServiceException');
+        $this->expectException('Laminas\ServiceManager\Exception\InvalidServiceException');
         $this->manager->validate(new \stdClass);
     }
 }
diff --git a/application/test/OmekaTest/Api/ManagerTest.php b/application/test/OmekaTest/Api/ManagerTest.php
index ec5ccde029..aa8e07bea8 100644
--- a/application/test/OmekaTest/Api/ManagerTest.php
+++ b/application/test/OmekaTest/Api/ManagerTest.php
@@ -4,7 +4,7 @@
 use Omeka\Api\Request;
 use Omeka\Api\Manager;
 use Omeka\Test\TestCase;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 
 class ManagerTest extends TestCase
 {
@@ -106,19 +106,19 @@ protected function getApiManager($requestOperation, $mockResponse,
         $isAllowed = true, $validResource = true, $isBatchCreate = false
     ) {
         // Omeka\Logger
-        $mockLogger = $this->createMock('Zend\Log\Logger');
+        $mockLogger = $this->createMock('Laminas\Log\Logger');
 
         // MvcTranslator
-        $mockTranslator = $this->createMock('Zend\I18n\Translator\Translator');
+        $mockTranslator = $this->createMock('Laminas\I18n\Translator\Translator');
         $mockTranslator->expects($this->any())
             ->method('translate')
             ->will($this->returnArgument(0));
 
         // EventManager returned by adapter
-        $mockEventManager = $this->createMock('Zend\EventManager\EventManager');
+        $mockEventManager = $this->createMock('Laminas\EventManager\EventManager');
         $mockEventManager->expects($this->any())
             ->method('trigger')
-            ->with($this->isInstanceOf('Zend\EventManager\Event'));
+            ->with($this->isInstanceOf('Laminas\EventManager\Event'));
 
         // TestAdapter returned by the adapter manager
         $mockAdapter = $this->createMock('Omeka\Api\Adapter\AdapterInterface');
diff --git a/application/test/OmekaTest/Api/Representation/AbstractRepresentationTest.php b/application/test/OmekaTest/Api/Representation/AbstractRepresentationTest.php
index 9a0443f1e3..acf00018d3 100644
--- a/application/test/OmekaTest/Api/Representation/AbstractRepresentationTest.php
+++ b/application/test/OmekaTest/Api/Representation/AbstractRepresentationTest.php
@@ -9,7 +9,7 @@ class AbstractRepresentationTest extends TestCase
     public function testSetServiceLocator()
     {
         $serviceLocator = $this->getServiceManager([
-            'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+            'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
         ]);
         $abstractRep = $this->getMockForAbstractClass(
             'Omeka\Api\Representation\AbstractRepresentation'
diff --git a/application/test/OmekaTest/Api/Representation/AbstractResourceRepresentationTest.php b/application/test/OmekaTest/Api/Representation/AbstractResourceRepresentationTest.php
index b467707669..a1e9ce15c3 100644
--- a/application/test/OmekaTest/Api/Representation/AbstractResourceRepresentationTest.php
+++ b/application/test/OmekaTest/Api/Representation/AbstractResourceRepresentationTest.php
@@ -3,7 +3,7 @@
 
 use Omeka\Test\TestCase;
 use ReflectionClass;
-use Zend\EventManager\EventManager;
+use Laminas\EventManager\EventManager;
 
 class AbstractResourceRepresentationTest extends TestCase
 {
@@ -14,7 +14,7 @@ public function testConstructor()
         $url = 'test_url';
         $context = 'test_context';
 
-        $urlHelper = $this->createMock('Zend\View\Helper\Url');
+        $urlHelper = $this->createMock('Laminas\View\Helper\Url');
         $urlHelper->expects($this->once())
             ->method('__invoke')
             ->will($this->returnValue($context));
diff --git a/application/test/OmekaTest/Api/Representation/Entity/AbstractResourceEntityRepresentationTest.php b/application/test/OmekaTest/Api/Representation/Entity/AbstractResourceEntityRepresentationTest.php
index 1d485402a4..8fffcb0b80 100644
--- a/application/test/OmekaTest/Api/Representation/Entity/AbstractResourceEntityRepresentationTest.php
+++ b/application/test/OmekaTest/Api/Representation/Entity/AbstractResourceEntityRepresentationTest.php
@@ -30,7 +30,7 @@ public function testGetResourceClass()
 
         $serviceLocator = $this->getServiceManager([
             'Omeka\ApiAdapterManager' => $apiAdapterManager,
-            'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+            'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
         ]);
 
         $adapter = $this->createMock('Omeka\Api\Adapter\AbstractEntityAdapter');
@@ -55,7 +55,7 @@ public function testGetCreated()
             ->will($this->returnValue($resourceCreated));
 
         $serviceLocator = $this->getServiceManager([
-            'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+            'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
         ]);
 
         $adapter = $this->createMock('Omeka\Api\Adapter\AbstractEntityAdapter');
@@ -80,7 +80,7 @@ public function testGetModified()
             ->will($this->returnValue($resourceModified));
 
         $serviceLocator = $this->getServiceManager([
-            'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+            'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
         ]);
 
         $adapter = $this->createMock('Omeka\Api\Adapter\AbstractEntityAdapter');
diff --git a/application/test/OmekaTest/Api/Representation/ResourceReferenceTest.php b/application/test/OmekaTest/Api/Representation/ResourceReferenceTest.php
index ee7f3ebb86..04efe064bd 100644
--- a/application/test/OmekaTest/Api/Representation/ResourceReferenceTest.php
+++ b/application/test/OmekaTest/Api/Representation/ResourceReferenceTest.php
@@ -24,7 +24,7 @@ public function setUp()
         $this->adapter->expects($this->once())
             ->method('getServiceLocator')
             ->will($this->returnValue($this->getServiceManager([
-                'EventManager' => $this->createMock('Zend\EventManager\EventManager'),
+                'EventManager' => $this->createMock('Laminas\EventManager\EventManager'),
                 'ViewHelperManager' => $this->viewHelperManager,
             ])));
     }
diff --git a/application/test/OmekaTest/Db/Event/Subscriber/EntityTest.php b/application/test/OmekaTest/Db/Event/Subscriber/EntityTest.php
index 88a0f3a010..78c82a9d65 100644
--- a/application/test/OmekaTest/Db/Event/Subscriber/EntityTest.php
+++ b/application/test/OmekaTest/Db/Event/Subscriber/EntityTest.php
@@ -14,7 +14,7 @@ class EntityTest extends TestCase
 
     public function testGetSubscribedEvents()
     {
-        $eventManager = $this->createMock('Zend\EventManager\EventManager');
+        $eventManager = $this->createMock('Laminas\EventManager\EventManager');
         $entity = new Entity($eventManager);
         $this->assertEquals(
             $this->subscribedEvents,
@@ -24,13 +24,13 @@ public function testGetSubscribedEvents()
 
     public function testCallbacks()
     {
-        $eventManager = $this->createMock('Zend\EventManager\EventManager');
+        $eventManager = $this->createMock('Laminas\EventManager\EventManager');
         $eventManager->expects($this->exactly(6))
             ->method('setIdentifiers')
             ->with($this->equalTo(['Omeka\Db\Event\Subscriber\Entity']));
         $eventManager->expects($this->exactly(6))
             ->method('triggerEvent')
-            ->with($this->isInstanceOf('Zend\EventManager\Event'));
+            ->with($this->isInstanceOf('Laminas\EventManager\Event'));
         $entity = new Entity($eventManager);
 
         $eventArgs = $this->getMockBuilder('Doctrine\Common\Persistence\Event\LifecycleEventArgs')
diff --git a/application/test/OmekaTest/Db/Migration/ManagerTest.php b/application/test/OmekaTest/Db/Migration/ManagerTest.php
index 8ccdfda120..4b2c533de1 100644
--- a/application/test/OmekaTest/Db/Migration/ManagerTest.php
+++ b/application/test/OmekaTest/Db/Migration/ManagerTest.php
@@ -70,7 +70,7 @@ public function testLoadMigrationWithBadClassName()
         $path = __DIR__ . '/_files/1_MockMigration.php';
         $class = 'OmekaTest\Db\Migration\BogusMigration';
 
-        $translator = $this->getMockForAbstractClass('Zend\I18n\Translator\TranslatorInterface');
+        $translator = $this->getMockForAbstractClass('Laminas\I18n\Translator\TranslatorInterface');
         $translator->expects($this->once())
             ->method('translate')
             ->will($this->returnArgument(0));
@@ -93,7 +93,7 @@ public function testLoadMigrationWithInvalidMigration()
         $path = __DIR__ . '/_files/2_MockInvalidMigration.php';
         $class = 'OmekaTest\Db\Migration\MockInvalidMigration';
 
-        $translator = $this->getMockForAbstractClass('Zend\I18n\Translator\TranslatorInterface');
+        $translator = $this->getMockForAbstractClass('Laminas\I18n\Translator\TranslatorInterface');
         $translator->expects($this->once())
             ->method('translate')
             ->will($this->returnArgument(0));
diff --git a/application/test/OmekaTest/Installation/InstallerTest.php b/application/test/OmekaTest/Installation/InstallerTest.php
index f59a02e2f6..26fe42201d 100644
--- a/application/test/OmekaTest/Installation/InstallerTest.php
+++ b/application/test/OmekaTest/Installation/InstallerTest.php
@@ -19,7 +19,7 @@ public function testSetsAndGetsServiceLocator()
     {
         $installer = new Installer($this->getServiceManager());
         $this->assertInstanceOf(
-            'Zend\ServiceManager\ServiceLocatorInterface',
+            'Laminas\ServiceManager\ServiceLocatorInterface',
             $installer->getServiceLocator()
         );
     }
@@ -73,7 +73,7 @@ public function testPreInstallErrorInstallSuccessTask()
     public function getConfiguredServiceManager()
     {
         $status = $this->getMockBuilder('Omeka\Mvc\Status')->disableOriginalConstructor()->getMock();
-        $translator = $this->createMock('Zend\I18n\Translator\Translator');
+        $translator = $this->createMock('Laminas\I18n\Translator\Translator');
         return $this->getServiceManager([
             'MvcTranslator' => $translator,
             'Omeka\Status' => $status,
diff --git a/application/test/OmekaTest/Job/DispatcherTest.php b/application/test/OmekaTest/Job/DispatcherTest.php
index 4f3c7bbba1..cb3064291f 100644
--- a/application/test/OmekaTest/Job/DispatcherTest.php
+++ b/application/test/OmekaTest/Job/DispatcherTest.php
@@ -19,11 +19,11 @@ public function setUp()
     {
         $strategy = $this->createMock('Omeka\Job\DispatchStrategy\StrategyInterface');
 
-        $this->auth = $this->createMock('Zend\Authentication\AuthenticationService');
+        $this->auth = $this->createMock('Laminas\Authentication\AuthenticationService');
         $this->entityManager = $this->getMockBuilder('Doctrine\ORM\EntityManager')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->logger = $this->createMock('Zend\Log\Logger');
+        $this->logger = $this->createMock('Laminas\Log\Logger');
 
         $this->dispatcher = new Dispatcher($strategy, $this->entityManager, $this->logger, $this->auth);
     }
diff --git a/application/test/OmekaTest/Mvc/Controller/Plugin/ApiTest.php b/application/test/OmekaTest/Mvc/Controller/Plugin/ApiTest.php
index 75fb3ab7ea..b94768e57c 100644
--- a/application/test/OmekaTest/Mvc/Controller/Plugin/ApiTest.php
+++ b/application/test/OmekaTest/Mvc/Controller/Plugin/ApiTest.php
@@ -17,7 +17,7 @@ public function testSearch()
             ->with($this->equalTo($resource), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -35,7 +35,7 @@ public function testCreate()
             ->with($this->equalTo($resource), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -53,7 +53,7 @@ public function testBatchCreate()
             ->with($this->equalTo($resource), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -72,7 +72,7 @@ public function testRead()
             ->with($this->equalTo($resource), $this->equalTo($id), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -91,7 +91,7 @@ public function testUpdate()
             ->with($this->equalTo($resource), $this->equalTo($id), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -110,7 +110,7 @@ public function testDelete()
             ->with($this->equalTo($resource), $this->equalTo($id), $this->equalTo($data))
             ->will($this->returnValue($this->createMock('Omeka\Api\Response')));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -133,7 +133,7 @@ public function testSearchOneWithContent()
             ->with($this->equalTo($resource), $this->equalTo($dataWithLimit))
             ->will($this->returnValue($response));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
@@ -157,7 +157,7 @@ public function testSearchOneWithoutContent()
             ->with($this->equalTo($resource), $this->equalTo($dataWithLimit))
             ->will($this->returnValue($response));
 
-        $mockController = $this->getMockForAbstractClass('Zend\Mvc\Controller\AbstractController');
+        $mockController = $this->getMockForAbstractClass('Laminas\Mvc\Controller\AbstractController');
 
         $api = new Api($mockApiManager);
         $api->setController($mockController);
diff --git a/application/test/OmekaTest/Mvc/MvcListenersTest.php b/application/test/OmekaTest/Mvc/MvcListenersTest.php
index ad7222600c..95c430027b 100644
--- a/application/test/OmekaTest/Mvc/MvcListenersTest.php
+++ b/application/test/OmekaTest/Mvc/MvcListenersTest.php
@@ -25,7 +25,7 @@ public function testRedirectToInstallation()
 
         $event = $this->getEventForRedirectToInstallation();
         $return = $this->mvcListeners->redirectToInstallation($event);
-        $this->assertInstanceOf('Zend\Http\PhpEnvironment\Response', $return);
+        $this->assertInstanceOf('Laminas\Http\PhpEnvironment\Response', $return);
     }
 
     protected function getEventForRedirectToInstallation(array $options = [])
@@ -33,10 +33,10 @@ protected function getEventForRedirectToInstallation(array $options = [])
         $options['is_installed'] = isset($options['is_installed']) ? true : false;
         $options['is_install_route'] = isset($options['is_install_route']) ? true : false;
 
-        $event = $this->createMock('Zend\Mvc\MvcEvent');
+        $event = $this->createMock('Laminas\Mvc\MvcEvent');
 
-        // Zend\Mvc\Application
-        $application = $this->getMockBuilder('Zend\Mvc\Application')
+        // Laminas\Mvc\Application
+        $application = $this->getMockBuilder('Laminas\Mvc\Application')
             ->disableOriginalConstructor()
             ->getMock();
         $status = $this->getMockBuilder('Omeka\Mvc\Status')->disableOriginalConstructor()->getMock();
@@ -53,8 +53,8 @@ protected function getEventForRedirectToInstallation(array $options = [])
             ->method('getApplication')
             ->will($this->returnValue($application));
 
-        // Zend\Mvc\Router\RouteMatch
-        $routeMatch = $this->getMockBuilder('Zend\Router\RouteMatch')
+        // Laminas\Mvc\Router\RouteMatch
+        $routeMatch = $this->getMockBuilder('Laminas\Router\RouteMatch')
             ->disableOriginalConstructor()
             ->getMock();
         $routeMatch->expects($this->any())
@@ -64,8 +64,8 @@ protected function getEventForRedirectToInstallation(array $options = [])
             ->method('getRouteMatch')
             ->will($this->returnValue($routeMatch));
 
-        // Zend\Mvc\Router\RouteStackInterface
-        $router = $this->createMock('Zend\Router\RouteStackInterface');
+        // Laminas\Mvc\Router\RouteStackInterface
+        $router = $this->createMock('Laminas\Router\RouteStackInterface');
         $router->expects($this->any())
             ->method('assemble')
             ->with($this->equalTo([]), $this->equalTo(['name' => 'install']));
@@ -73,12 +73,12 @@ protected function getEventForRedirectToInstallation(array $options = [])
             ->method('getRouter')
             ->will($this->returnValue($router));
 
-        // Zend\Http\PhpEnvironment\Response
-        $headers = $this->createMock('Zend\Http\Headers');
+        // Laminas\Http\PhpEnvironment\Response
+        $headers = $this->createMock('Laminas\Http\Headers');
         $headers->expects($this->any())
             ->method('addHeaderLine')
             ->with($this->equalTo('Location'));
-        $response = $this->createMock('Zend\Http\PhpEnvironment\Response');
+        $response = $this->createMock('Laminas\Http\PhpEnvironment\Response');
         $response->expects($this->any())
             ->method('getHeaders')
             ->will($this->returnValue($headers));
diff --git a/application/test/OmekaTest/Permissions/AclTest.php b/application/test/OmekaTest/Permissions/AclTest.php
index e103504c16..45f45a63bd 100644
--- a/application/test/OmekaTest/Permissions/AclTest.php
+++ b/application/test/OmekaTest/Permissions/AclTest.php
@@ -26,7 +26,7 @@ public function testUserIsAllowedWithNoAuth()
 
     public function testUserIsAllowedWithNoUser()
     {
-        $auth = $this->getMockForAbstractClass('Zend\Authentication\AuthenticationServiceInterface');
+        $auth = $this->getMockForAbstractClass('Laminas\Authentication\AuthenticationServiceInterface');
         $auth->expects($this->any())
              ->method('getIdentity')
              ->will($this->returnValue(null));
@@ -37,11 +37,11 @@ public function testUserIsAllowedWithNoUser()
 
     public function testUserIsAllowedWithUser()
     {
-        $user = $this->getMockForAbstractClass('Zend\Permissions\Acl\Role\RoleInterface');
+        $user = $this->getMockForAbstractClass('Laminas\Permissions\Acl\Role\RoleInterface');
         $user->expects($this->any())
              ->method('getRoleId')
              ->will($this->returnValue('not-guest'));
-        $auth = $this->getMockForAbstractClass('Zend\Authentication\AuthenticationServiceInterface');
+        $auth = $this->getMockForAbstractClass('Laminas\Authentication\AuthenticationServiceInterface');
         $auth->expects($this->any())
              ->method('getIdentity')
              ->will($this->returnValue($user));
@@ -53,7 +53,7 @@ public function testUserIsAllowedWithUser()
 
     public function testSetGetAuthService()
     {
-        $auth = $this->getMockForAbstractClass('Zend\Authentication\AuthenticationServiceInterface');
+        $auth = $this->getMockForAbstractClass('Laminas\Authentication\AuthenticationServiceInterface');
         $this->acl->setAuthenticationService($auth);
         $this->assertSame($auth, $this->acl->getAuthenticationService());
     }
diff --git a/application/test/OmekaTest/Service/ApiAdapterManagerFactoryTest.php b/application/test/OmekaTest/Service/ApiAdapterManagerFactoryTest.php
index b6130d154a..29bab2bcb2 100644
--- a/application/test/OmekaTest/Service/ApiAdapterManagerFactoryTest.php
+++ b/application/test/OmekaTest/Service/ApiAdapterManagerFactoryTest.php
@@ -6,8 +6,8 @@
 use Omeka\Api\ResourceInterface as ApiResourceInterface;
 use Omeka\Service\ApiAdapterManagerFactory;
 use Omeka\Test\TestCase;
-use Zend\EventManager\EventManagerInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class ApiAdapterManagerFactoryTest extends TestCase
 {
@@ -23,7 +23,7 @@ public function testCreatesService()
 
         $serviceManager = $this->getServiceManager([
             'Config' => $config,
-            'EventManager' => $this->getMockForAbstractClass('Zend\EventManager\EventManagerInterface'),
+            'EventManager' => $this->getMockForAbstractClass('Laminas\EventManager\EventManagerInterface'),
         ]);
         $factory = new ApiAdapterManagerFactory;
         $service = $factory($serviceManager, 'Foo');
diff --git a/application/test/OmekaTest/Service/LoggerFactoryTest.php b/application/test/OmekaTest/Service/LoggerFactoryTest.php
index 801e5b2523..818c8470d7 100644
--- a/application/test/OmekaTest/Service/LoggerFactoryTest.php
+++ b/application/test/OmekaTest/Service/LoggerFactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace OmekaTest\Service;
 
-use Zend\Log\Logger;
+use Laminas\Log\Logger;
 use Omeka\Service\LoggerFactory;
 use Omeka\Test\TestCase;
 
@@ -33,7 +33,7 @@ public function testCreatesService()
 
     protected function getMockServiceLocator(array $config)
     {
-        $serviceLocator = $this->createMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $serviceLocator = $this->createMock('Laminas\ServiceManager\ServiceLocatorInterface');
         $serviceLocator->expects($this->once())
             ->method('get')
             ->with($this->equalTo('Config'))
diff --git a/application/test/OmekaTest/View/Helper/AssetUrlTest.php b/application/test/OmekaTest/View/Helper/AssetUrlTest.php
index 92c820f28e..aeeae68a15 100644
--- a/application/test/OmekaTest/View/Helper/AssetUrlTest.php
+++ b/application/test/OmekaTest/View/Helper/AssetUrlTest.php
@@ -10,7 +10,7 @@ class AssetUrlTest extends TestCase
 
     public function setUp()
     {
-        $view = $this->createMock('Zend\View\Renderer\PhpRenderer');
+        $view = $this->createMock('Laminas\View\Renderer\PhpRenderer');
         $this->assetUrl = new AssetUrl(
             'foo-theme',
             ['MyModule' => []],
diff --git a/application/test/OmekaTest/View/Helper/HtmlElementTest.php b/application/test/OmekaTest/View/Helper/HtmlElementTest.php
index fa62b3559f..aaad091784 100644
--- a/application/test/OmekaTest/View/Helper/HtmlElementTest.php
+++ b/application/test/OmekaTest/View/Helper/HtmlElementTest.php
@@ -10,7 +10,7 @@ class HtmlElementTest extends TestCase
 
     public function setUp()
     {
-        $view = $this->createMock('Zend\View\Renderer\PhpRenderer');
+        $view = $this->createMock('Laminas\View\Renderer\PhpRenderer');
         $view->expects($this->any())
             ->method('plugin')
             ->will($this->returnValue('htmlspecialchars'));
diff --git a/application/test/OmekaTest/View/Helper/PageTitleTest.php b/application/test/OmekaTest/View/Helper/PageTitleTest.php
index 0e34b474c5..34a5020937 100644
--- a/application/test/OmekaTest/View/Helper/PageTitleTest.php
+++ b/application/test/OmekaTest/View/Helper/PageTitleTest.php
@@ -12,7 +12,7 @@ public function testPageTitle()
         $subhead = 'Section';
         $action = 'Action';
 
-        $view = $this->getMockBuilder('Zend\View\Renderer\PhpRenderer')
+        $view = $this->getMockBuilder('Laminas\View\Renderer\PhpRenderer')
             ->setMethods(['escapeHtml', 'headTitle'])
             ->getMock();
         $view->expects($this->any())
diff --git a/application/test/OmekaTest/View/Helper/PaginationTest.php b/application/test/OmekaTest/View/Helper/PaginationTest.php
index 2e4d4af19f..377089c1c4 100644
--- a/application/test/OmekaTest/View/Helper/PaginationTest.php
+++ b/application/test/OmekaTest/View/Helper/PaginationTest.php
@@ -18,7 +18,7 @@ public function testToString()
         $query = ['foo' => 'bar'];
 
         // Request
-        $request = $this->getMockBuilder('Zend\Http\PhpEnvironment\Request')
+        $request = $this->getMockBuilder('Laminas\Http\PhpEnvironment\Request')
             ->setMethods(['getQuery', 'toArray'])
             ->getMock();
         $request->expects($this->any())
@@ -59,7 +59,7 @@ public function testToString()
             ->will($this->returnValue($nextPage));
 
         // View
-        $view = $this->getMockBuilder('Zend\View\Renderer\PhpRenderer')
+        $view = $this->getMockBuilder('Laminas\View\Renderer\PhpRenderer')
             ->setMethods(['partial', 'url', 'params'])
             ->getMock();
         $view->expects($this->any())
diff --git a/application/test/OmekaTest/View/Helper/SortLinkTest.php b/application/test/OmekaTest/View/Helper/SortLinkTest.php
index 4c959819ae..2f62dc981e 100644
--- a/application/test/OmekaTest/View/Helper/SortLinkTest.php
+++ b/application/test/OmekaTest/View/Helper/SortLinkTest.php
@@ -11,7 +11,7 @@ public function testInvoke()
         $label = 'test-label';
         $sortBy = 'test-sortBy';
 
-        $view = $this->getMockBuilder('Zend\View\Renderer\PhpRenderer')
+        $view = $this->getMockBuilder('Laminas\View\Renderer\PhpRenderer')
             ->setMethods(['partial', 'url', 'params'])
             ->getMock();
         $view->expects($this->once())
diff --git a/application/test/OmekaTest/View/Helper/_files/Renderer.php b/application/test/OmekaTest/View/Helper/_files/Renderer.php
index 93ebf5efff..2495626c53 100644
--- a/application/test/OmekaTest/View/Helper/_files/Renderer.php
+++ b/application/test/OmekaTest/View/Helper/_files/Renderer.php
@@ -3,7 +3,7 @@
 
 use Omeka\Api\Representation\MediaRepresentation;
 use Omeka\Media\Renderer\RendererInterface;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\View\Renderer\PhpRenderer;
 
 class Renderer implements RendererInterface
 {
diff --git a/application/test/OmekaTest/View/Renderer/ApiJsonRendererTest.php b/application/test/OmekaTest/View/Renderer/ApiJsonRendererTest.php
index d6c0c3d0f3..34c46ba656 100644
--- a/application/test/OmekaTest/View/Renderer/ApiJsonRendererTest.php
+++ b/application/test/OmekaTest/View/Renderer/ApiJsonRendererTest.php
@@ -3,7 +3,7 @@
 
 use Omeka\Api\Exception\ValidationException;
 use Omeka\View\Renderer\ApiJsonRenderer;
-use Zend\Json\Json;
+use Laminas\Json\Json;
 use Omeka\Stdlib\ErrorStore;
 use Omeka\Test\TestCase;
 
diff --git a/application/test/OmekaTest/View/Strategy/ApiJsonStrategyTest.php b/application/test/OmekaTest/View/Strategy/ApiJsonStrategyTest.php
index 0cb2357581..24144252c0 100644
--- a/application/test/OmekaTest/View/Strategy/ApiJsonStrategyTest.php
+++ b/application/test/OmekaTest/View/Strategy/ApiJsonStrategyTest.php
@@ -4,8 +4,8 @@
 use Omeka\Api\Exception;
 use Omeka\Mvc\Exception as MvcException;
 use Omeka\View\Strategy\ApiJsonStrategy;
-use Zend\Http\Response as HttpResponse;
-use Zend\View\ViewEvent;
+use Laminas\Http\Response as HttpResponse;
+use Laminas\View\ViewEvent;
 use Omeka\Test\TestCase;
 
 class ApiJsonStrategyTest extends TestCase
@@ -37,7 +37,7 @@ public function testStrategyPicksRendererForApiJsonModel()
 
     public function testStrategyDoesNothingForOtherModels()
     {
-        $model = $this->createMock('Zend\View\Model\JsonModel');
+        $model = $this->createMock('Laminas\View\Model\JsonModel');
         $model->expects($this->never())
               ->method('getOption');
 
diff --git a/application/view/common/advanced-search.phtml b/application/view/common/advanced-search.phtml
index 39ce0774da..cd2e64dc82 100644
--- a/application/view/common/advanced-search.phtml
+++ b/application/view/common/advanced-search.phtml
@@ -4,6 +4,7 @@ $this->headScript()->appendFile($this->assetUrl('js/advanced-search.js', 'Omeka'
 
 $query = isset($query) ? $query : null;
 $resourceType = isset($resourceType) ? $resourceType : null;
+$isPool = isset($isPool) ? $isPool : null;
 
 $partials = [
     'common/advanced-search/fulltext',
@@ -13,11 +14,19 @@ $partials = [
 if ($this->status()->isAdminRequest()) {
     $partials[] = 'common/advanced-search/resource-template';
 }
-if ('item' === $resourceType) {
-    $partials[] = 'common/advanced-search/item-sets';
+switch ($resourceType) {
+    case 'item':
+        $partials[] = 'common/advanced-search/item-sets';
+        if ($this->status()->isAdminRequest() && !$isPool) {
+            $partials[] = 'common/advanced-search/site';
+        }
+        break;
+    case 'media':
+        $partials[] = 'common/advanced-search/media-type';
+        break;
 }
-if ($this->status()->isAdminRequest() && 'item' === $resourceType) {
-    $partials[] = 'common/advanced-search/site-pool';
+if ($this->status()->isAdminRequest()) {
+    $partials[] = 'common/advanced-search/owner';
 }
 if ($this->status()->isSiteRequest()) {
     $partials[] = 'common/advanced-search/resource-template-restrict';
diff --git a/application/view/common/advanced-search/media-type.phtml b/application/view/common/advanced-search/media-type.phtml
new file mode 100644
index 0000000000..03bf9b2526
--- /dev/null
+++ b/application/view/common/advanced-search/media-type.phtml
@@ -0,0 +1,11 @@
+<?php
+$value = isset($query['media_type']) ? $query['media_type'] : null;
+?>
+<div class="field">
+    <div class="field-meta">
+        <label for="fulltext_search"><?php echo $this->translate('Search by MIME type'); ?></label>
+    </div>
+    <div class="inputs">
+        <input type="text" name="media_type" id="media_type" value="<?php echo $this->escapeHtml($value); ?>">
+    </div>
+</div>
diff --git a/application/view/common/advanced-search/owner.phtml b/application/view/common/advanced-search/owner.phtml
new file mode 100644
index 0000000000..52ee33e923
--- /dev/null
+++ b/application/view/common/advanced-search/owner.phtml
@@ -0,0 +1,19 @@
+<div class="field">
+    <div class="field-meta">
+        <label for="owner_id"><?php echo $this->translate('Search by owner'); ?></label>
+        <?php echo $this->hyperlink('', '#', ['class' => 'expand', 'title' => $this->translate('Expand')]); ?>
+        <div class="collapsible">
+            <div class="field-description"><?php echo $this->translate('Searches for resources that are owned by this user.'); ?></div>
+        </div>
+    </div>
+    <div class="inputs">
+        <?php echo $this->userSelect([
+            'name' => 'owner_id',
+            'attributes' => [
+                'id' => 'owner_id',
+                'value' => $query['owner_id'] ?? null,
+            ]
+        ]); ?>
+    </div>
+</div>
+
diff --git a/application/view/common/advanced-search/resource-class.phtml b/application/view/common/advanced-search/resource-class.phtml
index 7ed35a53af..64a126b27a 100644
--- a/application/view/common/advanced-search/resource-class.phtml
+++ b/application/view/common/advanced-search/resource-class.phtml
@@ -15,7 +15,7 @@ if (!$ids) {
         <span id="by-resource-class-label" class="label"><?php echo $translate('Search by class'); ?></span>
         <?php echo $this->hyperlink('', '#', ['class' => 'expand', 'title' => $translate('Expand')]); ?>
         <div class="collapsible">
-            <div class="field-description"><?php echo $translate('Searches for items that are any of these classes.'); ?></div>
+            <div class="field-description"><?php echo $translate('Searches for resources that are any of these classes.'); ?></div>
         </div>
     </div>
     <div class="inputs">
diff --git a/application/view/common/advanced-search/resource-template.phtml b/application/view/common/advanced-search/resource-template.phtml
index a48fbe381b..56a8458786 100644
--- a/application/view/common/advanced-search/resource-template.phtml
+++ b/application/view/common/advanced-search/resource-template.phtml
@@ -16,7 +16,7 @@ if (!$ids) {
         <span id="by-resource-template-label" class="label"><?php echo $translate('Search by template'); ?></span>
         <?php echo $this->hyperlink('', '#', ['class' => 'expand', 'title' => $translate('Expand')]); ?>
         <div class="collapsible">
-            <div class="field-description"><?php echo $translate('Searches for items that use any of these templates.'); ?></div>
+            <div class="field-description"><?php echo $translate('Searches for resources that use any of these templates.'); ?></div>
         </div>
     </div>
     <div class="inputs">
diff --git a/application/view/common/advanced-search/site-pool.phtml b/application/view/common/advanced-search/site-pool.phtml
deleted file mode 100644
index 2a1450e118..0000000000
--- a/application/view/common/advanced-search/site-pool.phtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$translate = $this->plugin('translate');
-// Prepare the site query.
-if (isset($query['site_id'])) {
-    $siteId = $query['site_id'] ;
-} else {
-    $siteId = null;
-}
-?>
-<div class="field">
-    <div class="field-meta">
-        <label for="site_id"><?php echo $translate('In site pool'); ?></label>
-    </div>
-    <div class="inputs">
-        <?php echo $this->siteSelect([
-            'name' => 'site_id',
-            'attributes' => ['id' => 'site_id', 'value' => $siteId]
-        ]); ?>
-    </div>
-</div>
diff --git a/application/view/common/advanced-search/site.phtml b/application/view/common/advanced-search/site.phtml
new file mode 100644
index 0000000000..009090494e
--- /dev/null
+++ b/application/view/common/advanced-search/site.phtml
@@ -0,0 +1,18 @@
+<div class="field">
+    <div class="field-meta">
+        <label for="site_id"><?php echo $this->translate('Search by site'); ?></label>
+        <?php echo $this->hyperlink('', '#', ['class' => 'expand', 'title' => $this->translate('Expand')]); ?>
+        <div class="collapsible">
+            <div class="field-description"><?php echo $this->translate('Searches for items that are assigned to this site.'); ?></div>
+        </div>
+    </div>
+    <div class="inputs">
+        <?php echo $this->siteSelect([
+            'name' => 'site_id',
+            'attributes' => [
+                'id' => 'site_id',
+                'value' => $query['site_id'] ?? null,
+            ]
+        ]); ?>
+    </div>
+</div>
diff --git a/application/view/common/data-type-wrapper.phtml b/application/view/common/data-type-wrapper.phtml
index 09a803a6a6..3320365fe5 100644
--- a/application/view/common/data-type-wrapper.phtml
+++ b/application/view/common/data-type-wrapper.phtml
@@ -3,8 +3,6 @@ $translate = $this->plugin('translate');
 $escape = $this->plugin('escapeHtml');
 ?>
 <div class="template value" data-data-type="<?php echo $escape($this->dataType); ?>" role="group">
-    <input type="hidden" class="property">
-    <input type="hidden" class="type">
     <div class="input-body"><?php echo $this->dataType()->getTemplate($dataType); ?></div>
     <div class="input-footer">
         <span class="restore-value"><?php echo $translate('Value to be removed'); ?></span>
diff --git a/application/view/common/item-set-selector.phtml b/application/view/common/item-set-selector.phtml
index 27e1ed9492..a0c86b8dfc 100644
--- a/application/view/common/item-set-selector.phtml
+++ b/application/view/common/item-set-selector.phtml
@@ -4,39 +4,44 @@ $escape = $this->plugin('escapeHtml');
 ?>
 <div id="item-set-selector" class='selector sidebar active'>
     <a href="#" class="mobile-only sidebar-close o-icon-close"><span class="screen-reader-text"><?php echo $translate('Close'); ?></span></a>
-    <h3><?php echo $translate('Click on an item set to add it to the edit panel.'); ?></h3>
-    <input type="text" class="selector-filter" placeholder=" <?php echo $escape($translate('Filter item sets')); ?>">
-    <ul>
-        <li class="total-count-heading"><?php echo $translate('All item sets'); ?> (<span class="selector-total-count"><?php echo $totalItemSetCount; ?></span>)
-            <ul class="selectable-list">
-                <?php foreach ($itemSetOwners as $email => $itemSetOwner): ?>
-                <?php
-                if ($itemSetOwner['owner']) {
-                    $ownerText = $escape($itemSetOwner['owner']->name());
-                } else {
-                    $ownerText = $translate('[no owner]');
-                }
-                $itemSets = $itemSetOwner['item_sets'];
-                ?>
-                <li class='selector-parent'>
-                    <span><?php echo $ownerText; ?></span> (<span class="selector-child-count"><?php echo count($itemSets); ?></span>)
-                    <ul>
-                        <?php foreach ($itemSets as $itemSet): ?>
-                        <li class='selector-child'
-                            data-child-search="<?php echo $escape($itemSet->displayTitle()); ?>"
-                            data-item-set-id="<?php echo $escape($itemSet->id()); ?>"
-                            data-owner-email="<?php echo $escape($email); ?>">
-                            <div class="description">
-                                <p class="o-icon-info"><span class="screen-reader-text"><?php echo $translate('More info'); ?></span></p>
-                                <p class="field-comment"><?php echo $escape($itemSet->displayDescription()); ?></p>
-                            </div>
-                            <span><?php echo $escape($itemSet->displayTitle()); ?></span>
-                        </li>
-                        <?php endforeach; ?>
-                    </ul>
-                </li>
-                <?php endforeach; ?>
-            </ul>
-        </li>
-    </ul>
+    <div class="resources-available">
+        <h3><?php echo $translate('Click on an item set to add it to the edit panel.'); ?></h3>
+        <input type="text" class="selector-filter" placeholder=" <?php echo $escape($translate('Filter item sets')); ?>">
+        <ul>
+            <li class="total-count-heading"><?php echo $translate('Item sets'); ?> (<span class="selector-total-count"><?php echo $totalItemSetCount; ?></span>)
+                <ul class="selectable-list">
+                    <?php foreach ($itemSetOwners as $email => $itemSetOwner): ?>
+                    <?php
+                    if ($itemSetOwner['owner']) {
+                        $ownerText = $escape($itemSetOwner['owner']->name());
+                    } else {
+                        $ownerText = $translate('[no owner]');
+                    }
+                    $itemSets = $itemSetOwner['item_sets'];
+                    ?>
+                    <li class='selector-parent'>
+                        <span><?php echo $ownerText; ?></span> (<span class="selector-child-count"><?php echo count($itemSets); ?></span>)
+                        <ul>
+                            <?php foreach ($itemSets as $itemSet): ?>
+                            <li class='selector-child'
+                                data-child-search="<?php echo $escape($itemSet->displayTitle()); ?>"
+                                data-resource-id="<?php echo $escape($itemSet->id()); ?>"
+                                data-owner-email="<?php echo $escape($email); ?>">
+                                <div class="description">
+                                    <p class="o-icon-info"><span class="screen-reader-text"><?php echo $translate('More info'); ?></span></p>
+                                    <p class="field-comment"><?php echo $escape($itemSet->displayDescription()); ?></p>
+                                </div>
+                                <span><?php echo $escape($itemSet->displayTitle()); ?></span>
+                            </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </li>
+                    <?php endforeach; ?>
+                </ul>
+            </li>
+        </ul>
+    </div>
+    <div class="resources-unavailable">
+        <p><?php echo sprintf('All %s have been added.', 'item sets'); ?></p>
+    </div>
 </div>
diff --git a/application/view/common/pagination.phtml b/application/view/common/pagination.phtml
index ed952b72ce..cdd7d9b809 100644
--- a/application/view/common/pagination.phtml
+++ b/application/view/common/pagination.phtml
@@ -25,7 +25,7 @@ $translate = $this->plugin('translate');
     $from = $offset + 1;
     $to = ($currentPage < $pageCount) ? $offset + $perPage : $totalCount;
     ?>
-    <span class="row-count"><?php echo sprintf($translate('%s–%s of %s'), $from, $to, $totalCount); ?></span>
+    <span class="row-count"><?php echo sprintf($translate('%1$s–%2$s of %3$s'), $from, $to, $totalCount); ?></span>
 <?php else: ?>
     <?php echo $translate('0 results'); ?>
 <?php endif; ?>
diff --git a/application/view/common/resource-fields.phtml b/application/view/common/resource-fields.phtml
index 993bdffe30..869e7f780d 100644
--- a/application/view/common/resource-fields.phtml
+++ b/application/view/common/resource-fields.phtml
@@ -29,6 +29,7 @@ if (isset($resource)) {
         <?php echo $this->formRow($resourceClassSelect); ?>
     </div>
     <div id="properties"></div>
+    <input type="hidden" name="values_json" id="values-json">
     <?php echo $this->propertySelector(); ?>
     <button id="property-selector-button" class="mobile-only" data-watch-target="#properties"><?php echo $translate('Add property'); ?></button>
     <?php echo $this->partial('common/resource-select-sidebar'); ?>
diff --git a/application/view/common/search-form.phtml b/application/view/common/search-form.phtml
index 0319835780..99195e137e 100644
--- a/application/view/common/search-form.phtml
+++ b/application/view/common/search-form.phtml
@@ -4,6 +4,8 @@ $searchValue = $this->escapeHtml($this->params()->fromQuery('fulltext_search', '
 ?>
 
 <form action="<?php echo $this->escapeHtml($this->url('site/resource', ['controller' => 'index','action' => 'search'], true)); ?>" id="search-form">
-    <input type="text" name="fulltext_search" value="<?php echo $searchValue; ?>" placeholder="<?php echo $translate('Search'); ?>">
+    <input type="text" name="fulltext_search" value="<?php echo $searchValue; ?>"
+        placeholder="<?php echo $translate('Search'); ?>"
+        aria-label="<?php echo $translate('Search'); ?>">
     <button type="submit"><?php echo $translate('Search'); ?></button>
 </form>
diff --git a/application/view/common/site-selector.phtml b/application/view/common/site-selector.phtml
new file mode 100644
index 0000000000..dacb08abc0
--- /dev/null
+++ b/application/view/common/site-selector.phtml
@@ -0,0 +1,36 @@
+<div id="site-selector" class='selector sidebar active'>
+    <a href="#" class="mobile-only sidebar-close o-icon-close"><span class="screen-reader-text"><?php echo $this->translate('Close'); ?></span></a>
+    <div class="resources-available">
+    <h3><?php echo $this->translate('Click on a site to add it to the edit panel.'); ?></h3>
+    <input type="text" class="selector-filter" placeholder="<?php echo $this->escapeHtml($this->translate('Filter sites')); ?>">
+    <ul>
+        <li class="total-count-heading"><?php echo $this->translate('Sites'); ?> (<span class="selector-total-count"><?php echo $totalCount; ?></span>)
+            <ul class="selectable-list">
+                <?php foreach ($sitesByOwner as $email => $siteByOwner): ?>
+                <?php $ownerText = $siteByOwner['owner'] ? $this->escapeHtml($siteByOwner['owner']->name()) : $this->translate('[no owner]'); ?>
+                <li class='selector-parent'>
+                    <span><?php echo $ownerText; ?></span> (<span class="selector-child-count"><?php echo count($siteByOwner['sites']); ?></span>)
+                    <ul>
+                        <?php foreach ($siteByOwner['sites'] as $site): ?>
+                        <li class='selector-child'
+                            data-child-search="<?php echo $this->escapeHtml($site->title()); ?>"
+                            data-resource-id="<?php echo $this->escapeHtml($site->id()); ?>"
+                            data-resource-email="<?php echo $this->escapeHtml($email); ?>">
+                            <div class="description">
+                                <p class="o-icon-info"><span class="screen-reader-text"><?php echo $this->translate('More info'); ?></span></p>
+                                <p class="field-comment"><?php echo $this->escapeHtml($site->summary()); ?></p>
+                            </div>
+                            <span><?php echo $this->escapeHtml($site->title()); ?></span>
+                        </li>
+                        <?php endforeach; ?>
+                    </ul>
+                </li>
+                <?php endforeach; ?>
+            </ul>
+        </li>
+    </ul>
+    </div>
+    <div class="resources-unavailable">
+        <p><?php echo sprintf('All %s have been added.', 'sites'); ?></p>
+    </div>    
+</div>
diff --git a/application/view/common/user-selector.phtml b/application/view/common/user-selector.phtml
index 1f92513b67..ba352cf332 100644
--- a/application/view/common/user-selector.phtml
+++ b/application/view/common/user-selector.phtml
@@ -3,6 +3,7 @@ $translate = $this->plugin('translate');
 ?>
 <div id="user-selector" class="selector sidebar<?php echo $alwaysOpen ? ' always-open' : ''; ?>">
     <a href="#" class="mobile-only sidebar-close o-icon-close"><span class="screen-reader-text"><?php echo $translate('Close'); ?></span></a>
+    <div class="resources-available">
     <h3>
         <?php if ($title): ?>
         <?php echo $title; ?>
@@ -12,7 +13,7 @@ $translate = $this->plugin('translate');
     </h3>
     <input type="text" class="selector-filter" placeholder="<?php echo $translate('Filter users'); ?>" aria-label="<?php echo $translate('Filter users'); ?>">
     <ul id="new-users">
-        <li class="total-count-heading"><?php echo sprintf($translate('All users (%s)'), count($users)); ?></li>
+        <li class="total-count-heading"><?php echo sprintf($translate('Users (%s)'), '<span class="selector-total-count">' . count($users) . '</span>'); ?></li>
             <ul class="selectable-list">
             <?php foreach ($usersByInitial as $initial => $users): ?>
                 <li class="selector-parent">
@@ -21,11 +22,10 @@ $translate = $this->plugin('translate');
                     <ul>
                     <?php foreach ($users as $user): ?>
                         <li class="selector-child"
-                            data-child-search="<?php echo sprintf('%s %s', $this->escapeHtml($user->name()), $this->escapeHtml($user->email())); ?>"
+                            data-child-search="<?php echo sprintf('%s (%s)', $this->escapeHtml($user->name()), $this->escapeHtml($user->email())) ?>"
                             data-user="<?php echo $this->escapeHtml(json_encode($user, true)); ?>"
-                            data-user-id="<?php echo $user->id(); ?>">
-                            <span><?php echo $this->escapeHtml($user->name()); ?>
-                            <br><?php echo $this->escapeHtml($user->email()); ?></span>
+                            data-resource-id="<?php echo $user->id(); ?>">
+                            <span class="user-name"><?php echo $this->escapeHtml($user->name()); ?> (<?php echo $this->escapeHtml($user->email()); ?>)</span>
                         </li>
                     <?php endforeach; ?>
                     </ul>
@@ -34,4 +34,8 @@ $translate = $this->plugin('translate');
             </ul>
         </li>
     </ul>
+    </div>
+    <div class="resources-unavailable">
+        <p><?php echo sprintf('All %s have been added.', 'users'); ?></p>
+    </div>
 </div>
diff --git a/application/view/layout/layout-admin.phtml b/application/view/layout/layout-admin.phtml
index 0647909c9b..13d565d8f8 100644
--- a/application/view/layout/layout-admin.phtml
+++ b/application/view/layout/layout-admin.phtml
@@ -18,10 +18,10 @@ $this->headScript()->prependFile($this->assetUrl('vendor/jquery/jquery.min.js',
 $this->jsTranslate();
 
 $escape = $this->plugin('escapeHtml');
-$siteNav = (string) $this->navigation('Zend\Navigation\AdminSite')->menu();
+$siteNav = (string) $this->navigation('Laminas\Navigation\AdminSite')->menu();
 $globalNav =
-    '<h5>' . $translate('Resources') . '</h5>' . $this->navigation('Zend\Navigation\AdminResource')->menu() .
-    '<h5>' . $translate('Admin') . '</h5>' . $this->navigation('Zend\Navigation\AdminGlobal')->menu();
+    '<h5>' . $translate('Resources') . '</h5>' . $this->navigation('Laminas\Navigation\AdminResource')->menu() .
+    '<h5>' . $translate('Admin') . '</h5>' . $this->navigation('Laminas\Navigation\AdminGlobal')->menu();
 $this->trigger('view.layout');
 ?>
 <?php echo $this->doctype(); ?>
@@ -89,9 +89,9 @@ $this->trigger('view.layout');
                     </nav>
                     <?php endif; ?>
                     <?php echo $globalNav; ?>
-                    <?php if ($this->navigation('Zend\Navigation\AdminModule')->count() > 0): ?>
+                    <?php if ($this->navigation('Laminas\Navigation\AdminModule')->count() > 0): ?>
                     <h5><?php echo $translate('Modules'); ?></h5>
-                    <?php echo $this->navigation('Zend\Navigation\AdminModule')->menu(); ?>
+                    <?php echo $this->navigation('Laminas\Navigation\AdminModule')->menu(); ?>
                     <?php endif; ?>
                 </nav>
             </header>
diff --git a/application/view/omeka/admin/item-set/browse.phtml b/application/view/omeka/admin/item-set/browse.phtml
index 9c0227c3c4..c8c50f0bef 100644
--- a/application/view/omeka/admin/item-set/browse.phtml
+++ b/application/view/omeka/admin/item-set/browse.phtml
@@ -157,7 +157,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete item sets'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete the selected item sets?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s item sets and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s item sets and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 '<strong><span id="delete-selected-count"></span></strong>'
             ); ?></p>
@@ -175,7 +175,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete item sets'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete all item sets on all pages of this result?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s item sets and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s item sets and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 sprintf('<strong>%s</strong>', number_format($this->pagination()->getPaginator()->getTotalCount()))
             ); ?></p>
diff --git a/application/view/omeka/admin/item/browse.phtml b/application/view/omeka/admin/item/browse.phtml
index 463a735209..6ab3c00d96 100644
--- a/application/view/omeka/admin/item/browse.phtml
+++ b/application/view/omeka/admin/item/browse.phtml
@@ -155,7 +155,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete items'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete the selected items?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s items and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s items and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 '<strong><span id="delete-selected-count"></span></strong>'
             ); ?></p>
@@ -173,7 +173,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete items'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete all items on all pages of this result?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s items and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s items and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 sprintf('<strong>%s</strong>', number_format($this->pagination()->getPaginator()->getTotalCount()))
             ); ?></p>
diff --git a/application/view/omeka/admin/item/form.phtml b/application/view/omeka/admin/item/form.phtml
index 54ea39c10b..5481e27851 100644
--- a/application/view/omeka/admin/item/form.phtml
+++ b/application/view/omeka/admin/item/form.phtml
@@ -13,6 +13,7 @@ $form->prepare();
     'resource-values' => $translate('Values'),
     'item-media' => $translate('Media'),
     'item-sets' => $translate('Item sets'),
+    'sites' => $translate('Sites'),
     'thumbnail' => $translate('Thumbnail'),
 ], $sectionNavEvent); ?>
 
@@ -36,6 +37,12 @@ $form->prepare();
     ]); ?>
 </fieldset>
 
+<fieldset id="sites" class="section" aria-labelledby="sites-label">
+    <?php echo $this->partial('omeka/admin/item/manage-sites', [
+        'item' => $item,
+    ]); ?>
+</fieldset>
+
 <div id="page-actions">
     <?php if ($item && $item->isPublic() || (!isset($item)) && !$this->setting('default_to_private')) : ?>
     <?php echo $this->hyperlink('', '#', [
diff --git a/application/view/omeka/admin/item/manage-item-sets.phtml b/application/view/omeka/admin/item/manage-item-sets.phtml
index 005bfe493d..22ed355e08 100644
--- a/application/view/omeka/admin/item/manage-item-sets.phtml
+++ b/application/view/omeka/admin/item/manage-item-sets.phtml
@@ -1,9 +1,33 @@
 <?php
 $translate = $this->plugin('translate');
 $escape = $this->plugin('escapeHtml');
-$this->headScript()->appendFile($this->assetUrl('js/item-manage-item-sets.js', 'Omeka'));
+$itemSetRepresentations = $item ? $item->itemSets() : [];
+$itemSets = [];
+foreach ($itemSetRepresentations as $itemSet) {
+    $owner = $itemSet->owner();
+    $itemSets[] = [
+        'id' => $itemSet->id(),
+        'title' => $itemSet->title(),
+        'email' => $owner ? $owner->email() : null,
+    ];
+}
+$itemSetTemplate = '
+<tr class="resource-row">
+    <td class="data-value" data-row-key="child-search"></td>
+    <td class="data-value" data-row-key="owner-email"></td>
+    <td><ul class="actions">
+        <li>' . $this->hyperlink('', '#', [
+            'class' => 'o-icon-delete',
+            'title' => $translate('Remove item set'),
+        ]) . '</li>
+    </ul><input type="hidden" class="resource-id" name="o:item_set[]"></td>
+</tr>';
 ?>
-<table id="item-item-sets" data-tablesaw-mode="stack" class="tablesaw tablesaw-stack <?php echo ($item && $item->itemSets()) ? '' : 'empty'; ?>">
+<table id="item-item-sets" 
+  data-tablesaw-mode="stack"
+  data-existing-rows="<?php echo $this->escapeHtml(json_encode($itemSets)); ?>"
+  data-row-template="<?php echo $this->escapeHtml($itemSetTemplate); ?>"
+  class="selector-table tablesaw tablesaw-stack <?php echo ($item && (count($itemSets) > 0)) ? '' : 'empty'; ?>">
     <thead>
     <tr>
         <th><?php echo $translate('Title'); ?></th>
@@ -11,29 +35,7 @@ $this->headScript()->appendFile($this->assetUrl('js/item-manage-item-sets.js', '
         <th></th>
     </tr>
     </thead>
-    <tbody>
-    <?php if ($item && $item->itemSets()): ?>
-    <?php foreach ($item->itemSets() as $itemSet): ?>
-    <?php
-    if ($owner = $itemSet->owner()) {
-        $ownerText = $escape($itemSet->owner()->name());
-    } else {
-        $ownerText = $translate('[no owner]');
-    }
-    ?>
-    <tr>
-        <td><?php echo $escape($itemSet->displayTitle()); ?></td>
-        <td><?php echo $ownerText; ?></td>
-        <td><ul class="actions">
-            <li><?php echo $this->hyperlink('', '#', [
-                'class' => 'o-icon-delete',
-                'title' => $translate('Remove item set'),
-            ]); ?></li>
-        </ul><input type="hidden" name="o:item_set[]" value="<?php echo $escape($itemSet->id()) ?>"></td>
-    </tr>
-    <?php endforeach; ?>
-    <?php endif; ?>
-    </tbody>
+    <tbody class="resource-rows"></tbody>
 </table>
 
 <div class="no-resources">
@@ -42,19 +44,8 @@ $this->headScript()->appendFile($this->assetUrl('js/item-manage-item-sets.js', '
 
 <button id="item-set-selector-button" class="mobile-only"><?php echo $translate('Add to item set'); ?></button>
 
-<?php
-$itemSetTemplate = '
-<tr>
-    <td class="item-set-title"></td>
-    <td class="owner-email">__owner-email__</td>
-    <td><ul class="actions">
-        <li>' . $this->hyperlink('', '#', [
-            'class' => 'o-icon-delete',
-            'title' => $translate('Remove item set'),
-        ]) . '</li>
-    </ul><input type="hidden" name="o:item_set[]"></td>
-</tr>';
-?>
-<span id="item-set-template" data-template="<?php echo $escape($itemSetTemplate); ?>"></span>
-
 <?php echo $this->itemSetSelector(); ?>
+
+<script>
+  Omeka.initializeSelector('#item-item-sets', '#item-set-selector');
+</script>
diff --git a/application/view/omeka/admin/item/manage-sites.phtml b/application/view/omeka/admin/item/manage-sites.phtml
new file mode 100644
index 0000000000..8d0ca847dd
--- /dev/null
+++ b/application/view/omeka/admin/item/manage-sites.phtml
@@ -0,0 +1,47 @@
+<?php
+$siteRepresentations = $item
+    ? $item->sites()
+    : $this->api()->search('sites', ['assign_new_items' => true])->getContent();
+$sites = [];
+foreach ($siteRepresentations as $siteRepresentation) {
+  $sites[] = [
+    'id' => $siteRepresentation->id(),
+    'title' => $siteRepresentation->title(),
+    'email' => $siteRepresentation->owner(),
+  ];
+}
+
+$siteTemplate = '
+<tr class="resource-row">
+    <td class="data-value" data-row-key="child-search"></td>
+    <td class="data-value" data-row-key="resource-email"></td>
+    <td>
+        <ul class="actions">
+            <li>' . $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $this->translate('Unassign from site')]) . '</li>
+        </ul>
+        <input type="hidden" name="o:site[]" class="resource-id">
+    </td>
+</tr>';
+?>
+<table id="item-sites" data-existing-rows="<?php echo $this->escapeHtml(json_encode($sites)); ?>" data-row-template="<?php echo $this->escapeHtml($siteTemplate); ?>" data-tablesaw-mode="stack" class="selector-table tablesaw tablesaw-stack <?php echo ($item && (count($sites) > 0)) ? '' : 'empty'; ?>">
+    <thead>
+    <tr>
+        <th><?php echo $this->translate('Title'); ?></th>
+        <th><?php echo $this->translate('Owner'); ?></th>
+        <th></th>
+    </tr>
+    </thead>
+    <tbody class="resource-rows"></tbody>
+</table>
+
+<div class="no-resources">
+    <p><?php echo $this->translate('This item is part of no sites. Add it to a site using the interface to the right.'); ?></p>
+</div>
+
+<button id="site-selector-button" class="mobile-only"><?php echo $this->translate('Assign to site'); ?></button>
+
+<?php echo $this->siteSelector(); ?>
+
+<script>
+  Omeka.initializeSelector('#item-sites', '#site-selector');
+</script>
\ No newline at end of file
diff --git a/application/view/omeka/admin/item/show-details.phtml b/application/view/omeka/admin/item/show-details.phtml
index 687603dcb1..5221142c3c 100644
--- a/application/view/omeka/admin/item/show-details.phtml
+++ b/application/view/omeka/admin/item/show-details.phtml
@@ -22,6 +22,15 @@ $escape = $this->plugin('escapeHtml');
         <?php endforeach; ?>
     </div>
     <?php endif; ?>
+    <?php $sites = $resource->sites(); ?>
+    <?php if ($sites): ?>
+    <div class="meta-group">
+        <h4><?php echo $translate('Sites'); ?></h4>
+        <?php foreach ($sites as $site): ?>
+        <div class="value sites"><?php echo $site->link($site->title()); ?></div>
+        <?php endforeach; ?>
+    </div>
+    <?php endif; ?>
     <?php if ($resource->media()): ?>
     <div class="meta-group">
         <h4><?php echo $translate('Media'); ?></h4>
diff --git a/application/view/omeka/admin/item/show.phtml b/application/view/omeka/admin/item/show.phtml
index 563e54798f..f35d96ef8c 100644
--- a/application/view/omeka/admin/item/show.phtml
+++ b/application/view/omeka/admin/item/show.phtml
@@ -66,6 +66,15 @@ $itemMedia = $item->media();
         <?php endforeach; ?>
     </div>
     <?php endif; ?>
+    <?php $sites = $item->sites(); ?>
+    <?php if (count($sites) > 0): ?>
+    <div class="meta-group">
+        <h4><?php echo $translate('Sites'); ?></h4>
+        <?php foreach ($sites as $site): ?>
+        <div class="value item-sets"><?php echo $site->link($site->title()); ?></div>
+        <?php endforeach; ?>
+    </div>
+    <?php endif; ?>
     <div class="meta-group">
         <h4><?php echo $translate('Created'); ?></h4>
         <div class="value"><?php echo $escape($this->i18n()->dateFormat($item->created())); ?></div>
diff --git a/application/view/omeka/admin/job/browse.phtml b/application/view/omeka/admin/job/browse.phtml
index fb920e067c..93c39cd8fb 100644
--- a/application/view/omeka/admin/job/browse.phtml
+++ b/application/view/omeka/admin/job/browse.phtml
@@ -24,13 +24,13 @@ $sortHeadings = [
 
 <?php echo $this->pageTitle($translate('Jobs')); ?>
 
-<?php if (count($jobs)): ?>
-
 <div class="browse-controls">
     <?php echo $this->pagination(); ?>
     <?php echo $this->sortSelector($sortHeadings); ?>
 </div>
 <?php $this->trigger('view.browse.before'); ?>
+
+<?php if (count($jobs)): ?>
 <table class="tablesaw" data-tablesaw-mode="stack">
     <thead>
         <tr>
diff --git a/application/view/omeka/admin/media/browse.phtml b/application/view/omeka/admin/media/browse.phtml
index 813fac708b..4cc52c2a38 100644
--- a/application/view/omeka/admin/media/browse.phtml
+++ b/application/view/omeka/admin/media/browse.phtml
@@ -167,7 +167,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete medias'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete the selected medias?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s medias and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s medias and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 '<strong><span id="delete-selected-count"></span></strong>'
             ); ?></p>
@@ -185,7 +185,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete medias'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete all medias on all pages of this result?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s medias and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s medias and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 sprintf('<strong>%s</strong>', number_format($this->pagination()->getPaginator()->getTotalCount()))
             ); ?></p>
diff --git a/application/view/omeka/admin/media/edit.phtml b/application/view/omeka/admin/media/edit.phtml
index 311a72c22a..0ed766db1b 100644
--- a/application/view/omeka/admin/media/edit.phtml
+++ b/application/view/omeka/admin/media/edit.phtml
@@ -23,7 +23,7 @@ var valuesJson = <?php echo json_encode($media->values()); ?>;
 
 <?php echo $this->pageTitle($media->displayTitle(), 1, $translate('Media')); ?>
 <?php $this->trigger('view.edit.before'); ?>
-<form method='post' id='edit-media'>
+<?php echo $this->form()->openTag($form); ?>
 
 <?php echo $this->sectionNav($sectionNavs, 'view.edit.section_nav'); ?>
 <?php $this->trigger('view.edit.form.before', ['form' => $form]); ?>
diff --git a/application/view/omeka/admin/resource-template/browse.phtml b/application/view/omeka/admin/resource-template/browse.phtml
index 83b126a3fa..c466a54ea1 100644
--- a/application/view/omeka/admin/resource-template/browse.phtml
+++ b/application/view/omeka/admin/resource-template/browse.phtml
@@ -31,12 +31,13 @@ $sortHeadings = [
     <?php endif; ?>
 </div>
 
-<?php if (count($resourceTemplates)): ?>
 <div class="browse-controls">
     <?php echo $this->pagination(); ?>
     <?php echo $this->sortSelector($sortHeadings); ?>
 </div>
 <?php $this->trigger('view.browse.before'); ?>
+
+<?php if (count($resourceTemplates)): ?>
 <table class="tablesaw" data-tablesaw-mode="stack">
     <thead>
         <tr>
diff --git a/application/view/omeka/admin/user/browse.phtml b/application/view/omeka/admin/user/browse.phtml
index 49ff63493b..d8d6ac6a1d 100644
--- a/application/view/omeka/admin/user/browse.phtml
+++ b/application/view/omeka/admin/user/browse.phtml
@@ -148,7 +148,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete users'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete the selected users?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s users and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s users and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 '<strong><span id="delete-selected-count"></span></strong>'
             ); ?></p>
@@ -166,7 +166,7 @@ $sortHeadings = [
             <h3><?php echo $translate('Delete users'); ?></h3>
             <p><?php echo $translate('Are you sure you would like to delete all users (except yourself) on all pages of this result?'); ?></p>
             <p class="error"><?php echo sprintf(
-                $translate('%s: this action will permanently delete %s users (except yourself) and cannot be undone.'),
+                $translate('%1$s: this action will permanently delete %2$s users (except yourself) and cannot be undone.'),
                 sprintf('<strong>%s</strong>', $translate('Warning')),
                 sprintf('<strong>%s</strong>', number_format($this->pagination()->getPaginator()->getTotalCount()))
             ); ?></p>
diff --git a/application/view/omeka/admin/vocabulary/browse.phtml b/application/view/omeka/admin/vocabulary/browse.phtml
index ee5a662e1b..0bb449e82b 100644
--- a/application/view/omeka/admin/vocabulary/browse.phtml
+++ b/application/view/omeka/admin/vocabulary/browse.phtml
@@ -30,13 +30,14 @@ $sortHeadings = [
     <?php endif; ?>
 </div>
 
-<?php if (count($vocabularies) > 0): ?>
 
 <div class="browse-controls">
     <?php echo $this->pagination(); ?>
     <?php echo $this->sortSelector($sortHeadings); ?>
 </div>
 <?php $this->trigger('view.browse.before'); ?>
+
+<?php if (count($vocabularies) > 0): ?>
 <table class="tablesaw" data-tablesaw-mode="stack">
     <thead>
         <tr>
diff --git a/application/view/omeka/index/index.phtml b/application/view/omeka/index/index.phtml
index 6a71094eb9..6f84f0e20f 100644
--- a/application/view/omeka/index/index.phtml
+++ b/application/view/omeka/index/index.phtml
@@ -10,6 +10,15 @@ $this->headTitle($subtitle);
 <h2 class="site-list-heading"><?php echo $subtitle; ?></h2>
 
 <?php if ($sites): ?>
+
+<?php echo $this->partial(
+  'omeka/search/form.phtml',
+  [
+      'fulltextSearch' => $this->escapeHtml($this->params()->fromQuery('fulltext_search')),
+      'action' => $this->escapeHtml($this->url('search', ['action' => 'results']))
+  ]
+); ?>
+
 <div class="site-list">
 <?php
 foreach ($sites as $site):
@@ -22,7 +31,7 @@ endforeach;
 
 <?php endif; ?>
 <p><?php echo sprintf(
-    $translate('Go to the %s to start working with %s.'),
+    $translate('Go to the %1$s to start working with %2$s.'),
     $this->hyperlink($translate('Admin dashboard'), $this->url('admin')),
     $title
 ); ?></p>
diff --git a/application/view/omeka/search/advanced.phtml b/application/view/omeka/search/advanced.phtml
new file mode 100644
index 0000000000..d654ce98ff
--- /dev/null
+++ b/application/view/omeka/search/advanced.phtml
@@ -0,0 +1,10 @@
+<h1><?php echo $this->setting('installation_title', 'Omeka S'); ?></h1>
+<h2><?php echo $this->translate('Advanced item search'); ?></h2>
+
+<form id="advanced-search" method="get" action="<?php echo $this->escapeHtml($this->url(null, ['action' => 'items'], true)); ?>">
+    <?php echo $this->partial('common/advanced-search', ['query' => $this->params()->fromQuery(), 'resourceType' => 'item']); ?>
+    <div class="advanced-search-actions">
+        <?php echo $this->hyperlink($this->translate('Reset'), $this->url(null, [], true), ['class' => 'button']); ?>
+        <input type="submit" name="submit" value="<?php echo $this->escapeHtml($this->translate('Search')); ?>">
+    </div>
+</form>
diff --git a/application/view/omeka/search/form.phtml b/application/view/omeka/search/form.phtml
new file mode 100644
index 0000000000..b33624ece8
--- /dev/null
+++ b/application/view/omeka/search/form.phtml
@@ -0,0 +1,9 @@
+<?php 
+if (!isset($action)) {
+  $action = $this->escapeHtml($this->url(null, [], true));
+}
+?>
+<form action="<?php echo $action?>" class="sitewide-search-form">
+    <input type="text" name="fulltext_search" value="<?php echo $this->escapeHtml($fulltextSearch); ?>">
+    <input type="submit" value="Search">
+</form>
diff --git a/application/view/omeka/search/index.phtml b/application/view/omeka/search/index.phtml
new file mode 100644
index 0000000000..a3fbe4a687
--- /dev/null
+++ b/application/view/omeka/search/index.phtml
@@ -0,0 +1,10 @@
+<h1><?php echo $this->setting('installation_title', 'Omeka S'); ?></h1>
+<h2><?php echo $this->translate('Search'); ?></h2>
+
+<?php echo $this->partial(
+  'omeka/search/form.phtml',
+  [
+      'fulltextSearch' => $this->escapeHtml($this->params()->fromQuery('fulltext_search')),
+      'action' => 'results'
+  ]
+); ?>
diff --git a/application/view/omeka/search/items.phtml b/application/view/omeka/search/items.phtml
new file mode 100644
index 0000000000..9796be408f
--- /dev/null
+++ b/application/view/omeka/search/items.phtml
@@ -0,0 +1,29 @@
+<h1><?php echo $this->setting('installation_title', 'Omeka S'); ?></h1>
+
+<?php echo $this->partial(
+  'omeka/search/form.phtml',
+  ['fulltextSearch' => $this->escapeHtml($this->params()->fromQuery('fulltext_search'))]
+); ?>
+
+<?php echo $this->hyperlink($this->translate('Advanced item search'), $this->url(null, ['action' => 'advanced', 'class' => 'advanced-search'], ['query' => $this->params()->fromQuery()], true), ['class' => 'advanced-search']); ?>
+
+<h2><?php echo $this->translate('Item results'); ?></h2>
+
+<?php echo $this->pagination(); ?>
+
+<div class="item-results">
+    <ul>
+        <?php foreach ($items as $item): ?>
+        <?php $sites = $item->sites(); ?>
+        <li>
+            <?php echo $item->displayTitle(); ?>
+            <ul>
+                <?php foreach ($sites as $site): ?>
+                <li><?php echo $this->hyperlink($site->title(), $item->siteUrl($site->slug())); ?></li>
+                <?php endforeach; ?>
+            </ul>
+        </li>
+        <?php endforeach; ?>
+    </ul>
+</div>
+<?php echo $this->pagination(); ?>
diff --git a/application/view/omeka/search/results.phtml b/application/view/omeka/search/results.phtml
new file mode 100644
index 0000000000..b9a067033b
--- /dev/null
+++ b/application/view/omeka/search/results.phtml
@@ -0,0 +1,67 @@
+<?php $fulltextSearch = $this->params()->fromQuery('fulltext_search'); ?>
+
+<h1><?php echo $this->setting('installation_title', 'Omeka S'); ?></h1>
+
+<?php echo $this->partial(
+  'omeka/search/form.phtml',
+  ['fulltextSearch' => $fulltextSearch]
+); ?>
+
+<h2><?php echo sprintf($this->translate('Search results for “%s”'), $fulltextSearch); ?></h2>
+
+<div class="site-results">
+    <h3><?php echo $this->translate('Site pages'); ?></h2>
+    <?php if ($responseSitePages->getTotalResults()): ?>
+    <ul>
+        <?php foreach ($responseSitePages->getContent() as $sitePage): ?>
+        <?php $site = $sitePage->site(); ?>
+        <li><?php echo sprintf(
+            '%s (in %s)',
+            $this->hyperlink($sitePage->title(), $sitePage->siteUrl()),
+            $this->hyperlink($site->title(), $site->siteUrl())
+        ); ?></li>
+        <?php endforeach; ?>
+    </ul>
+    <?php echo $this->hyperlink(
+        sprintf($this->translate('View all results (%s total)'), $responseSitePages->getTotalResults()),
+        $this->url(
+            null,
+            ['action' => 'site-pages'],
+            ['query' => ['fulltext_search' => $fulltextSearch]],
+            true
+        )
+    ); ?>
+    <?php else: ?>
+    <p><?php echo $this->translate('No result found'); ?></p>
+    <?php endif; ?>
+</div>
+
+<div class="item-results">
+    <h3><?php echo $this->translate('Items'); ?></h2>
+    <?php if ($responseItems->getTotalResults()): ?>
+    <ul>
+        <?php foreach ($responseItems->getContent() as $item): ?>
+        <?php $sites = $item->sites(); ?>
+        <li>
+            <?php echo $item->displayTitle(); ?>
+            <ul>
+                <?php foreach ($sites as $site): ?>
+                <li><?php echo $this->hyperlink($site->title(), $item->siteUrl($site->slug())); ?></li>
+                <?php endforeach; ?>
+            </ul>
+        </li>
+        <?php endforeach; ?>
+    </ul>
+    <?php echo $this->hyperlink(
+        sprintf($this->translate('View all results (%s total)'), $responseItems->getTotalResults()),
+        $this->url(
+            null,
+            ['action' => 'items'],
+            ['query' => ['fulltext_search' => $fulltextSearch]],
+            true
+        )
+    ); ?>
+    <?php else: ?>
+    <p><?php echo $this->translate('No result found'); ?></p>
+    <?php endif; ?>
+</div>
diff --git a/application/view/omeka/search/site-pages.phtml b/application/view/omeka/search/site-pages.phtml
new file mode 100644
index 0000000000..c2fbf1373f
--- /dev/null
+++ b/application/view/omeka/search/site-pages.phtml
@@ -0,0 +1,24 @@
+<h1><?php echo $this->setting('installation_title', 'Omeka S'); ?></h1>
+<?php echo $this->partial(
+  'omeka/search/form.phtml',
+  ['fulltextSearch' => $this->escapeHtml($this->params()->fromQuery('fulltext_search'))]
+); ?>
+
+<h2><?php echo $this->translate('Site page results'); ?></h2>
+
+<?php echo $this->pagination(); ?>
+
+<div class="site-results">
+  <ul>
+      <?php foreach ($sitePages as $sitePage): ?>
+        <?php $site = $sitePage->site(); ?>
+        <li><?php echo sprintf(
+            '%s (in %s)',
+            $this->hyperlink($sitePage->title(), $sitePage->siteUrl()),
+            $this->hyperlink($site->title(), $site->siteUrl())
+        ); ?></li>
+      <?php endforeach; ?>
+  </ul>
+</div>
+
+<?php echo $this->pagination(); ?>
diff --git a/application/view/omeka/site-admin/index/add.phtml b/application/view/omeka/site-admin/index/add.phtml
index a7850dc632..62a34d111f 100644
--- a/application/view/omeka/site-admin/index/add.phtml
+++ b/application/view/omeka/site-admin/index/add.phtml
@@ -6,7 +6,6 @@ $form->prepare();
 $sectionNavs = [
     'admin' => $translate('Admin'),
     'theme' => $translate('Theme'),
-    'item-pool' => $translate('Item pool')
 ];
 $fallbackThumbnailUrl = $this->assetUrl('img/theme.jpg', 'Omeka');
 ?>
@@ -48,9 +47,6 @@ $fallbackThumbnailUrl = $this->assetUrl('img/theme.jpg', 'Omeka');
     ?>
 </fieldset>
 
-<fieldset id="item-pool" class="section" aria-labelledby="item-pool-label">
-    <div id="advanced-search"><?php echo $this->partial('common/advanced-search', ['resourceType' => 'item']); ?></div>
-</fieldset>
 <?php $this->trigger('view.add.form.after', ['form' => $form]); ?>
 <?php echo $this->form()->closeTag(); ?>
 <?php $this->trigger('view.add.after'); ?>
diff --git a/application/view/omeka/site-admin/index/index.phtml b/application/view/omeka/site-admin/index/index.phtml
index ae7aa4ad76..f9f4d258a9 100644
--- a/application/view/omeka/site-admin/index/index.phtml
+++ b/application/view/omeka/site-admin/index/index.phtml
@@ -26,13 +26,13 @@ $sortHeadings = [
     <?php endif; ?>
 </div>
 
-<?php if (count($sites) > 0): ?>
-
 <div class="browse-controls">
     <?php echo $this->pagination(); ?>
     <?php echo $this->sortSelector($sortHeadings); ?>
 </div>
 <?php $this->trigger('view.browse.before'); ?>
+
+<?php if (count($sites) > 0): ?>
 <table class="tablesaw" data-tablesaw-mode="stack">
     <thead>
         <tr>
diff --git a/application/view/omeka/site-admin/index/resources.phtml b/application/view/omeka/site-admin/index/resources.phtml
index d19cb64c9d..4a84ddb8ae 100644
--- a/application/view/omeka/site-admin/index/resources.phtml
+++ b/application/view/omeka/site-admin/index/resources.phtml
@@ -6,55 +6,54 @@ $this->headScript()->appendFile($this->assetUrl('js/site-item-sets.js', 'Omeka')
 $this->htmlElement('body')->appendAttribute('class', 'sites resources');
 
 $rowTemplate = '
-<tr class="site-item-set-row">
+<tr class="resource-row">
     <td class="sortable-handle"></td>
-    <td class="site-item-set-title"></td>
-    <td class="site-item-set-owner-email"></td>
+    <td class="data-value" data-row-key="child-search"></td>
+    <td class="data-value" data-row-key="owner-email"></td>
     <td>
 ' . $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $translate('Remove item set')])
-  . $this->hyperlink('', '#', ['class' => 'o-icon-undo', 'title' => $translate('Restore item set'), 'style' => 'display:none'])
-  . '<input type="hidden" class="site-item-set-id" name="o:site_item_set[][o:item_set][o:id]">
+  . '<input type="hidden" class="resource-id" name="o:site_item_set[][o:item_set][o:id]">
     </td>
 </tr>';
 ?>
 
 <?php echo $this->pageTitle($translate('Resources'), 1, $translate('Sites')); ?>
 <?php echo $this->sectionNav([
-    'item-pool-section' => $translate('Item pool'),
+    'items-section' => $translate('Items'),
     'item-sets-section' => $translate('Item sets'),
 ]); ?>
 
 <?php echo $this->form()->openTag($form); ?>
-<?php echo $this->formCollection($form, false); ?>
+<?php echo $this->formElement($form->get('siteresourcesform_csrf')); ?>
 
 <div id="page-actions">
     <?php echo $this->cancelButton(); ?>
     <button><?php echo $translate('Save'); ?></button>
 </div>
 
-<div id="item-pool-section" class="active section">
+<div id="items-section" class="active section">
+    <?php echo $this->formRow($form->get('o:assign_new_items')); ?>
     <p><?php echo sprintf(
-        $translate('There are currently %s items in this site’s pool.'),
-        $this->hyperlink(
-            $itemCount,
-            $this->url(
-                'admin/default',
-                ['controller' => 'item'],
-                ['query' => ['site_id' => $site->id()]]
-            ),
-            ['target' => '_blank']
-        )
+        $translate('There are currently %s items assigned to this site. Select an action below to manage item assignments.'),
+        $this->hyperlink($itemCount, $this->url('admin/default', ['controller' => 'item'], ['query' => ['site_id' => $site->id()]]), ['target' => '_blank'])
     ); ?></p>
-    <div id="advanced-search"><?php echo $this->partial(
-        'common/advanced-search',
-        ['query' => $site->itemPool(), 'resourceType' => 'item']
-    ); ?></div>
+    <?php echo $this->formRow($form->get('item_assignment_action')); ?>
+    <?php echo $this->formRow($form->get('save_search')); ?>
+    <?php echo $this->hyperlink($this->translate('Preview this search'), '#', [
+        'id' => 'resources-preview-button',
+        'class' => 'button',
+        'title' => $this->translate('Preview this search'),
+        'data-url' => $this->url('admin/default', ['controller' => 'item', 'action' => 'browse']),
+    ]); ?>
+    <div id="advanced-search">
+        <?php echo $this->partial('common/advanced-search', ['query' => $site->itemPool(), 'resourceType' => 'item', 'isPool' => true]); ?>
+    </div>
 </div>
 
 <div id="item-sets-section" class="section">
-    <table id="site-item-sets" class="tablesaw tablesaw-stack" style="display: none;"
+    <table id="site-item-sets" class="selector-table tablesaw tablesaw-stack <?php echo ((count($itemSets) > 0)) ? '' : 'empty'; ?>"
         data-tablesaw-mode="stack"
-        data-item-sets="<?php echo $this->escapeHtml(json_encode($itemSets)); ?>"
+        data-existing-rows="<?php echo $this->escapeHtml(json_encode($itemSets)); ?>"
         data-row-template="<?php echo $this->escapeHtml($rowTemplate); ?>">
         <thead>
             <tr>
@@ -64,10 +63,20 @@ $rowTemplate = '
                 <th></th>
             </tr>
         </thead>
-        <tbody id="site-item-set-rows"></tbody>
+        <tbody class="resource-rows"></tbody>
     </table>
-    <p id="no-site-item-sets" style="display: none;"><?php echo $translate('No item sets are assigned to this site.'); ?></p>
-    <?php echo $this->itemSetSelector(); ?>
+    <div class="no-resources"><?php echo $translate('No item sets are assigned to this site.'); ?></div>
+    <?php echo $this->itemSetSelector(true); ?>
 </div>
 
 <?php echo $this->form()->closeTag(); ?>
+
+<script>
+Omeka.initializeSelector('#site-item-sets', '#item-set-selector');
+$('#resources-preview-button').on('click', function(e) {
+    e.preventDefault();
+    var url = $(this).data('url');
+    var query = $('#site-form').serialize();
+    window.open(`${url}?${query}`, '_blank');
+});
+</script>
diff --git a/application/view/omeka/site-admin/index/theme.phtml b/application/view/omeka/site-admin/index/theme.phtml
index 21ac2c1143..0c91b3cfc7 100644
--- a/application/view/omeka/site-admin/index/theme.phtml
+++ b/application/view/omeka/site-admin/index/theme.phtml
@@ -40,7 +40,9 @@ $fallbackThumbnailUrl = $this->assetUrl('img/theme.jpg', 'Omeka');
                 <span class="theme-description"><?php echo $escape($currentDescription); ?></span>
                 <?php endif; ?>
             </p>
-            <?php echo $this->hyperlink($translate('Edit theme settings'), $this->url(null, ['site-slug' => $site->slug(), 'action' => 'theme-settings']), ['class' => 'theme-settings button']); ?>
+            <?php if ($currentTheme->isConfigurable()): ?>
+                <?php echo $this->hyperlink($translate('Edit theme settings'), $this->url(null, ['site-slug' => $site->slug(), 'action' => 'theme-settings']), ['class' => 'theme-settings button']); ?>
+            <?php endif; ?>
 
             <div class="version-notification" style="display: none;"
                 data-addon-id="<?php echo $this->escapeHtml($currentTheme->getId()); ?>"
diff --git a/application/view/omeka/site-admin/index/users.phtml b/application/view/omeka/site-admin/index/users.phtml
index 258ce061ab..c19b931dc9 100644
--- a/application/view/omeka/site-admin/index/users.phtml
+++ b/application/view/omeka/site-admin/index/users.phtml
@@ -11,79 +11,9 @@ $roles = [
     'editor' => $translate('Editor'),
     'admin' => $translate('Admin'),
 ];
-?>
-
-<?php echo $this->pageTitle($translate('User permissions'), 1, $translate('Sites')); ?>
-
-<?php echo $this->form()->openTag($form); ?>
-<?php echo $this->formCollection($form, false); ?>
-
-<div id="page-actions">
-    <?php echo $this->cancelButton(); ?>
-    <button><?php echo $translate('Save'); ?></button>
-</div>
-
-<?php $sitePermissions = $site->sitePermissions(); ?>
-    <table id="site-user-permissions" class="tablesaw tablesaw-stack <?php echo count($sitePermissions) ? '' : 'empty'; ?>" data-tablesaw-mode="stack">
-        <thead>
-            <tr>
-                <th scope="col"><?php echo $translate('User'); ?></th>
-                <th scope="col"><?php echo $translate('Role'); ?></th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php
-            $index = 0;
-            foreach($sitePermissions as $sitePermission):
-            $user = $sitePermission->user();
-            ?>
-            <tr class="user value">
-                <td class="user-meta">
-                    <span class="restore-value"><?php echo $translate('User to be removed'); ?></span>
-                    <span class="user-name"><?php echo $escape($user->name()); ?> (<?php echo $escape($user->email()); ?>)</span>
-                    <input type="hidden" class="user-id" name="o:site_permission[<?php echo $index; ?>][o:user][o:id]" value="<?php echo $escape($user->id()); ?>">
-                </td>
-                <td><select name="o:site_permission[<?php echo $index; ?>][o:role]" aria-label="<?php echo $translate('Role'); ?>">
-                    <?php
-                    foreach ($roles as $key => $value):
-                    $selected = $key === $sitePermission->role() ? true : false;
-                    ?>
-                    <option value="<?php echo $key; ?>"<?php echo $selected ? ' selected' : null; ?>><?php echo $value; ?></option>
-                    <?php endforeach; ?>
-                </select></td>
-                <td>
-                    <ul class="actions">
-                        <li><?php echo $this->hyperlink('', '#', [
-                            'class' => 'o-icon-delete',
-                            'title' => $delete,
-                        ]); ?></li>
-                        <li><?php echo $this->hyperlink('', '#', [
-                            'class' => 'o-icon-undo',
-                            'title' => $restore,
-                        ]); ?></li>
-                    </ul>
-                </td>
-                <?php $index++; ?>
-            </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <div class="no-resources">
-        <p><?php echo $translate('This site has no users. Add users using the interface to the right.'); ?></p>
-    </div>
-    <button id="site-user-selector-button" class="mobile-only"><?php echo $translate('Add new user'); ?></button>
-    <?php echo $this->userSelector($translate('Click on a user to add them to the site.')); ?>
-<?php echo $this->form()->closeTag(); ?>
-
-<?php
 $userRowTemplate = '
-<tr class="user value">
-    <td class="user-meta">
-        <span class="restore-value">' . $translate('User to be removed') . '</span>
-        <span class="user-name"></span>
-        <input type="hidden" class="user-id" name="o:site_permission[__index__][o:user][o:id]">
-    </td>
+<tr class="resource-row">
+    <td class="data-value" data-row-key="child-search"></td>
     <td><select name="o:site_permission[__index__][o:role]">';
 foreach ($roles as $key => $value) {
     $userRowTemplate .= '<option value="' . $key . '">' . $value . '</option>';
@@ -91,12 +21,51 @@ foreach ($roles as $key => $value) {
 $userRowTemplate .= '</select></td>
     <td>
         <ul class="actions">
-            <li>' . $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $delete]) . '</li>' .
-            '<li>' . $this->hyperlink('', '#', ['class' => 'o-icon-undo', 'title' => $restore]) . '</li>
+            <li>' . $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $delete]) . '</li>
         </ul>
+        <input type="hidden" class="resource-id" name="o:site_permission[__index__][o:user][o:id]">
     </td>
 </tr>
 ';
+$sitePermissions = $site->sitePermissions();
+$users = [];
+foreach ($sitePermissions as $sitePermission) {
+  $user = $sitePermission->user();
+  $users[] = [
+    'id' => $user->id(),
+    'role' => $sitePermission->role(),
+  ];
+}
 ?>
 
-<span id="user-row-template" data-template="<?php echo $escape($userRowTemplate); ?>"></span>
+<?php echo $this->pageTitle($translate('User permissions'), 1, $translate('Sites')); ?>
+
+<?php echo $this->form()->openTag($form); ?>
+<?php echo $this->formCollection($form, false); ?>
+
+<div id="page-actions">
+    <?php echo $this->cancelButton(); ?>
+    <button><?php echo $translate('Save'); ?></button>
+</div>
+
+<table id="site-user-permissions"  data-row-template="<?php echo $escape($userRowTemplate); ?>" data-existing-rows="<?php echo $this->escapeHtml(json_encode($users)); ?>" class="selector-table tablesaw tablesaw-stack <?php echo (count($sitePermissions) > 0) ? '' : 'empty'; ?>" data-tablesaw-mode="stack">
+    <thead>
+        <tr>
+            <th scope="col"><?php echo $translate('User'); ?></th>
+            <th scope="col"><?php echo $translate('Role'); ?></th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody class="resource-rows"></tbody>
+</table>
+<div class="no-resources">
+    <p><?php echo $translate('This site has no users. Add users using the interface to the right.'); ?></p>
+</div>
+<button id="site-user-selector-button" class="mobile-only"><?php echo $translate('Add new user'); ?></button>
+<?php echo $this->userSelector($translate('Click on a user to add them to the site.')); ?>
+
+<?php echo $this->form()->closeTag(); ?>
+
+<script>
+  Omeka.initializeSelector('#site-user-permissions', '#user-selector');
+</script>
\ No newline at end of file
diff --git a/application/view/omeka/site/index/search.phtml b/application/view/omeka/site/index/search.phtml
index cc43937078..9d12b5d3e2 100644
--- a/application/view/omeka/site/index/search.phtml
+++ b/application/view/omeka/site/index/search.phtml
@@ -1,43 +1,51 @@
-<?php echo $this->pageTitle(sprintf($this->translate('Search results for “%s”'), $query)); ?>
+<?php
+$translate = $this->plugin('translate');
+$hyperlink = $this->plugin('hyperlink');
+$url = $this->plugin('url');
+?>
+
+<?php echo $this->pageTitle(sprintf($translate('Search results for “%s”'), $query)); ?>
+
+<?php if (empty($results)): ?>
+    <p><?php echo $translate('No results.'); ?></p>
+<?php else: ?>
+<?php
+$resourceLabels = [
+    'site_pages' => 'Site pages', // @translate
+    'items' => 'Items', // @translate
+    'item_sets' => 'Item sets', // @translate
+    'media' => 'Media', // @translate
+];
+$resourceControllers = [
+    'site_pages' => 'page',
+    'items' => 'item',
+    'item_sets' => 'item-set',
+    'media' => 'media',
+];
+?>
+    <?php foreach ($results as $resourceName => $result): ?>
 <div>
-    <h2><?php echo $this->translate('Pages'); ?></h2>
-    <?php if ($pages): ?>
+    <h2><?php echo $translate($resourceLabels[$resourceName]); ?></h2>
+
+    <?php if ($result['total']): ?>
+        <?php $titleMethod = $resourceName === 'site_pages' ? 'title' : 'displayTitle'; ?>
     <ul>
-        <?php foreach ($pages as $page): ?>
-        <li><?php echo $page->link($page->title()); ?></li>
+        <?php foreach ($result['resources'] as $resource): ?>
+        <li><?php echo $resource->link($resource->$titleMethod()); ?></li>
         <?php endforeach; ?>
     </ul>
-    <?php echo $this->hyperlink(
-        sprintf($this->translate('View all results (%s total)'), $pagesTotal),
-        $this->url(
-            'site/page-browse',
-            ['controller' => 'page', 'action' => 'browse'],
-            ['query' => ['fulltext_search' => $query]],
-            true
-        )
-    ); ?>
-    <?php else: ?>
-    <p><?php echo $this->translate('No pages found'); ?></p>
-    <?php endif; ?>
-</div>
-<div>
-    <h2><?php echo $this->translate('Items'); ?></h2>
-    <?php if ($items): ?>
-    <ul>
-        <?php foreach ($items as $item): ?>
-        <li><?php echo $item->link($item->displayTitle()); ?></li>
-        <?php endforeach; ?>
-    </ul>
-    <?php echo $this->hyperlink(
-        sprintf($this->translate('View all results (%s total)'), $itemsTotal),
-        $this->url(
-            'site/resource',
-            ['controller' => 'item', 'action' => 'browse'],
-            ['query' => ['fulltext_search' => $query]],
-            true
-        )
-    ); ?>
-    <?php else: ?>
-    <p><?php echo $this->translate('No items found'); ?></p>
-    <?php endif; ?>
+        <?php echo $hyperlink(
+            sprintf($translate('View all results (%s total)'), $result['total']),
+            $url(
+                'site/resource',
+                ['controller' => $resourceControllers[$resourceName], 'action' => 'browse'],
+                ['query' => ['fulltext_search' => $query]],
+                true
+            )
+        ); ?>
+        <?php else: ?>
+    <p><?php echo $translate('No result found'); ?></p>
+        <?php endif; ?>
 </div>
+    <?php endforeach; ?>
+<?php endif; ?>
diff --git a/application/view/omeka/site/item/browse.phtml b/application/view/omeka/site/item/browse.phtml
index 96409ff798..a9ccd64a78 100644
--- a/application/view/omeka/site/item/browse.phtml
+++ b/application/view/omeka/site/item/browse.phtml
@@ -62,7 +62,7 @@ foreach ($items as $item):
         <?php echo $item->linkRaw($this->thumbnail($item, 'medium')); ?>
         <h4><?php echo $item->link($heading); ?></h4>
         <?php if ($body): ?>
-        <div class="description"><?php echo $body; ?></div>
+        <div class="description"><?php echo $escape($body); ?></div>
         <?php endif; ?>
     </li>
 <?php endforeach; ?>
diff --git a/application/view/omeka/site/page/show.phtml b/application/view/omeka/site/page/show.phtml
index 2bacff9a83..24e7e357b5 100644
--- a/application/view/omeka/site/page/show.phtml
+++ b/application/view/omeka/site/page/show.phtml
@@ -1,4 +1,5 @@
 <?php
+$this->headLink()->appendStylesheet($this->assetUrl('css/page-blocks.css', 'Omeka'));
 $this->htmlElement('body')->appendAttribute('class', 'page');
 $this->pageTitle($page->title(), 2);
 $showPagePagination = $this->siteSetting('show_page_pagination', true);
diff --git a/cli-config.php b/cli-config.php
index a076cc7913..cf3e74a068 100644
--- a/cli-config.php
+++ b/cli-config.php
@@ -1,7 +1,7 @@
 <?php
 require 'bootstrap.php';
 
-$application = Zend\Mvc\Application::init(require 'application/config/application.config.php');
+$application = \Laminas\Mvc\Application::init(require 'application/config/application.config.php');
 
 return \Doctrine\ORM\Tools\Console\ConsoleRunner::createHelperSet(
     $application->getServiceManager()->get('Omeka\EntityManager')
diff --git a/composer.json b/composer.json
index 4345400419..219073bd7c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,71 +6,70 @@
     "require": {
         "php": ">=7.1",
         "doctrine/orm": "^2.6",
-        "easyrdf/easyrdf": "~0.9",
+        "easyrdf/easyrdf": "dev-master",
         "ml/json-ld": "^1.1",
         "ezyang/htmlpurifier": "^4.8",
         "composer/semver": "^1.0",
-        "zendframework/zend-authentication": "^2.5.3",
-        "zendframework/zend-barcode": "^2.6",
-        "zendframework/zend-cache": "^2.7.1",
-        "zendframework/zend-captcha": "^2.6",
-        "zendframework/zend-code": "^3.0.2",
-        "zendframework/zend-config": "^2.6",
-        "zendframework/zend-console": "^2.6",
-        "zendframework/zend-crypt": "^3.0",
-        "zendframework/zend-db": "^2.8.1",
-        "zendframework/zend-debug": "^2.5.1",
-        "zendframework/zend-di": "^2.6.1",
-        "zendframework/zend-dom": "^2.6",
-        "zendframework/zend-escaper": "^2.5.1",
-        "zendframework/zend-eventmanager": "^3.0.1",
-        "zendframework/zend-feed": "^2.7",
-        "zendframework/zend-file": "^2.7",
-        "zendframework/zend-filter": "^2.7.1",
-        "zendframework/zend-form": "^2.9",
-        "zendframework/zend-http": "^2.5.4",
-        "zendframework/zend-hydrator": "^2.2.1",
-        "zendframework/zend-i18n": "^2.7.3",
-        "zendframework/zend-i18n-resources": "^2.5.2",
-        "zendframework/zend-inputfilter": "^2.7.2",
-        "zendframework/zend-json": "^3.0",
-        "zendframework/zend-loader": "^2.5.1",
-        "zendframework/zend-log": "^2.9",
-        "zendframework/zend-mail": "^2.7.1",
-        "zendframework/zend-math": "^3.0",
-        "zendframework/zend-memory": "^2.5.2",
-        "zendframework/zend-mime": "^2.6",
-        "zendframework/zend-modulemanager": "^2.7.2",
-        "zendframework/zend-mvc": "^3.0.1",
-        "zendframework/zend-mvc-i18n": "^1.0",
-        "zendframework/zend-mvc-plugins": "^1.0",
-        "zendframework/zend-navigation": "^2.8.1",
-        "zendframework/zend-paginator": "^2.7",
-        "zendframework/zend-permissions-acl": "^2.6",
-        "zendframework/zend-permissions-rbac": "^2.5.1",
-        "zendframework/zend-progressbar": "^2.5.2",
-        "zendframework/zend-serializer": "^2.8",
-        "zendframework/zend-server": "^2.7.0",
-        "zendframework/zend-servicemanager": "^3.1",
-        "zendframework/zend-session": "^2.7.1",
-        "zendframework/zend-soap": "^2.6",
-        "zendframework/zend-stdlib": "^3.0.1",
-        "zendframework/zend-tag": "^2.6.1",
-        "zendframework/zend-text": "^2.6",
-        "zendframework/zend-uri": "^2.5.2",
-        "zendframework/zend-validator": "^2.8",
-        "zendframework/zend-view": "^2.8",
-        "zendframework/zend-xmlrpc": "^2.6",
-        "zendframework/zendxml": "^1.0.2",
+        "laminas/laminas-zendframework-bridge": "^1.0",
+        "laminas/laminas-authentication": "^2.5.3",
+        "laminas/laminas-barcode": "^2.6",
+        "laminas/laminas-cache": "^2.7.1",
+        "laminas/laminas-captcha": "^2.6",
+        "laminas/laminas-code": "^3.0.2",
+        "laminas/laminas-config": "^2.6",
+        "laminas/laminas-console": "^2.6",
+        "laminas/laminas-crypt": "^3.0",
+        "laminas/laminas-db": "^2.8.1",
+        "laminas/laminas-di": "^2.6.1",
+        "laminas/laminas-dom": "^2.6",
+        "laminas/laminas-escaper": "^2.5.1",
+        "laminas/laminas-eventmanager": "^3.0.1",
+        "laminas/laminas-feed": "^2.7",
+        "laminas/laminas-file": "^2.7",
+        "laminas/laminas-filter": "^2.7.1",
+        "laminas/laminas-form": "^2.9",
+        "laminas/laminas-http": "^2.5.4",
+        "laminas/laminas-hydrator": "^2.2.1",
+        "laminas/laminas-i18n": "^2.7.3",
+        "laminas/laminas-i18n-resources": "^2.5.2",
+        "laminas/laminas-inputfilter": "^2.7.2",
+        "laminas/laminas-json": "^3.0",
+        "laminas/laminas-loader": "^2.5.1",
+        "laminas/laminas-log": "^2.9",
+        "laminas/laminas-mail": "^2.7.1",
+        "laminas/laminas-math": "^3.0",
+        "laminas/laminas-memory": "^2.5.2",
+        "laminas/laminas-mime": "^2.6",
+        "laminas/laminas-modulemanager": "^2.7.2",
+        "laminas/laminas-mvc": "^3.0.1",
+        "laminas/laminas-mvc-i18n": "^1.0",
+        "laminas/laminas-mvc-plugins": "^1.0",
+        "laminas/laminas-navigation": "^2.8.1",
+        "laminas/laminas-paginator": "^2.7",
+        "laminas/laminas-permissions-acl": "^2.6",
+        "laminas/laminas-permissions-rbac": "^2.5.1",
+        "laminas/laminas-progressbar": "^2.5.2",
+        "laminas/laminas-serializer": "^2.8",
+        "laminas/laminas-server": "^2.7.0",
+        "laminas/laminas-servicemanager": "^3.1",
+        "laminas/laminas-session": "^2.7.1",
+        "laminas/laminas-stdlib": "^3.0.1",
+        "laminas/laminas-tag": "^2.6.1",
+        "laminas/laminas-text": "^2.6",
+        "laminas/laminas-uri": "^2.5.2",
+        "laminas/laminas-validator": "^2.8",
+        "laminas/laminas-view": "^2.8",
+        "laminas/laminas-xmlrpc": "^2.6",
+        "laminas/laminas-xml": "^1.0.2",
         "omeka/composer-addon-installer": "*",
         "omeka-s-themes/default": "dev-develop",
         "beberlei/doctrineextensions": "^1.0",
         "lsolesen/pel": "^0.9.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.23 || ^6.4.4",
+        "phpunit/phpunit": "^7",
         "friendsofphp/php-cs-fixer": "^2.0",
-        "zendframework/zend-test": "^3.0.1",
+        "laminas/laminas-test": "^3.0.1",
         "zerocrates/extract-tagged-strings": "dev-master"
     },
     "autoload": {
@@ -88,6 +87,10 @@
             "type": "vcs",
             "url": "https://github.com/omeka-s-themes/default.git"
         },
+        {
+            "type": "vcs",
+            "url": "https://github.com/omeka/easyrdf.git"
+        },
         {
             "type": "path",
             "url": "application/data/composer-addon-installer"
diff --git a/composer.lock b/composer.lock
index e5570df9fb..a387a00659 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eec8b932de7f5c5ea086835788e8f470",
+    "content-hash": "bc26adb90af7415d888e0e4a19b59845",
     "packages": [
         {
-            "name": "beberlei/DoctrineExtensions",
-            "version": "v1.2.1",
+            "name": "beberlei/doctrineextensions",
+            "version": "v1.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/beberlei/DoctrineExtensions.git",
-                "reference": "a6b55e257ebaabd66f3547a962037fc4eb645378"
+                "reference": "af72c4a136b744f1268ca8bb4da47a2f8af78f86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/a6b55e257ebaabd66f3547a962037fc4eb645378",
-                "reference": "a6b55e257ebaabd66f3547a962037fc4eb645378",
+                "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/af72c4a136b744f1268ca8bb4da47a2f8af78f86",
+                "reference": "af72c4a136b744f1268ca8bb4da47a2f8af78f86",
                 "shasum": ""
             },
             "require": {
+                "doctrine/orm": "^2.6",
                 "php": "^7.1"
             },
             "require-dev": {
-                "doctrine/orm": "^2.6",
                 "friendsofphp/php-cs-fixer": "^2.14",
                 "nesbot/carbon": "*",
                 "phpunit/phpunit": "^7.0 || ^8.0",
@@ -58,28 +58,27 @@
                 "doctrine",
                 "orm"
             ],
-            "time": "2019-05-06T11:22:07+00:00"
+            "time": "2019-12-05T09:49:04+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "1.5.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
+                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
-                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5",
-                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+                "phpunit/phpunit": "^4.5 || ^5.0.5"
             },
             "type": "library",
             "extra": {
@@ -120,7 +119,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2019-03-19T17:25:45+00:00"
+            "time": "2020-01-13T12:06:48+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -151,34 +150,36 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
+            "abandoned": "psr/container",
             "time": "2017-02-14T19:40:03+00:00"
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.6.1",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
+                "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
-                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5eb79f3dbdffed6544e1fc287572c0f462bd29bb",
+                "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
+                "ext-tokenizer": "*",
                 "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^6.4"
+                "phpunit/phpunit": "^7.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.9.x-dev"
                 }
             },
             "autoload": {
@@ -191,6 +192,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -199,10 +204,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -219,20 +220,20 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2019-03-25T19:12:02+00:00"
+            "time": "2020-04-02T12:33:25+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.8.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
+                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
                 "shasum": ""
             },
             "require": {
@@ -243,7 +244,7 @@
             },
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^4.0",
+                "doctrine/coding-standard": "^6.0",
                 "mongodb/mongodb": "^1.1",
                 "phpunit/phpunit": "^7.0",
                 "predis/predis": "~1.0"
@@ -254,7 +255,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.9.x-dev"
                 }
             },
             "autoload": {
@@ -267,6 +268,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -275,10 +280,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -288,13 +289,20 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "https://www.doctrine-project.org",
+            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+            "homepage": "https://www.doctrine-project.org/projects/cache.html",
             "keywords": [
+                "abstraction",
+                "apcu",
                 "cache",
-                "caching"
+                "caching",
+                "couchdb",
+                "memcached",
+                "php",
+                "redis",
+                "xcache"
             ],
-            "time": "2018-08-21T18:01:43+00:00"
+            "time": "2019-11-29T15:36:20+00:00"
         },
         {
             "name": "doctrine/collections",
@@ -365,16 +373,16 @@
         },
         {
             "name": "doctrine/common",
-            "version": "v2.10.0",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "30e33f60f64deec87df728c02b107f82cdafad9d"
+                "reference": "2053eafdf60c2172ee1373d1b9289ba1db7f1fc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d",
-                "reference": "30e33f60f64deec87df728c02b107f82cdafad9d",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/2053eafdf60c2172ee1373d1b9289ba1db7f1fc6",
+                "reference": "2053eafdf60c2172ee1373d1b9289ba1db7f1fc6",
                 "shasum": ""
             },
             "require": {
@@ -390,14 +398,16 @@
             },
             "require-dev": {
                 "doctrine/coding-standard": "^1.0",
-                "phpunit/phpunit": "^6.3",
+                "phpstan/phpstan": "^0.11",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpunit/phpunit": "^7.0",
                 "squizlabs/php_codesniffer": "^3.0",
                 "symfony/phpunit-bridge": "^4.0.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev"
+                    "dev-master": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -410,6 +420,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -418,10 +432,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -442,20 +452,20 @@
                 "doctrine",
                 "php"
             ],
-            "time": "2018-11-21T01:24:55+00:00"
+            "time": "2020-01-10T15:49:25+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.9.2",
+            "version": "v2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9"
+                "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
-                "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/7345cd59edfa2036eb0fa4264b77ae2576842035",
+                "reference": "7345cd59edfa2036eb0fa4264b77ae2576842035",
                 "shasum": ""
             },
             "require": {
@@ -495,6 +505,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -503,10 +517,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -524,20 +534,20 @@
                 "php",
                 "queryobject"
             ],
-            "time": "2018-12-31T03:27:51+00:00"
+            "time": "2019-11-02T22:19:34+00:00"
         },
         {
             "name": "doctrine/event-manager",
-            "version": "v1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
+                "reference": "629572819973f13486371cb611386eb17851e85c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
-                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c",
+                "reference": "629572819973f13486371cb611386eb17851e85c",
                 "shasum": ""
             },
             "require": {
@@ -547,7 +557,7 @@
                 "doctrine/common": "<2.9@dev"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^4.0",
+                "doctrine/coding-standard": "^6.0",
                 "phpunit/phpunit": "^7.0"
             },
             "type": "library",
@@ -566,6 +576,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -574,10 +588,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -591,27 +601,29 @@
                     "email": "ocramius@gmail.com"
                 }
             ],
-            "description": "Doctrine Event Manager component",
+            "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
             "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
             "keywords": [
                 "event",
-                "eventdispatcher",
-                "eventmanager"
+                "event dispatcher",
+                "event manager",
+                "event system",
+                "events"
             ],
-            "time": "2018-06-11T11:59:03+00:00"
+            "time": "2019-11-10T09:48:07+00:00"
         },
         {
             "name": "doctrine/inflector",
-            "version": "v1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
+                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
+                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
                 "shasum": ""
             },
             "require": {
@@ -636,6 +648,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -644,10 +660,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -665,20 +677,20 @@
                 "singularize",
                 "string"
             ],
-            "time": "2018-01-09T20:05:19+00:00"
+            "time": "2019-10-30T19:59:35+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
                 "shasum": ""
             },
             "require": {
@@ -721,25 +733,28 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-03-17T17:37:11+00:00"
+            "time": "2019-10-21T16:45:58+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "v1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -747,8 +762,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -769,44 +784,49 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
             "keywords": [
+                "annotations",
+                "docblock",
                 "lexer",
-                "parser"
+                "parser",
+                "php"
             ],
-            "time": "2014-09-09T13:34:57+00:00"
+            "time": "2019-06-08T11:03:04+00:00"
         },
         {
             "name": "doctrine/orm",
-            "version": "v2.6.3",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/orm.git",
-                "reference": "434820973cadf2da2d66e7184be370084cc32ca8"
+                "reference": "dafe298ce5d0b995ebe1746670704c0a35868a6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/orm/zipball/434820973cadf2da2d66e7184be370084cc32ca8",
-                "reference": "434820973cadf2da2d66e7184be370084cc32ca8",
+                "url": "https://api.github.com/repos/doctrine/orm/zipball/dafe298ce5d0b995ebe1746670704c0a35868a6a",
+                "reference": "dafe298ce5d0b995ebe1746670704c0a35868a6a",
                 "shasum": ""
             },
             "require": {
-                "doctrine/annotations": "~1.5",
-                "doctrine/cache": "~1.6",
-                "doctrine/collections": "^1.4",
-                "doctrine/common": "^2.7.1",
-                "doctrine/dbal": "^2.6",
-                "doctrine/instantiator": "~1.1",
+                "doctrine/annotations": "^1.8",
+                "doctrine/cache": "^1.9.1",
+                "doctrine/collections": "^1.5",
+                "doctrine/common": "^2.11",
+                "doctrine/dbal": "^2.9.3",
+                "doctrine/event-manager": "^1.1",
+                "doctrine/instantiator": "^1.3",
+                "doctrine/persistence": "^1.2",
                 "ext-pdo": "*",
+                "ocramius/package-versions": "^1.2",
                 "php": "^7.1",
-                "symfony/console": "~3.0|~4.0"
+                "symfony/console": "^3.0|^4.0|^5.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^1.0",
-                "phpunit/phpunit": "^6.5",
-                "squizlabs/php_codesniffer": "^3.2",
-                "symfony/yaml": "~3.4|~4.0"
+                "doctrine/coding-standard": "^5.0",
+                "phpunit/phpunit": "^7.5",
+                "symfony/yaml": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
@@ -817,7 +837,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev"
+                    "dev-master": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -830,6 +850,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -838,10 +862,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -852,25 +872,39 @@
                 }
             ],
             "description": "Object-Relational-Mapper for PHP",
-            "homepage": "http://www.doctrine-project.org",
+            "homepage": "https://www.doctrine-project.org/projects/orm.html",
             "keywords": [
                 "database",
                 "orm"
             ],
-            "time": "2018-11-20T23:46:46+00:00"
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine/orm",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-19T06:41:02+00:00"
         },
         {
             "name": "doctrine/persistence",
-            "version": "1.1.1",
+            "version": "1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/persistence.git",
-                "reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48"
+                "reference": "0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/persistence/zipball/3da7c9d125591ca83944f477e65ed3d7b4617c48",
-                "reference": "3da7c9d125591ca83944f477e65ed3d7b4617c48",
+                "url": "https://api.github.com/repos/doctrine/persistence/zipball/0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0",
+                "reference": "0af483f91bada1c9ded6c2cfd26ab7d5ab2094e0",
                 "shasum": ""
             },
             "require": {
@@ -878,26 +912,27 @@
                 "doctrine/cache": "^1.0",
                 "doctrine/collections": "^1.0",
                 "doctrine/event-manager": "^1.0",
-                "doctrine/reflection": "^1.0",
+                "doctrine/reflection": "^1.2",
                 "php": "^7.1"
             },
             "conflict": {
                 "doctrine/common": "<2.10@dev"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^5.0",
-                "phpstan/phpstan": "^0.8",
+                "doctrine/coding-standard": "^6.0",
+                "phpstan/phpstan": "^0.11",
                 "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                    "Doctrine\\Common\\": "lib/Doctrine/Common",
+                    "Doctrine\\Persistence\\": "lib/Doctrine/Persistence"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -905,6 +940,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -913,10 +952,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -939,20 +974,34 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2019-04-23T08:28:24+00:00"
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-21T15:13:52+00:00"
         },
         {
             "name": "doctrine/reflection",
-            "version": "v1.0.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/reflection.git",
-                "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6"
+                "reference": "55e71912dfcd824b2fdd16f2d9afe15684cfce79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6",
-                "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6",
+                "url": "https://api.github.com/repos/doctrine/reflection/zipball/55e71912dfcd824b2fdd16f2d9afe15684cfce79",
+                "reference": "55e71912dfcd824b2fdd16f2d9afe15684cfce79",
                 "shasum": ""
             },
             "require": {
@@ -960,18 +1009,20 @@
                 "ext-tokenizer": "*",
                 "php": "^7.1"
             },
+            "conflict": {
+                "doctrine/common": "<2.9"
+            },
             "require-dev": {
-                "doctrine/coding-standard": "^4.0",
-                "doctrine/common": "^2.8",
-                "phpstan/phpstan": "^0.9.2",
-                "phpstan/phpstan-phpunit": "^0.9.4",
-                "phpunit/phpunit": "^7.0",
-                "squizlabs/php_codesniffer": "^3.0"
+                "doctrine/coding-standard": "^5.0",
+                "doctrine/common": "^2.10",
+                "phpstan/phpstan": "^0.11.0",
+                "phpstan/phpstan-phpunit": "^0.11.0",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -984,6 +1035,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -992,10 +1047,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -1009,47 +1060,51 @@
                     "email": "ocramius@gmail.com"
                 }
             ],
-            "description": "Doctrine Reflection component",
+            "description": "The Doctrine Reflection project is a simple library used by the various Doctrine projects which adds some additional functionality on top of the reflection functionality that comes with PHP. It allows you to get the reflection information about classes, methods and properties statically.",
             "homepage": "https://www.doctrine-project.org/projects/reflection.html",
             "keywords": [
-                "reflection"
+                "reflection",
+                "static"
             ],
-            "time": "2018-06-14T14:45:07+00:00"
+            "time": "2020-03-27T11:06:43+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
-            "version": "0.9.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/njh/easyrdf.git",
-                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
+                "url": "https://github.com/omeka/easyrdf.git",
+                "reference": "8227c6426c55284fb8b7eaf68c078bb0cd578392"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
-                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
+                "url": "https://api.github.com/repos/omeka/easyrdf/zipball/8227c6426c55284fb8b7eaf68c078bb0cd578392",
+                "reference": "8227c6426c55284fb8b7eaf68c078bb0cd578392",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "ext-pcre": "*",
-                "php": ">=5.2.8"
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~3.5",
-                "sami/sami": "~1.4",
-                "squizlabs/php_codesniffer": "~1.4.3"
+                "ml/json-ld": "~1.0",
+                "phpunit/phpunit": "~4.8.36|^6|^7",
+                "sami/sami": "~2.0",
+                "semsol/arc2": "~2.2",
+                "squizlabs/php_codesniffer": "~1.4.3",
+                "zendframework/zend-http": "~2.3"
             },
             "suggest": {
-                "ml/json-ld": "~1.0"
+                "ml/json-ld": "~1.0",
+                "semsol/arc2": "~2.2"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "EasyRdf_": "lib/"
+                "psr-4": {
+                    "EasyRdf\\": "lib"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
@@ -1063,6 +1118,7 @@
                 {
                     "name": "Alexey Zakhlestin",
                     "email": "indeyets@gmail.com",
+                    "homepage": "http://indeyets.ru/",
                     "role": "Developer"
                 }
             ],
@@ -1071,32 +1127,38 @@
             "keywords": [
                 "Linked Data",
                 "RDF",
+                "RDFa",
+                "SPARQL",
                 "Semantic Web",
-                "Turtle",
-                "rdfa",
-                "sparql"
+                "Turtle"
             ],
-            "time": "2015-02-27T09:45:49+00:00"
+            "support": {
+                "forum": "http://groups.google.com/group/easyrdf/",
+                "issues": "http://github.com/njh/easyrdf/issues",
+                "irc": "irc://chat.freenode.net/easyrdf",
+                "source": "https://github.com/omeka/easyrdf/tree/master"
+            },
+            "time": "2019-11-27T10:53:52+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.10.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2"
             },
             "require-dev": {
-                "simpletest/simpletest": "^1.1"
+                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
             },
             "type": "library",
             "autoload": {
@@ -1109,7 +1171,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL"
+                "LGPL-2.1-or-later"
             ],
             "authors": [
                 {
@@ -1123,3945 +1185,4213 @@
             "keywords": [
                 "html"
             ],
-            "time": "2018-02-23T01:58:20+00:00"
+            "time": "2019-10-28T03:44:26+00:00"
         },
         {
-            "name": "lsolesen/pel",
-            "version": "0.9.6",
+            "name": "laminas/laminas-authentication",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/lsolesen/pel.git",
-                "reference": "c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23"
+                "url": "https://github.com/laminas/laminas-authentication.git",
+                "reference": "53505e07858d243792b96be763456f786d953501"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lsolesen/pel/zipball/c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23",
-                "reference": "c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23",
+                "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/53505e07858d243792b96be763456f786d953501",
+                "reference": "53505e07858d243792b96be763456f786d953501",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.0.0"
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-authentication": "self.version"
             },
             "require-dev": {
-                "ext-gd": "*",
-                "phpunit/phpunit": "5.7.*",
-                "satooshi/php-coveralls": "1.0.*",
-                "squizlabs/php_codesniffer": "3.0.0RC3"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-crypt": "^2.6 || ^3.2.1",
+                "laminas/laminas-db": "^2.8.2",
+                "laminas/laminas-http": "^2.7",
+                "laminas/laminas-ldap": "^2.8",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-uri": "^2.5.2",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "laminas/laminas-crypt": "Laminas\\Crypt component",
+                "laminas/laminas-db": "Laminas\\Db component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-ldap": "Laminas\\Ldap component",
+                "laminas/laminas-session": "Laminas\\Session component",
+                "laminas/laminas-uri": "Laminas\\Uri component",
+                "laminas/laminas-validator": "Laminas\\Validator component"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "lsolesen\\pel\\": "src/"
+                    "Laminas\\Authentication\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Lars Olesen",
-                    "role": "Developer",
-                    "email": "lars@intraface.dk",
-                    "homepage": "http://intraface.dk"
-                },
-                {
-                    "name": "Martin Geisler",
-                    "role": "Developer",
-                    "email": "martin@geisler.net",
-                    "homepage": "http://geisler.net"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.",
-            "homepage": "http://lsolesen.github.com/pel/",
+            "description": "provides an API for authentication and includes concrete authentication adapters for common use case scenarios",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "exif",
-                "image"
+                "Authentication",
+                "laminas"
             ],
-            "time": "2017-02-03T11:58:58+00:00"
+            "time": "2019-12-31T16:14:48+00:00"
         },
         {
-            "name": "ml/iri",
-            "version": "1.1.4",
-            "target-dir": "ML/IRI",
+            "name": "laminas/laminas-barcode",
+            "version": "2.8.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/lanthaler/IRI.git",
-                "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341"
+                "url": "https://github.com/laminas/laminas-barcode.git",
+                "reference": "7806b774328a32b1f121f2972c72a0ded85939e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/IRI/zipball/cbd44fa913e00ea624241b38cefaa99da8d71341",
-                "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341",
+                "url": "https://api.github.com/repos/laminas/laminas-barcode/zipball/7806b774328a32b1f121f2972c72a0ded85939e1",
+                "reference": "7806b774328a32b1f121f2972c72a0ded85939e1",
                 "shasum": ""
             },
             "require": {
-                "lib-pcre": ">=4.0",
-                "php": ">=5.3.0"
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "laminas/laminas-validator": "^2.10.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-barcode": "^2.8.0"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6 || ^3.1",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.5.20",
+                "zendframework/zendpdf": "^2.0.2"
+            },
+            "suggest": {
+                "zendframework/zendpdf": "ZendPdf component"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "ML\\IRI": ""
+                "psr-4": {
+                    "Laminas\\Barcode\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Markus Lanthaler",
-                    "email": "mail@markus-lanthaler.com",
-                    "homepage": "http://www.markus-lanthaler.com",
-                    "role": "Developer"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "IRI handling for PHP",
-            "homepage": "http://www.markus-lanthaler.com",
+            "description": "Programmatically create and render barcodes as images or in PDFs",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "URN",
-                "iri",
-                "uri",
-                "url"
+                "barcode",
+                "laminas"
             ],
-            "time": "2014-01-21T13:43:39+00:00"
+            "time": "2020-03-29T11:59:03+00:00"
         },
         {
-            "name": "ml/json-ld",
-            "version": "1.1.0",
+            "name": "laminas/laminas-cache",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "b5f82820c255cb64067b1c7adbb819cad4afa70a"
+                "url": "https://github.com/laminas/laminas-cache.git",
+                "reference": "f4746a868c3e2f2da63c19d23efac12b9d1bb554"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/b5f82820c255cb64067b1c7adbb819cad4afa70a",
-                "reference": "b5f82820c255cb64067b1c7adbb819cad4afa70a",
+                "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/f4746a868c3e2f2da63c19d23efac12b9d1bb554",
+                "reference": "f4746a868c3e2f2da63c19d23efac12b9d1bb554",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "ml/iri": "^1.1.1",
-                "php": ">=5.3.0"
+                "laminas/laminas-eventmanager": "^2.6.3 || ^3.2",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "psr/cache": "^1.0",
+                "psr/simple-cache": "^1.0"
+            },
+            "provide": {
+                "psr/cache-implementation": "1.0",
+                "psr/simple-cache-implementation": "1.0"
+            },
+            "replace": {
+                "zendframework/zend-cache": "self.version"
             },
             "require-dev": {
-                "json-ld/tests": "1.0",
-                "phpunit/phpunit": "^4"
+                "cache/integration-tests": "^0.16",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-serializer": "^2.6",
+                "laminas/laminas-session": "^2.7.4",
+                "phpbench/phpbench": "^0.13",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ML\\JsonLD\\": ""
-                }
+            "suggest": {
+                "ext-apc": "APC or compatible extension, to use the APC storage adapter",
+                "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
+                "ext-dba": "DBA, to use the DBA storage adapter",
+                "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
+                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
+                "ext-mongo": "Mongo, to use MongoDb storage adapter",
+                "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter",
+                "ext-redis": "Redis, to use Redis storage adapter",
+                "ext-wincache": "WinCache, to use the WinCache storage adapter",
+                "ext-xcache": "XCache, to use the XCache storage adapter",
+                "laminas/laminas-serializer": "Laminas\\Serializer component",
+                "laminas/laminas-session": "Laminas\\Session component",
+                "mongodb/mongodb": "Required for use with the ext-mongodb adapter",
+                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Markus Lanthaler",
-                    "email": "mail@markus-lanthaler.com",
-                    "homepage": "http://www.markus-lanthaler.com",
-                    "role": "Developer"
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Cache",
+                    "config-provider": "Laminas\\Cache\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "autoload/patternPluginManagerPolyfill.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Cache\\": "src/"
                 }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
             ],
-            "description": "JSON-LD Processor for PHP",
-            "homepage": "http://www.markus-lanthaler.com",
+            "description": "Caching implementation with a variety of storage options, as well as codified caching strategies for callbacks, classes, and output",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "JSON-LD",
-                "jsonld"
+                "cache",
+                "laminas",
+                "psr-16",
+                "psr-6"
             ],
-            "time": "2018-11-18T20:26:18+00:00"
+            "time": "2019-12-31T16:23:18+00:00"
         },
         {
-            "name": "omeka-s-themes/default",
-            "version": "dev-develop",
+            "name": "laminas/laminas-captcha",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/omeka-s-themes/default.git",
-                "reference": "5624d4ce3b0119e448d3e5f151a22c5bdfe331b2"
+                "url": "https://github.com/laminas/laminas-captcha.git",
+                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/omeka-s-themes/default/zipball/5624d4ce3b0119e448d3e5f151a22c5bdfe331b2",
-                "reference": "5624d4ce3b0119e448d3e5f151a22c5bdfe331b2",
+                "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/b88f650f3adf2d902ef56f6377cceb5cd87b9876",
+                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876",
                 "shasum": ""
             },
             "require": {
-                "omeka/omeka-s": "*"
+                "laminas/laminas-math": "^2.7 || ^3.0",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "type": "omeka-s-theme",
-            "support": {
-                "source": "https://github.com/omeka-s-themes/default/tree/v1.4.1",
-                "issues": "https://github.com/omeka-s-themes/default/issues"
+            "replace": {
+                "zendframework/zend-captcha": "self.version"
             },
-            "time": "2019-08-07T17:30:22+00:00"
-        },
-        {
-            "name": "omeka/composer-addon-installer",
-            "version": "1.0",
-            "dist": {
-                "type": "path",
-                "url": "application/data/composer-addon-installer",
-                "reference": "acaf7604e506ac3a4cba691e89e8e2527d0d8194"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-recaptcha": "^3.0",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-text": "^2.6",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
-            "require": {
-                "composer-plugin-api": "^1.0"
+            "suggest": {
+                "laminas/laminas-i18n-resources": "Translations of captcha messages",
+                "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
+                "laminas/laminas-session": "Laminas\\Session component",
+                "laminas/laminas-text": "Laminas\\Text component",
+                "laminas/laminas-validator": "Laminas\\Validator component"
             },
-            "type": "composer-plugin",
+            "type": "library",
             "extra": {
-                "class": "Omeka\\Composer\\AddonInstallerPlugin"
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                }
             },
             "autoload": {
                 "psr-4": {
-                    "Omeka\\Composer\\": "src/"
+                    "Laminas\\Captcha\\": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL-3.0"
-            ]
+                "BSD-3-Clause"
+            ],
+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "captcha",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:24:14+00:00"
         },
         {
-            "name": "paragonie/random_compat",
-            "version": "v9.99.99",
+            "name": "laminas/laminas-code",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+                "url": "https://github.com/laminas/laminas-code.git",
+                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766",
+                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766",
                 "shasum": ""
             },
             "require": {
-                "php": "^7"
+                "laminas/laminas-eventmanager": "^2.6 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.1"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0"
+            },
+            "replace": {
+                "zendframework/zend-code": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
+                "doctrine/annotations": "^1.7",
+                "ext-phar": "*",
+                "laminas/laminas-coding-standard": "^1.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "phpunit/phpunit": "^7.5.16 || ^8.4"
             },
             "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+                "laminas/laminas-stdlib": "Laminas\\Stdlib component"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4.x-dev",
+                    "dev-develop": "3.5.x-dev",
+                    "dev-dev-4.0": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Code\\": "src/"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
+                "code",
+                "laminas"
             ],
-            "time": "2018-07-02T15:55:56+00:00"
+            "time": "2019-12-31T16:28:24+00:00"
         },
         {
-            "name": "psr/cache",
-            "version": "1.0.1",
+            "name": "laminas/laminas-config",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "url": "https://github.com/laminas/laminas-config.git",
+                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/laminas/laminas-config/zipball/71ba6d5dd703196ce66b25abc4d772edb094dae1",
+                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-config": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-i18n": "^2.5",
+                "laminas/laminas-json": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-i18n": "Laminas\\I18n component",
+                "laminas/laminas-json": "Laminas\\Json to use the Json reader or writer classes",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Cache\\": "src/"
+                    "Laminas\\Config\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Common interface for caching libraries",
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
+                "config",
+                "laminas"
             ],
-            "time": "2016-08-06T20:24:11+00:00"
+            "time": "2019-12-31T16:30:04+00:00"
         },
         {
-            "name": "psr/container",
-            "version": "1.0.0",
+            "name": "laminas/laminas-console",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "url": "https://github.com/laminas/laminas-console.git",
+                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/laminas/laminas-console/zipball/478a6ceac3e31fb38d6314088abda8b239ee23a5",
+                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-console": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-filter": "^2.7.2",
+                "laminas/laminas-json": "^2.6 || ^3.0",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3"
+            },
+            "suggest": {
+                "laminas/laminas-filter": "To support DefaultRouteMatcher usage",
+                "laminas/laminas-validator": "To support DefaultRouteMatcher usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Container\\": "src/"
+                    "Laminas\\Console\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
+                "console",
+                "laminas"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "time": "2019-12-31T16:31:45+00:00"
         },
         {
-            "name": "psr/log",
-            "version": "1.1.0",
+            "name": "laminas/laminas-crypt",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "url": "https://github.com/laminas/laminas-crypt.git",
+                "reference": "5f5dfe3ca08c965cc1f44f95831a83a81a93bf78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/5f5dfe3ca08c965cc1f44f95831a83a81a93bf78",
+                "reference": "5f5dfe3ca08c965cc1f44f95831a83a81a93bf78",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "container-interop/container-interop": "^1.2",
+                "ext-mbstring": "*",
+                "laminas/laminas-math": "^3.0",
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-crypt": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "ext-openssl": "Required for most features of Laminas\\Crypt"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.3.x-dev",
+                    "dev-develop": "3.4.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Laminas\\Crypt\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
+            "description": "Strong cryptography tools and password hashing",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "log",
-                "psr",
-                "psr-3"
+                "crypt",
+                "laminas"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-12-31T16:33:24+00:00"
         },
         {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
+            "name": "laminas/laminas-db",
+            "version": "2.11.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+                "url": "https://github.com/laminas/laminas-db.git",
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "url": "https://api.github.com/repos/laminas/laminas-db/zipball/6c4238918b9204db1eb8cafae2c1940d40f4c007",
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-db": "^2.11.0"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14"
+            },
+            "suggest": {
+                "laminas/laminas-eventmanager": "Laminas\\EventManager component",
+                "laminas/laminas-hydrator": "Laminas\\Hydrator component for using HydratingResultSets",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Db",
+                    "config-provider": "Laminas\\Db\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
+                    "Laminas\\Db\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Common interfaces for simple caching",
+            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
+                "db",
+                "laminas"
             ],
-            "time": "2017-10-23T01:57:42+00:00"
+            "time": "2020-03-29T12:08:51+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v3.4.28",
+            "name": "laminas/laminas-di",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "8e1d1e406dd31727fa70cd5a99cda202e9d6a5c6"
+                "url": "https://github.com/laminas/laminas-di.git",
+                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8e1d1e406dd31727fa70cd5a99cda202e9d6a5c6",
-                "reference": "8e1d1e406dd31727fa70cd5a99cda202e9d6a5c6",
+                "url": "https://api.github.com/repos/laminas/laminas-di/zipball/239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
+                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-code": "^2.6 || ^3.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
+                "php": "^5.5 || ^7.0"
             },
-            "provide": {
-                "psr/log-implementation": "1.0"
+            "replace": {
+                "zendframework/zend-di": "self.version"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Laminas\\Di\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "di",
+                "laminas"
             ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-05-09T08:42:51+00:00"
+            "time": "2019-12-31T15:17:33+00:00"
         },
         {
-            "name": "symfony/debug",
-            "version": "v3.4.28",
+            "name": "laminas/laminas-dom",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "671fc55bd14800668b1d0a3708c3714940e30a8c"
+                "url": "https://github.com/laminas/laminas-dom.git",
+                "reference": "631fa74ae6f68e9019b73512f1b3b139d43f3572"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/671fc55bd14800668b1d0a3708c3714940e30a8c",
-                "reference": "671fc55bd14800668b1d0a3708c3714940e30a8c",
+                "url": "https://api.github.com/repos/laminas/laminas-dom/zipball/631fa74ae6f68e9019b73512f1b3b139d43f3572",
+                "reference": "631fa74ae6f68e9019b73512f1b3b139d43f3572",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            "replace": {
+                "zendframework/zend-dom": "self.version"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Laminas\\Dom\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
+            "description": "provides tools for working with DOM documents and structures",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "dom",
+                "laminas"
             ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-05-18T13:32:47+00:00"
+            "time": "2019-12-31T16:43:02+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.11.0",
+            "name": "laminas/laminas-escaper",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+                "url": "https://github.com/laminas/laminas-escaper.git",
+                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
+                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "suggest": {
-                "ext-mbstring": "For best performance"
+            "replace": {
+                "zendframework/zend-escaper": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
+                    "Laminas\\Escaper\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
+                "escaper",
+                "laminas"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2019-12-31T16:43:30+00:00"
         },
         {
-            "name": "true/punycode",
-            "version": "v2.1.1",
+            "name": "laminas/laminas-eventmanager",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/true/php-punycode.git",
-                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
+                "url": "https://github.com/laminas/laminas-eventmanager.git",
+                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
+                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
-                "symfony/polyfill-mbstring": "^1.3"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-eventmanager": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.7",
-                "squizlabs/php_codesniffer": "~2.0"
+                "athletic/athletic": "^0.1",
+                "container-interop/container-interop": "^1.1.0",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-stdlib": "^2.7.3 || ^3.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+                "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev",
+                    "dev-develop": "3.3-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "TrueBV\\": "src/"
+                    "Laminas\\EventManager\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Renan Gonçalves",
-                    "email": "renan.saddam@gmail.com"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
-            "homepage": "https://github.com/true/php-punycode",
+            "description": "Trigger and listen to events within a PHP application",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "idna",
-                "punycode"
+                "event",
+                "eventmanager",
+                "events",
+                "laminas"
             ],
-            "time": "2016-11-16T10:37:54+00:00"
+            "time": "2019-12-31T16:44:52+00:00"
         },
         {
-            "name": "zendframework/zend-authentication",
-            "version": "2.7.0",
+            "name": "laminas/laminas-feed",
+            "version": "2.12.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-authentication.git",
-                "reference": "1f379f6384fca34b3bfe94d953abd65e9e7ee746"
+                "url": "https://github.com/laminas/laminas-feed.git",
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-authentication/zipball/1f379f6384fca34b3bfe94d953abd65e9e7ee746",
-                "reference": "1f379f6384fca34b3bfe94d953abd65e9e7ee746",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^3.2.1"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "laminas/laminas-escaper": "^2.5.2",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-feed": "^2.12.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-crypt": "^2.6 || ^3.2.1",
-                "zendframework/zend-db": "^2.8.2",
-                "zendframework/zend-http": "^2.7",
-                "zendframework/zend-ldap": "^2.8",
-                "zendframework/zend-session": "^2.8",
-                "zendframework/zend-uri": "^2.5.2",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-cache": "^2.7.2",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.8.2",
+                "laminas/laminas-http": "^2.7",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+                "psr/http-message": "^1.0.1"
             },
             "suggest": {
-                "zendframework/zend-crypt": "Zend\\Crypt component",
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-ldap": "Zend\\Ldap component",
-                "zendframework/zend-session": "Zend\\Session component",
-                "zendframework/zend-uri": "Zend\\Uri component",
-                "zendframework/zend-validator": "Zend\\Validator component"
+                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Authentication\\": "src/"
+                    "Laminas\\Feed\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an API for authentication and includes concrete authentication adapters for common use case scenarios",
+            "description": "provides functionality for consuming RSS and Atom feeds",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "Authentication",
-                "ZendFramework",
-                "zf"
+                "feed",
+                "laminas"
             ],
-            "time": "2019-05-14T18:06:07+00:00"
+            "time": "2020-03-29T12:36:29+00:00"
         },
         {
-            "name": "zendframework/zend-barcode",
-            "version": "2.7.0",
+            "name": "laminas/laminas-file",
+            "version": "2.8.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-barcode.git",
-                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf"
+                "url": "https://github.com/laminas/laminas-file.git",
+                "reference": "cb0bf270cc3e7a4d7dd780b573e2481a09951993"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-barcode/zipball/50f24f604ef2172a0127efe91e786bc2caf2e8cf",
-                "reference": "50f24f604ef2172a0127efe91e786bc2caf2e8cf",
+                "url": "https://api.github.com/repos/laminas/laminas-file/zipball/cb0bf270cc3e7a4d7dd780b573e2481a09951993",
+                "reference": "cb0bf270cc3e7a4d7dd780b573e2481a09951993",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-file": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6 || ^3.1",
-                "zendframework/zendpdf": "^2.0.2"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-filter": "^2.7.2",
+                "laminas/laminas-i18n": "^2.7.4",
+                "laminas/laminas-progressbar": "^2.5.2",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
             "suggest": {
-                "zendframework/zendpdf": "ZendPdf component"
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-i18n": "Laminas\\I18n component",
+                "laminas/laminas-validator": "Laminas\\Validator component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Barcode\\": "src/"
+                    "Laminas\\File\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a generic way to generate barcodes",
+            "description": "Locate PHP classfiles",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "barcode",
-                "zf"
+                "file",
+                "laminas"
             ],
-            "time": "2017-12-11T15:30:02+00:00"
+            "time": "2019-12-31T16:51:52+00:00"
         },
         {
-            "name": "zendframework/zend-cache",
-            "version": "2.8.2",
+            "name": "laminas/laminas-filter",
+            "version": "2.9.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-cache.git",
-                "reference": "4983dff629956490c78b88adcc8ece4711d7d8a3"
+                "url": "https://github.com/laminas/laminas-filter.git",
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/4983dff629956490c78b88adcc8ece4711d7d8a3",
-                "reference": "4983dff629956490c78b88adcc8ece4711d7d8a3",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3c4476e772a062cef7531c6793377ae585d89c82",
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
-                "zendframework/zend-eventmanager": "^2.6.3 || ^3.2",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "provide": {
-                "psr/cache-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0"
+            "conflict": {
+                "laminas/laminas-validator": "<2.10.1"
+            },
+            "replace": {
+                "zendframework/zend-filter": "^2.9.2"
             },
             "require-dev": {
-                "cache/integration-tests": "^0.16",
-                "phpbench/phpbench": "^0.13",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-serializer": "^2.6",
-                "zendframework/zend-session": "^2.7.4"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-crypt": "^3.2.1",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-uri": "^2.6",
+                "pear/archive_tar": "^1.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-factory": "^1.0"
             },
             "suggest": {
-                "ext-apc": "APC or compatible extension, to use the APC storage adapter",
-                "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
-                "ext-dba": "DBA, to use the DBA storage adapter",
-                "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
-                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
-                "ext-mongo": "Mongo, to use MongoDb storage adapter",
-                "ext-mongodb": "MongoDB, to use the ExtMongoDb storage adapter",
-                "ext-redis": "Redis, to use Redis storage adapter",
-                "ext-wincache": "WinCache, to use the WinCache storage adapter",
-                "ext-xcache": "XCache, to use the XCache storage adapter",
-                "mongodb/mongodb": "Required for use with the ext-mongodb adapter",
-                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-session": "Zend\\Session component"
+                "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
+                "laminas/laminas-i18n": "Laminas\\I18n component for filters depending on i18n functionality",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for using the filter chain functionality",
+                "laminas/laminas-uri": "Laminas\\Uri component, for the UriNormalize filter",
+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Cache",
-                    "config-provider": "Zend\\Cache\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Filter",
+                    "config-provider": "Laminas\\Filter\\ConfigProvider"
                 }
             },
             "autoload": {
-                "files": [
-                    "autoload/patternPluginManagerPolyfill.php"
-                ],
                 "psr-4": {
-                    "Zend\\Cache\\": "src/"
+                    "Laminas\\Filter\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Caching implementation with a variety of storage options, as well as codified caching strategies for callbacks, classes, and output",
+            "description": "Programmatically filter and normalize data and files",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "cache",
-                "psr-16",
-                "psr-6",
-                "zf"
+                "filter",
+                "laminas"
             ],
-            "time": "2018-05-01T21:58:00+00:00"
+            "time": "2020-03-29T12:41:29+00:00"
         },
         {
-            "name": "zendframework/zend-captcha",
-            "version": "2.8.0",
+            "name": "laminas/laminas-form",
+            "version": "2.14.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-captcha.git",
-                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
+                "url": "https://github.com/laminas/laminas-form.git",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
-                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-math": "^2.7 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+                "laminas/laminas-inputfilter": "^2.8",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-form": "^2.14.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-session": "^2.8",
-                "zendframework/zend-text": "^2.6",
-                "zendframework/zend-validator": "^2.10.1",
-                "zendframework/zendservice-recaptcha": "^3.0"
+                "doctrine/annotations": "~1.0",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-captcha": "^2.7.1",
+                "laminas/laminas-code": "^2.6 || ^3.0",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-recaptcha": "^3.0.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8.1",
+                "laminas/laminas-text": "^2.6",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-view": "^2.6.2",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
             },
             "suggest": {
-                "zendframework/zend-i18n-resources": "Translations of captcha messages",
-                "zendframework/zend-session": "Zend\\Session component",
-                "zendframework/zend-text": "Zend\\Text component",
-                "zendframework/zend-validator": "Zend\\Validator component",
-                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
+                "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements",
+                "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support",
+                "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers",
+                "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
+                "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.14.x-dev",
+                    "dev-develop": "2.15.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Form",
+                    "config-provider": "Laminas\\Form\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Captcha\\": "src/"
-                }
+                    "Laminas\\Form\\": "src/"
+                },
+                "files": [
+                    "autoload/formElementManagerPolyfill.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
+            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "captcha",
-                "zf"
+                "form",
+                "laminas"
             ],
-            "time": "2018-04-24T17:24:10+00:00"
+            "time": "2020-03-29T12:46:16+00:00"
         },
         {
-            "name": "zendframework/zend-code",
-            "version": "3.3.1",
+            "name": "laminas/laminas-http",
+            "version": "2.11.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-code.git",
-                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb"
+                "url": "https://github.com/laminas/laminas-http.git",
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb",
-                "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
-                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
+                "laminas/laminas-loader": "^2.5.1",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-uri": "^2.5.2",
+                "laminas/laminas-validator": "^2.10.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-http": "self.version"
             },
             "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "zendframework/zend-coding-standard": "^1.0.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^3.1 || ^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3"
             },
             "suggest": {
-                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+                "paragonie/certainty": "For automated management of cacert.pem"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3.x-dev",
-                    "dev-develop": "3.4.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Code\\": "src/"
+                    "Laminas\\Http\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides facilities to generate arbitrary code using an object oriented interface",
-            "homepage": "https://github.com/zendframework/zend-code",
+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "code",
-                "zf2"
+                "http",
+                "http client",
+                "laminas"
             ],
-            "time": "2018-08-13T20:36:59+00:00"
+            "time": "2019-12-31T17:02:36+00:00"
         },
         {
-            "name": "zendframework/zend-config",
-            "version": "2.6.0",
+            "name": "laminas/laminas-hydrator",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-config.git",
-                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
+                "url": "https://github.com/laminas/laminas-hydrator.git",
+                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
-                "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/4a0e81cf05f32edcace817f1f48cb4055f689d85",
+                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-stdlib": "^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-hydrator": "self.version"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-i18n": "^2.5",
-                "zendframework/zend-json": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-inputfilter": "^2.6",
+                "laminas/laminas-serializer": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
             "suggest": {
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
+                "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
+                "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-release-2.4": "2.4.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Hydrator",
+                    "config-provider": "Laminas\\Hydrator\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Config\\": "src/"
+                    "Laminas\\Hydrator\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-            "homepage": "https://github.com/zendframework/zend-config",
+            "description": "Serialize objects to arrays, and vice versa",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "config",
-                "zf2"
+                "hydrator",
+                "laminas"
             ],
-            "time": "2016-02-04T23:01:10+00:00"
+            "time": "2019-12-31T17:06:38+00:00"
         },
         {
-            "name": "zendframework/zend-console",
-            "version": "2.8.0",
+            "name": "laminas/laminas-i18n",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-console.git",
-                "reference": "95817ae78f73c48026972e350a2ecc31c6d9f9ae"
+                "url": "https://github.com/laminas/laminas-i18n.git",
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-console/zipball/95817ae78f73c48026972e350a2ecc31c6d9f9ae",
-                "reference": "95817ae78f73c48026972e350a2ecc31c6d9f9ae",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/94ff957a1366f5be94f3d3a9b89b50386649e3ae",
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^3.2.1"
+                "ext-intl": "*",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0"
+            },
+            "replace": {
+                "zendframework/zend-i18n": "^2.10.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-filter": "^2.7.2",
-                "zendframework/zend-json": "^2.6 || ^3.0",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-view": "^2.6.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
             },
             "suggest": {
-                "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-                "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
+                "laminas/laminas-cache": "Laminas\\Cache component",
+                "laminas/laminas-config": "Laminas\\Config component",
+                "laminas/laminas-eventmanager": "You should install this package to use the events in the translator",
+                "laminas/laminas-filter": "You should install this package to use the provided filters",
+                "laminas/laminas-i18n-resources": "Translation resources",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-validator": "You should install this package to use the provided validators",
+                "laminas/laminas-view": "You should install this package to use the provided view helpers"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\I18n",
+                    "config-provider": "Laminas\\I18n\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Console\\": "src/"
+                    "Laminas\\I18n\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Build console applications using getopt syntax or routing, complete with prompts",
+            "description": "Provide translations for your application, and filter and validate internationalized values",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "console",
-                "zf"
+                "i18n",
+                "laminas"
             ],
-            "time": "2019-02-04T19:48:22+00:00"
+            "time": "2020-03-29T12:51:08+00:00"
         },
         {
-            "name": "zendframework/zend-crypt",
-            "version": "3.3.1",
+            "name": "laminas/laminas-i18n-resources",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-crypt.git",
-                "reference": "cf23da2731dabdbb916cf888f611fc0f123bd36b"
+                "url": "git@github.com:laminas/laminas-i18n-resources.git",
+                "reference": "7585cd3a4f9656814425b35689919a220c73834b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/cf23da2731dabdbb916cf888f611fc0f123bd36b",
-                "reference": "cf23da2731dabdbb916cf888f611fc0f123bd36b",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n-resources/zipball/7585cd3a4f9656814425b35689919a220c73834b",
+                "reference": "7585cd3a4f9656814425b35689919a220c73834b",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "ext-mbstring": "*",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-math": "^3.0",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0"
+            "replace": {
+                "zendframework/zend-i18n-resources": "self.version"
             },
-            "suggest": {
-                "ext-openssl": "Required for most features of Zend\\Crypt"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3.x-dev",
-                    "dev-develop": "3.4.x-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Zend\\Crypt\\": "src/"
-                }
+                "classmap": [
+                    "src/Resources.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Strong cryptography tools and password hashing",
+            "description": "Provides validator translations for laminas-i18n's Translator",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "crypt",
-                "zf"
+                "laminas",
+                "resources",
+                "translations"
             ],
-            "time": "2019-05-14T20:19:53+00:00"
+            "time": "2019-12-31T17:11:35+00:00"
         },
         {
-            "name": "zendframework/zend-db",
-            "version": "2.10.0",
+            "name": "laminas/laminas-inputfilter",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-db.git",
-                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
+                "url": "git@github.com:laminas/laminas-inputfilter.git",
+                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
-                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
+                "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/b29ce8f512c966468eee37ea4873ae5fb545d00a",
+                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-filter": "^2.9.1",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-validator": "^2.11",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-inputfilter": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
+                "psr/http-message": "^1.0"
             },
             "suggest": {
-                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-                "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "2.10-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Db",
-                    "config-provider": "Zend\\Db\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\InputFilter",
+                    "config-provider": "Laminas\\InputFilter\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Db\\": "src/"
+                    "Laminas\\InputFilter\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "db",
-                "zf"
+                "inputfilter",
+                "laminas"
             ],
-            "time": "2019-02-25T11:37:45+00:00"
+            "time": "2019-12-31T17:11:54+00:00"
         },
         {
-            "name": "zendframework/zend-debug",
-            "version": "2.6.0",
+            "name": "laminas/laminas-json",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-debug.git",
-                "reference": "cb423facd6f2e875a3cb44cf992b6bd1f5fd1a96"
+                "url": "https://github.com/laminas/laminas-json.git",
+                "reference": "00dc0da7b5e5018904c5c4a8e80a5faa16c2c1c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-debug/zipball/cb423facd6f2e875a3cb44cf992b6bd1f5fd1a96",
-                "reference": "cb423facd6f2e875a3cb44cf992b6bd1f5fd1a96",
+                "url": "https://api.github.com/repos/laminas/laminas-json/zipball/00dc0da7b5e5018904c5c4a8e80a5faa16c2c1c6",
+                "reference": "00dc0da7b5e5018904c5c4a8e80a5faa16c2c1c6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-escaper": "^2.0"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-json": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3"
             },
             "suggest": {
-                "ext-xdebug": "XDebug, for better backtrace output"
+                "laminas/laminas-json-server": "For implementing JSON-RPC servers",
+                "laminas/laminas-xml2json": "For converting XML documents to JSON"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "3.1.x-dev",
+                    "dev-develop": "3.2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Debug\\": "src/"
+                    "Laminas\\Json\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Safely dump debug information to HTML",
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "debug",
-                "zf"
+                "json",
+                "laminas"
             ],
-            "time": "2018-04-30T20:10:31+00:00"
+            "time": "2019-12-31T17:15:04+00:00"
         },
         {
-            "name": "zendframework/zend-di",
+            "name": "laminas/laminas-loader",
             "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-di.git",
-                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37"
+                "url": "https://github.com/laminas/laminas-loader.git",
+                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-di/zipball/1fd1ba85660b5a2718741b38639dc7c4c3194b37",
-                "reference": "1fd1ba85660b5a2718741b38639dc7c4c3194b37",
+                "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/5d01c2c237ae9e68bec262f339947e2ea18979bc",
+                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.1",
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-code": "^2.6 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-loader": "self.version"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Di\\": "src/"
+                    "Laminas\\Loader\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-di",
+            "description": "Autoloading and plugin loading strategies",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "di",
-                "zf2"
+                "laminas",
+                "loader"
             ],
-            "time": "2016-04-25T20:58:11+00:00"
+            "time": "2019-12-31T17:18:27+00:00"
         },
         {
-            "name": "zendframework/zend-dom",
-            "version": "2.7.1",
+            "name": "laminas/laminas-log",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-dom.git",
-                "reference": "ec2c66c2bb0046e895651b24f2ebb83058b9bbca"
+                "url": "https://github.com/laminas/laminas-log.git",
+                "reference": "4e92d841b48868714a070b10866e94be80fc92ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-dom/zipball/ec2c66c2bb0046e895651b24f2ebb83058b9bbca",
-                "reference": "ec2c66c2bb0046e895651b24f2ebb83058b9bbca",
+                "url": "https://api.github.com/repos/laminas/laminas-log/zipball/4e92d841b48868714a070b10866e94be80fc92ff",
+                "reference": "4e92d841b48868714a070b10866e94be80fc92ff",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "psr/log": "^1.1.2"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "replace": {
+                "zendframework/zend-log": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.6",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-filter": "^2.5",
+                "laminas/laminas-mail": "^2.6.1",
+                "laminas/laminas-validator": "^2.10.1",
+                "mikey179/vfsstream": "^1.6.7",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15"
+            },
+            "suggest": {
+                "ext-mongo": "mongo extension to use Mongo writer",
+                "ext-mongodb": "mongodb extension to use MongoDB writer",
+                "laminas/laminas-db": "Laminas\\Db component to use the database log writer",
+                "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter",
+                "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer",
+                "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Log",
+                    "config-provider": "Laminas\\Log\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Dom\\": "src/"
+                    "Laminas\\Log\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides tools for working with DOM documents and structures",
+            "description": "Robust, composite logger with filtering, formatting, and PSR-3 support",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "dom",
-                "zf"
+                "laminas",
+                "log",
+                "logging"
             ],
-            "time": "2018-04-09T20:18:00+00:00"
+            "time": "2019-12-31T17:18:59+00:00"
         },
         {
-            "name": "zendframework/zend-escaper",
-            "version": "2.6.0",
+            "name": "laminas/laminas-mail",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-escaper.git",
-                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
+                "url": "https://github.com/laminas/laminas-mail.git",
+                "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
-                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/019fb670c1dff6be7fc91d3b88942bd0a5f68792",
+                "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "ext-iconv": "*",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-mime": "^2.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-validator": "^2.10.2",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "true/punycode": "^2.1"
+            },
+            "replace": {
+                "zendframework/zend-mail": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-crypt": "^2.6 || ^3.0",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4"
+            },
+            "suggest": {
+                "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Mail",
+                    "config-provider": "Laminas\\Mail\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Escaper\\": "src/"
+                    "Laminas\\Mail\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "escaper",
-                "zf"
+                "laminas",
+                "mail"
             ],
-            "time": "2018-04-25T15:48:53+00:00"
+            "time": "2019-12-31T17:21:22+00:00"
         },
         {
-            "name": "zendframework/zend-eventmanager",
-            "version": "3.2.1",
+            "name": "laminas/laminas-math",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-eventmanager.git",
-                "reference": "a5e2583a211f73604691586b8406ff7296a946dd"
+                "url": "https://github.com/laminas/laminas-math.git",
+                "reference": "dd603c7d151d46eafd243a405d5b7eefa4222d74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd",
-                "reference": "a5e2583a211f73604691586b8406ff7296a946dd",
+                "url": "https://api.github.com/repos/laminas/laminas-math/zipball/dd603c7d151d46eafd243a405d5b7eefa4222d74",
+                "reference": "dd603c7d151d46eafd243a405d5b7eefa4222d74",
                 "shasum": ""
             },
             "require": {
+                "ext-mbstring": "*",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "paragonie/random_compat": "^2.0.11 || 9.99.99",
                 "php": "^5.6 || ^7.0"
             },
+            "replace": {
+                "zendframework/zend-math": "self.version"
+            },
             "require-dev": {
-                "athletic/athletic": "^0.1",
-                "container-interop/container-interop": "^1.1.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
             "suggest": {
-                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev",
-                    "dev-develop": "3.3-dev"
+                    "dev-master": "3.2.x-dev",
+                    "dev-develop": "3.3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\EventManager\\": "src/"
+                    "Laminas\\Math\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Trigger and listen to events within a PHP application",
-            "homepage": "https://github.com/zendframework/zend-eventmanager",
+            "description": "Create cryptographically secure pseudo-random numbers, and manage big integers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "event",
-                "eventmanager",
-                "events",
-                "zf2"
+                "laminas",
+                "math"
             ],
-            "time": "2018-04-25T15:33:34+00:00"
+            "time": "2019-12-31T17:24:18+00:00"
         },
         {
-            "name": "zendframework/zend-feed",
-            "version": "2.12.0",
+            "name": "laminas/laminas-memory",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-feed.git",
-                "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733"
+                "url": "https://github.com/laminas/laminas-memory.git",
+                "reference": "7d4f8a727b781f1acd5713b9667cdb6e42dbec17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733",
-                "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733",
+                "url": "https://api.github.com/repos/laminas/laminas-memory/zipball/7d4f8a727b781f1acd5713b9667cdb6e42dbec17",
+                "reference": "7d4f8a727b781f1acd5713b9667cdb6e42dbec17",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-escaper": "^2.5.2",
-                "zendframework/zend-stdlib": "^3.2.1"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-memory": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "psr/http-message": "^1.0.1",
-                "zendframework/zend-cache": "^2.7.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-db": "^2.8.2",
-                "zendframework/zend-http": "^2.7",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-cache": "^2.7",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "suggest": {
-                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
-                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
-                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
-                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
-                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
+                "laminas/laminas-cache": "To support swapping memory objects into and out of non-memory cache storage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Feed\\": "src/"
+                    "Laminas\\Memory\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
+            "description": "Manage data in an environment with limited memory",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "feed",
-                "zf"
+                "laminas",
+                "memory"
             ],
-            "time": "2019-03-05T20:08:49+00:00"
+            "time": "2019-12-31T17:24:52+00:00"
         },
         {
-            "name": "zendframework/zend-file",
-            "version": "2.8.3",
+            "name": "laminas/laminas-mime",
+            "version": "2.7.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-file.git",
-                "reference": "b6e167e056ce8594be1db93460cddb503de341ed"
+                "url": "https://github.com/laminas/laminas-mime.git",
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-file/zipball/b6e167e056ce8594be1db93460cddb503de341ed",
-                "reference": "b6e167e056ce8594be1db93460cddb503de341ed",
+                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-mime": "^2.7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-filter": "^2.7.2",
-                "zendframework/zend-i18n": "^2.7.4",
-                "zendframework/zend-progressbar": "^2.5.2",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-session": "^2.8",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-mail": "^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
             },
             "suggest": {
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-validator": "Zend\\Validator component"
+                "laminas/laminas-mail": "Laminas\\Mail component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\File\\": "src/"
+                    "Laminas\\Mime\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Locate PHP classfiles",
+            "description": "Create and parse MIME messages and parts",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "file",
-                "zf"
+                "laminas",
+                "mime"
             ],
-            "time": "2019-02-06T16:53:31+00:00"
+            "time": "2020-03-29T13:12:07+00:00"
         },
         {
-            "name": "zendframework/zend-filter",
-            "version": "2.9.1",
+            "name": "laminas/laminas-modulemanager",
+            "version": "2.8.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-filter.git",
-                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
+                "url": "https://github.com/laminas/laminas-modulemanager.git",
+                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
-                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
+                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/92b1cde1aab5aef687b863face6dd5d9c6751c78",
+                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+                "laminas/laminas-config": "^3.1 || ^2.6",
+                "laminas/laminas-eventmanager": "^3.2 || ^2.6.3",
+                "laminas/laminas-stdlib": "^3.1 || ^2.7",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "zendframework/zend-validator": "<2.10.1"
+            "replace": {
+                "zendframework/zend-modulemanager": "self.version"
             },
             "require-dev": {
-                "pear/archive_tar": "^1.4.3",
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "psr/http-factory": "^1.0",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-crypt": "^3.2.1",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-uri": "^2.6"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-di": "^2.6",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-mvc": "^3.0 || ^2.7",
+                "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
             },
             "suggest": {
-                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
-                "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
-                "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
-                "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
+                "laminas/laminas-console": "Laminas\\Console component",
+                "laminas/laminas-loader": "Laminas\\Loader component if you are not using Composer autoloading for your modules",
+                "laminas/laminas-mvc": "Laminas\\Mvc component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Filter",
-                    "config-provider": "Zend\\Filter\\ConfigProvider"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Filter\\": "src/"
+                    "Laminas\\ModuleManager\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a set of commonly needed data filters",
+            "description": "Modular application system for laminas-mvc applications",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "filter",
-                "zf"
+                "laminas",
+                "modulemanager"
             ],
-            "time": "2018-12-17T16:00:04+00:00"
+            "time": "2019-12-31T17:26:56+00:00"
         },
         {
-            "name": "zendframework/zend-form",
-            "version": "2.14.1",
+            "name": "laminas/laminas-mvc",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-form.git",
-                "reference": "ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be"
+                "url": "https://github.com/laminas/laminas-mvc.git",
+                "reference": "ead09f8ab5ff0e562dbd0198c7f67523c2f61980"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be",
-                "reference": "ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/ead09f8ab5ff0e562dbd0198c7f67523c2f61980",
+                "reference": "ead09f8ab5ff0e562dbd0198c7f67523c2f61980",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
-                "zendframework/zend-inputfilter": "^2.8",
-                "zendframework/zend-stdlib": "^3.2.1"
+                "container-interop/container-interop": "^1.2",
+                "laminas/laminas-eventmanager": "^3.2",
+                "laminas/laminas-http": "^2.7",
+                "laminas/laminas-modulemanager": "^2.8",
+                "laminas/laminas-router": "^3.0.2",
+                "laminas/laminas-servicemanager": "^3.3",
+                "laminas/laminas-stdlib": "^3.1",
+                "laminas/laminas-view": "^2.9",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-mvc": "self.version"
             },
             "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "phpunit/phpunit": "^5.7.23 || ^6.5.3",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-captcha": "^2.7.1",
-                "zendframework/zend-code": "^2.6 || ^3.0",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-session": "^2.8.1",
-                "zendframework/zend-text": "^2.6",
-                "zendframework/zend-validator": "^2.6",
-                "zendframework/zend-view": "^2.6.2",
-                "zendframework/zendservice-recaptcha": "^3.0.0"
+                "http-interop/http-middleware": "^0.4.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-json": "^2.6.1 || ^3.0",
+                "laminas/laminas-psr7bridge": "^1.0",
+                "laminas/laminas-stratigility": "^2.0.1",
+                "phpunit/phpunit": "^6.4.4 || ^5.7.14"
             },
             "suggest": {
-                "zendframework/zend-captcha": "^2.7.1, required for using CAPTCHA form elements",
-                "zendframework/zend-code": "^2.6 || ^3.0, required to use zend-form annotations support",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, reuired for zend-form annotations support",
-                "zendframework/zend-i18n": "^2.6, required when using zend-form view helpers",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
-                "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
-                "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
+                "http-interop/http-middleware": "^0.4.1 to be used together with laminas-stratigility",
+                "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
+                "laminas/laminas-log": "^2.9.1  To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager",
+                "laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application",
+                "laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments",
+                "laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads",
+                "laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
+                "laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers",
+                "laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
+                "laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager",
+                "laminas/laminas-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
+                "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application",
+                "laminas/laminas-stratigility": "laminas-stratigility is required to use middleware pipes in the MiddlewareListener"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14.x-dev",
-                    "dev-develop": "2.15.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Form",
-                    "config-provider": "Zend\\Form\\ConfigProvider"
+                    "dev-master": "3.1-dev",
+                    "dev-develop": "3.2-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Form\\": "src/"
-                },
-                "files": [
-                    "autoload/formElementManagerPolyfill.php"
-                ]
+                    "Laminas\\Mvc\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+            "description": "Laminas's event-driven MVC layer, including MVC Applications, Controllers, and Plugins",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "form",
-                "zf"
+                "laminas",
+                "mvc"
             ],
-            "time": "2019-02-26T18:13:31+00:00"
+            "time": "2019-12-31T17:33:14+00:00"
         },
         {
-            "name": "zendframework/zend-http",
-            "version": "2.10.0",
+            "name": "laminas/laminas-mvc-i18n",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-http.git",
-                "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0"
+                "url": "https://github.com/laminas/laminas-mvc-i18n.git",
+                "reference": "4184f6572b5244a5f5781604f1e03d7955e304a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
-                "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/4184f6572b5244a5f5781604f1e03d7955e304a0",
+                "reference": "4184f6572b5244a5f5781604f1e03d7955e304a0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-loader": "^2.5.1",
-                "zendframework/zend-stdlib": "^3.2.1",
-                "zendframework/zend-uri": "^2.5.2",
-                "zendframework/zend-validator": "^2.10.1"
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-i18n": "^2.7",
+                "laminas/laminas-router": "^3.0",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7.6 || ^3.0",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "conflict": {
+                "laminas/laminas-mvc": "<3.0.0",
+                "phpspec/prophecy": "<1.8.0"
+            },
+            "replace": {
+                "zendframework/zend-mvc-i18n": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^3.1 || ^2.6"
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5"
             },
             "suggest": {
-                "paragonie/certainty": "For automated management of cacert.pem"
+                "laminas/laminas-cache": "To enable caching of translation strings"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "1.1.x-dev",
+                    "dev-develop": "1.2.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Mvc\\I18n",
+                    "config-provider": "Laminas\\Mvc\\I18n\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Http\\": "src/"
+                    "Laminas\\Mvc\\I18n\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "description": "Integration between laminas-mvc and laminas-i18n",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "http",
-                "http client",
-                "zend",
-                "zf"
+                "i18n",
+                "laminas",
+                "mvc"
             ],
-            "time": "2019-02-19T18:58:14+00:00"
+            "time": "2019-12-31T17:33:41+00:00"
         },
         {
-            "name": "zendframework/zend-hydrator",
-            "version": "2.4.1",
+            "name": "laminas/laminas-mvc-plugin-fileprg",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-hydrator.git",
-                "reference": "70b02f4d8676e64af932625751750b5ca72fff3a"
+                "url": "https://github.com/laminas/laminas-mvc-plugin-fileprg.git",
+                "reference": "4a1a3729b3789a4d9e7cfe285ce84a636be87a67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/70b02f4d8676e64af932625751750b5ca72fff3a",
-                "reference": "70b02f4d8676e64af932625751750b5ca72fff3a",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-fileprg/zipball/4a1a3729b3789a4d9e7cfe285ce84a636be87a67",
+                "reference": "4a1a3729b3789a4d9e7cfe285ce84a636be87a67",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^3.0"
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-form": "^2.7",
+                "laminas/laminas-inputfilter": "^2.8.1",
+                "laminas/laminas-mvc": "^3.0",
+                "laminas/laminas-session": "^2.8.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-inputfilter": "^2.6",
-                "zendframework/zend-serializer": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            "conflict": {
+                "laminas/laminas-mvc": "<3.0.0"
             },
-            "suggest": {
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-                "zendframework/zend-filter": "^2.6, to support naming strategy hydrator usage",
-                "zendframework/zend-serializer": "^2.6.1, to use the SerializableStrategy",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+            "replace": {
+                "zendframework/zend-mvc-plugin-fileprg": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-release-1.0": "1.0.x-dev",
-                    "dev-release-1.1": "1.1.x-dev",
-                    "dev-master": "2.4.x-dev",
-                    "dev-develop": "2.5.x-dev"
+                    "dev-master": "1.1.x-dev",
+                    "dev-develop": "1.2.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Hydrator",
-                    "config-provider": "Zend\\Hydrator\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Mvc\\Plugin\\FilePrg"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Hydrator\\": "src/"
+                    "Laminas\\Mvc\\Plugin\\FilePrg\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Serialize objects to arrays, and vice versa",
+            "description": "Post/Redirect/Get plugin with file upload handling for laminas-mvc controllers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "hydrator",
-                "zf"
+                "laminas",
+                "mvc"
             ],
-            "time": "2018-11-19T19:16:10+00:00"
+            "time": "2019-12-31T17:33:44+00:00"
         },
         {
-            "name": "zendframework/zend-i18n",
-            "version": "2.9.0",
+            "name": "laminas/laminas-mvc-plugin-flashmessenger",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
+                "url": "https://github.com/laminas/laminas-mvc-plugin-flashmessenger.git",
+                "reference": "f5a522c3aab215a9b89a0630beb91582f4a3f202"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
-                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-flashmessenger/zipball/f5a522c3aab215a9b89a0630beb91582f4a3f202",
+                "reference": "f5a522c3aab215a9b89a0630beb91582f4a3f202",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-mvc": "^3.0",
+                "laminas/laminas-session": "^2.8.5",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-view": "^2.10",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-validator": "^2.6",
-                "zendframework/zend-view": "^2.6.3"
+            "conflict": {
+                "laminas/laminas-mvc": "<3.0.0"
             },
-            "suggest": {
-                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
-                "zendframework/zend-cache": "Zend\\Cache component",
-                "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
-                "zendframework/zend-filter": "You should install this package to use the provided filters",
-                "zendframework/zend-i18n-resources": "Translation resources",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-validator": "You should install this package to use the provided validators",
-                "zendframework/zend-view": "You should install this package to use the provided view helpers"
+            "replace": {
+                "zendframework/zend-mvc-plugin-flashmessenger": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-i18n": "^2.8",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
+                    "dev-master": "1.2.x-dev",
+                    "dev-develop": "1.3.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\I18n",
-                    "config-provider": "Zend\\I18n\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Mvc\\Plugin\\FlashMessenger"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\I18n\\": "src/"
+                    "Laminas\\Mvc\\Plugin\\FlashMessenger\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Provide translations for your application, and filter and validate internationalized values",
+            "description": "Plugin for creating and exposing flash messages via laminas-mvc controllers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "i18n",
-                "zf"
+                "laminas",
+                "mvc"
             ],
-            "time": "2018-05-16T16:39:13+00:00"
+            "time": "2019-12-31T17:33:46+00:00"
         },
         {
-            "name": "zendframework/zend-i18n-resources",
-            "version": "2.6.0",
+            "name": "laminas/laminas-mvc-plugin-identity",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-i18n-resources.git",
-                "reference": "530ab0af94ed1dd542665e6041d92297f7347ef3"
+                "url": "https://github.com/laminas/laminas-mvc-plugin-identity.git",
+                "reference": "0dc0c349be0faee67bbb4ae2a0206435a7a51516"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n-resources/zipball/530ab0af94ed1dd542665e6041d92297f7347ef3",
-                "reference": "530ab0af94ed1dd542665e6041d92297f7347ef3",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-identity/zipball/0dc0c349be0faee67bbb4ae2a0206435a7a51516",
+                "reference": "0dc0c349be0faee67bbb4ae2a0206435a7a51516",
                 "shasum": ""
             },
             "require": {
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-authentication": "^2.5.3",
+                "laminas/laminas-mvc": "^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
+            "conflict": {
+                "laminas/laminas-mvc": "<3.0.0"
+            },
+            "replace": {
+                "zendframework/zend-mvc-plugin-identity": "self.version"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "1.1.x-dev",
+                    "dev-develop": "1.2.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Mvc\\Plugin\\Identity"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/Resources.php"
-                ]
+                "psr-4": {
+                    "Laminas\\Mvc\\Plugin\\Identity\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Provides validator translations for zend-i18n's Translator",
+            "description": "Plugin for retrieving the current authenticated identity within laminas-mvc controllers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "resources",
-                "translations",
-                "zf"
+                "laminas",
+                "mvc"
             ],
-            "time": "2018-04-30T14:47:38+00:00"
+            "time": "2019-12-31T17:33:49+00:00"
         },
         {
-            "name": "zendframework/zend-inputfilter",
-            "version": "2.10.0",
+            "name": "laminas/laminas-mvc-plugin-prg",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-inputfilter.git",
-                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
+                "url": "https://github.com/laminas/laminas-mvc-plugin-prg.git",
+                "reference": "f9b094373795dd4250d3551a1fbd6d304762b621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
-                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugin-prg/zipball/f9b094373795dd4250d3551a1fbd6d304762b621",
+                "reference": "f9b094373795dd4250d3551a1fbd6d304762b621",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-filter": "^2.9.1",
-                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-validator": "^2.11"
+                "laminas/laminas-mvc": "^3.0",
+                "laminas/laminas-session": "^2.8.5",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "psr/http-message": "^1.0",
-                "zendframework/zend-coding-standard": "~1.0.0"
+            "replace": {
+                "zendframework/zend-mvc-plugin-prg": "self.version"
             },
-            "suggest": {
-                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "1.2.x-dev",
+                    "dev-develop": "1.3.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\InputFilter",
-                    "config-provider": "Zend\\InputFilter\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Mvc\\Plugin\\Prg"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\InputFilter\\": "src/"
+                    "Laminas\\Mvc\\Plugin\\Prg\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
+            "description": "Post/Redirect/Get plugin for laminas-mvc controllers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "inputfilter",
-                "zf"
+                "laminas",
+                "mvc"
             ],
-            "time": "2019-01-30T16:58:51+00:00"
+            "time": "2019-12-31T17:33:51+00:00"
         },
         {
-            "name": "zendframework/zend-json",
-            "version": "3.1.0",
+            "name": "laminas/laminas-mvc-plugins",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-json.git",
-                "reference": "4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c"
+                "url": "https://github.com/laminas/laminas-mvc-plugins.git",
+                "reference": "896104a57c3898c2ca932c1ec10c6a3afea2f815"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c",
-                "reference": "4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-plugins/zipball/896104a57c3898c2ca932c1ec10c6a3afea2f815",
+                "reference": "896104a57c3898c2ca932c1ec10c6a3afea2f815",
                 "shasum": ""
             },
             "require": {
+                "laminas/laminas-mvc-plugin-fileprg": "^1.0",
+                "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
+                "laminas/laminas-mvc-plugin-identity": "^1.0",
+                "laminas/laminas-mvc-plugin-prg": "^1.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
-            },
-            "suggest": {
-                "zendframework/zend-json-server": "For implementing JSON-RPC servers",
-                "zendframework/zend-xml2json": "For converting XML documents to JSON"
+            "replace": {
+                "zendframework/zend-mvc-plugins": "self.version"
             },
-            "type": "library",
+            "type": "metapackage",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev",
-                    "dev-develop": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Json\\": "src/"
+                    "dev-master": "1.0-dev"
+                },
+                "laminas": {
+                    "component": [
+                        "Laminas\\Mvc\\Plugin\\FilePrg",
+                        "Laminas\\Mvc\\Plugin\\FlashMessenger",
+                        "Laminas\\Mvc\\Plugin\\Identity",
+                        "Laminas\\Mvc\\Plugin\\Prg"
+                    ]
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "description": "Collection of all stable laminas-mvc plugins served via separate packages.",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "json",
-                "zf"
+                "laminas",
+                "mvc",
+                "plugins"
             ],
-            "time": "2018-01-04T17:51:34+00:00"
+            "time": "2019-12-31T17:33:52+00:00"
         },
         {
-            "name": "zendframework/zend-loader",
-            "version": "2.6.0",
+            "name": "laminas/laminas-navigation",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-loader.git",
-                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
+                "url": "https://github.com/laminas/laminas-navigation.git",
+                "reference": "1b4210ea3afeffb8a69e502e169088180ba3275d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
-                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
+                "url": "https://api.github.com/repos/laminas/laminas-navigation/zipball/1b4210ea3afeffb8a69e502e169088180ba3275d",
+                "reference": "1b4210ea3afeffb8a69e502e169088180ba3275d",
                 "shasum": ""
             },
             "require": {
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
+            "replace": {
+                "zendframework/zend-navigation": "self.version"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6 || ^3.1",
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-http": "^2.6",
+                "laminas/laminas-i18n": "^2.7.3",
+                "laminas/laminas-log": "^2.9.1",
+                "laminas/laminas-mvc": "^2.7.9 || ^3.0.4",
+                "laminas/laminas-permissions-acl": "^2.6",
+                "laminas/laminas-router": "^3.0.2",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-uri": "^2.5.2",
+                "laminas/laminas-view": "^2.9",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "laminas/laminas-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)",
+                "laminas/laminas-permissions-acl": "^2.6, to provide ACL-based access restrictions to pages",
+                "laminas/laminas-router": "^3.0, to use router-based URI generation with Mvc pages",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories",
+                "laminas/laminas-view": "^2.8.1, to use the navigation view helpers"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Navigation",
+                    "config-provider": "Laminas\\Navigation\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Loader\\": "src/"
+                    "Laminas\\Navigation\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Autoloading and plugin loading strategies",
+            "description": "Manage trees of pointers to web pages in order to build navigation systems",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "loader",
-                "zf"
+                "laminas",
+                "navigation"
             ],
-            "time": "2018-04-30T15:20:54+00:00"
+            "time": "2019-12-31T17:35:22+00:00"
         },
         {
-            "name": "zendframework/zend-log",
-            "version": "2.10.0",
+            "name": "laminas/laminas-paginator",
+            "version": "2.8.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-log.git",
-                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430"
+                "url": "https://github.com/laminas/laminas-paginator.git",
+                "reference": "5e53d927776b2d20e420bc2b289fa0c364a6b0bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430",
-                "reference": "9cec3b092acb39963659c2f32441cccc56b3f430",
+                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/5e53d927776b2d20e420bc2b289fa0c364a6b0bd",
+                "reference": "5e53d927776b2d20e420bc2b289fa0c364a6b0bd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "psr/log": "^1.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.0 || ^5.6"
             },
-            "provide": {
-                "psr/log-implementation": "1.0.0"
+            "replace": {
+                "zendframework/zend-paginator": "self.version"
             },
             "require-dev": {
-                "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-db": "^2.6",
-                "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-filter": "^2.5",
-                "zendframework/zend-mail": "^2.6.1",
-                "zendframework/zend-validator": "^2.10.1"
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6.0",
+                "laminas/laminas-db": "^2.9.2",
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-json": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-view": "^2.6.3",
+                "phpunit/phpunit": "^6.2.1 || ^5.7.15"
             },
             "suggest": {
-                "ext-mongo": "mongo extension to use Mongo writer",
-                "ext-mongodb": "mongodb extension to use MongoDB writer",
-                "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
-                "zendframework/zend-db": "Zend\\Db component to use the database log writer",
-                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter",
-                "zendframework/zend-mail": "Zend\\Mail component to use the email log writer",
-                "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages"
+                "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
+                "laminas/laminas-db": "Laminas\\Db component",
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-json": "Laminas\\Json component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-view": "Laminas\\View component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Log",
-                    "config-provider": "Zend\\Log\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Paginator",
+                    "config-provider": "Laminas\\Paginator\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Log\\": "src/"
+                    "Laminas\\Paginator\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "component for general purpose logging",
-            "homepage": "https://github.com/zendframework/zend-log",
+            "description": "Paginate collections of data from arbitrary sources",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "log",
-                "logging",
-                "zf2"
+                "laminas",
+                "paginator"
             ],
-            "time": "2018-04-09T21:59:51+00:00"
+            "time": "2019-12-31T17:36:22+00:00"
         },
         {
-            "name": "zendframework/zend-mail",
-            "version": "2.10.0",
+            "name": "laminas/laminas-permissions-acl",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mail.git",
-                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
+                "url": "https://github.com/laminas/laminas-permissions-acl.git",
+                "reference": "624567fe376a70e0bfb5aa8217d5afa13b9d6e61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
-                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
+                "url": "https://api.github.com/repos/laminas/laminas-permissions-acl/zipball/624567fe376a70e0bfb5aa8217d5afa13b9d6e61",
+                "reference": "624567fe376a70e0bfb5aa8217d5afa13b9d6e61",
                 "shasum": ""
             },
             "require": {
-                "ext-iconv": "*",
-                "php": "^5.6 || ^7.0",
-                "true/punycode": "^2.1",
-                "zendframework/zend-loader": "^2.5",
-                "zendframework/zend-mime": "^2.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-validator": "^2.10.2"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-permissions-acl": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-crypt": "^2.6 || ^3.0",
-                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5"
             },
             "suggest": {
-                "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
+                "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Mail",
-                    "config-provider": "Zend\\Mail\\ConfigProvider"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mail\\": "src/"
+                    "Laminas\\Permissions\\Acl\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
+            "description": "Provides a lightweight and flexible access control list (ACL) implementation for privileges management",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mail",
-                "zf"
+                "acl",
+                "laminas"
             ],
-            "time": "2018-06-07T13:37:07+00:00"
+            "time": "2019-12-31T17:37:23+00:00"
         },
         {
-            "name": "zendframework/zend-math",
-            "version": "3.2.0",
+            "name": "laminas/laminas-permissions-rbac",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-math.git",
-                "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726"
+                "url": "https://github.com/laminas/laminas-permissions-rbac.git",
+                "reference": "4322ac8fba5681b4901b5811089112bc36a045ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
-                "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
+                "url": "https://api.github.com/repos/laminas/laminas-permissions-rbac/zipball/4322ac8fba5681b4901b5811089112bc36a045ae",
+                "reference": "4322ac8fba5681b4901b5811089112bc36a045ae",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
-                "paragonie/random_compat": "^2.0.11 || 9.99.99",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0"
+            "replace": {
+                "zendframework/zend-permissions-rbac": "self.version"
             },
-            "suggest": {
-                "ext-bcmath": "If using the bcmath functionality",
-                "ext-gmp": "If using the gmp functionality"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.15 || ^6.2.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev",
-                    "dev-develop": "3.3.x-dev"
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Math\\": "src/"
+                    "Laminas\\Permissions\\Rbac\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Create cryptographically secure pseudo-random numbers, and manage big integers",
+            "description": "provides a role-based access control management",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "math",
-                "zf"
+                "laminas",
+                "rbac"
             ],
-            "time": "2018-12-04T15:45:09+00:00"
+            "time": "2019-12-31T17:37:55+00:00"
         },
         {
-            "name": "zendframework/zend-memory",
-            "version": "2.6.0",
+            "name": "laminas/laminas-progressbar",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-memory.git",
-                "reference": "a01d5eb74012c2a170e1ea1e18486152d2eea5f7"
+                "url": "https://github.com/laminas/laminas-progressbar.git",
+                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-memory/zipball/a01d5eb74012c2a170e1ea1e18486152d2eea5f7",
-                "reference": "a01d5eb74012c2a170e1ea1e18486152d2eea5f7",
+                "url": "https://api.github.com/repos/laminas/laminas-progressbar/zipball/15f9e983276462f30d7d38660dc7488c6e3df34b",
+                "reference": "15f9e983276462f30d7d38660dc7488c6e3df34b",
                 "shasum": ""
             },
             "require": {
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
+            "replace": {
+                "zendframework/zend-progressbar": "self.version"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-cache": "^2.7",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-json": "^2.6.1",
+                "laminas/laminas-session": "^2.8.5",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "suggest": {
-                "zendframework/zend-cache": "To support swapping memory objects into and out of non-memory cache storage"
+                "laminas/laminas-json": "Laminas\\Json component",
+                "laminas/laminas-session": "To support progressbar persistent"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Memory\\": "src/"
+                    "Laminas\\ProgressBar\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Manage data in an environment with limited memory",
+            "description": "Create and update progress bars in different environments",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "memory",
-                "zf"
+                "laminas",
+                "progressbar"
             ],
-            "time": "2018-04-30T15:45:17+00:00"
+            "time": "2019-12-31T17:38:44+00:00"
         },
         {
-            "name": "zendframework/zend-mime",
-            "version": "2.7.1",
+            "name": "laminas/laminas-router",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mime.git",
-                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
+                "url": "https://github.com/laminas/laminas-router.git",
+                "reference": "01a6905202ad41a42ba63d60260eba32b89e18c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
+                "url": "https://api.github.com/repos/laminas/laminas-router/zipball/01a6905202ad41a42ba63d60260eba32b89e18c7",
+                "reference": "01a6905202ad41a42ba63d60260eba32b89e18c7",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "container-interop/container-interop": "^1.2",
+                "laminas/laminas-http": "^2.8.1",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "conflict": {
+                "laminas/laminas-mvc": "<3.0.0"
+            },
+            "replace": {
+                "zendframework/zend-router": "^3.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.21 || ^6.3",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-mail": "^2.6"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-i18n": "^2.7.4",
+                "phpunit/phpunit": "^5.7.22 || ^6.4.1 || ^7.5.18"
             },
             "suggest": {
-                "zendframework/zend-mail": "Zend\\Mail component"
+                "laminas/laminas-i18n": "^2.7.4, if defining translatable HTTP path segments"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "3.3.x-dev",
+                    "dev-develop": "4.0.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Router",
+                    "config-provider": "Laminas\\Router\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mime\\": "src/"
+                    "Laminas\\Router\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Create and parse MIME messages and parts",
-            "homepage": "https://github.com/zendframework/zend-mime",
+            "description": "Flexible routing system for HTTP and console applications",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mime",
-                "zf"
+                "laminas",
+                "mvc",
+                "routing"
             ],
-            "time": "2018-05-14T19:02:50+00:00"
+            "time": "2020-03-29T13:21:03+00:00"
         },
         {
-            "name": "zendframework/zend-modulemanager",
-            "version": "2.8.2",
+            "name": "laminas/laminas-serializer",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-modulemanager.git",
-                "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
+                "url": "https://github.com/laminas/laminas-serializer.git",
+                "reference": "c1c9361f114271b0736db74e0083a919081af5e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
-                "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
+                "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/c1c9361f114271b0736db74e0083a919081af5e0",
+                "reference": "c1c9361f114271b0736db74e0083a919081af5e0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-config": "^3.1 || ^2.6",
-                "zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
-                "zendframework/zend-stdlib": "^3.1 || ^2.7"
+                "laminas/laminas-json": "^2.5 || ^3.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-serializer": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-console": "^2.6",
-                "zendframework/zend-di": "^2.6",
-                "zendframework/zend-loader": "^2.5",
-                "zendframework/zend-mvc": "^3.0 || ^2.7",
-                "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-math": "^2.6 || ^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
             },
             "suggest": {
-                "zendframework/zend-console": "Zend\\Console component",
-                "zendframework/zend-loader": "Zend\\Loader component if you are not using Composer autoloading for your modules",
-                "zendframework/zend-mvc": "Zend\\Mvc component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+                "laminas/laminas-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
+                "laminas/laminas-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Serializer",
+                    "config-provider": "Laminas\\Serializer\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\ModuleManager\\": "src/"
+                    "Laminas\\Serializer\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Modular application system for zend-mvc applications",
-            "homepage": "https://github.com/zendframework/zend-modulemanager",
+            "description": "Serialize and deserialize PHP structures to a variety of representations",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "modulemanager",
-                "zf"
+                "laminas",
+                "serializer"
             ],
-            "time": "2017-12-02T06:11:18+00:00"
+            "time": "2019-12-31T17:42:11+00:00"
         },
         {
-            "name": "zendframework/zend-mvc",
-            "version": "3.1.1",
+            "name": "laminas/laminas-server",
+            "version": "2.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc.git",
-                "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8"
+                "url": "https://github.com/laminas/laminas-server.git",
+                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/236e7e1e3757e988fa06530c0a3f96a148858ae8",
-                "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8",
+                "url": "https://api.github.com/repos/laminas/laminas-server/zipball/4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
+                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-eventmanager": "^3.2",
-                "zendframework/zend-http": "^2.7",
-                "zendframework/zend-modulemanager": "^2.8",
-                "zendframework/zend-router": "^3.0.2",
-                "zendframework/zend-servicemanager": "^3.3",
-                "zendframework/zend-stdlib": "^3.1",
-                "zendframework/zend-view": "^2.9"
+                "laminas/laminas-code": "^2.5 || ^3.0",
+                "laminas/laminas-stdlib": "^2.5 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "http-interop/http-middleware": "^0.4.1",
-                "phpunit/phpunit": "^6.4.4 || ^5.7.14",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-json": "^2.6.1 || ^3.0",
-                "zendframework/zend-psr7bridge": "^1.0",
-                "zendframework/zend-stratigility": "^2.0.1"
+            "replace": {
+                "zendframework/zend-server": "self.version"
             },
-            "suggest": {
-                "http-interop/http-middleware": "^0.4.1 to be used together with zend-stratigility",
-                "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
-                "zendframework/zend-log": "^2.9.1  To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager",
-                "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application",
-                "zendframework/zend-mvc-i18n": "zend-mvc-i18n provides integration with zend-i18n, including a translation bridge and translatable route segments",
-                "zendframework/zend-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads",
-                "zendframework/zend-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
-                "zendframework/zend-mvc-plugin-identity": "To access the authenticated identity (per zend-authentication) in controllers",
-                "zendframework/zend-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
-                "zendframework/zend-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager",
-                "zendframework/zend-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
-                "zendframework/zend-servicemanager-di": "zend-servicemanager-di provides utilities for integrating zend-di and zend-servicemanager in your zend-mvc application",
-                "zendframework/zend-stratigility": "zend-stratigility is required to use middleware pipes in the MiddlewareListener"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev",
-                    "dev-develop": "3.2-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\": "src/"
+                    "Laminas\\Server\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Zend Framework's event-driven MVC layer, including MVC Applications, Controllers, and Plugins",
+            "description": "Create Reflection-based RPC servers",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "zf"
+                "laminas",
+                "server"
             ],
-            "time": "2017-11-24T06:32:07+00:00"
+            "time": "2019-12-31T17:43:03+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-i18n",
-            "version": "1.1.0",
+            "name": "laminas/laminas-servicemanager",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-i18n.git",
-                "reference": "90e64d1304385cfcf19447b6449514e8a720adfc"
+                "url": "https://github.com/laminas/laminas-servicemanager.git",
+                "reference": "044cb8e380682563fb277ed5f6de4f690e4e6239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-i18n/zipball/90e64d1304385cfcf19447b6449514e8a720adfc",
-                "reference": "90e64d1304385cfcf19447b6449514e8a720adfc",
+                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/044cb8e380682563fb277ed5f6de4f690e4e6239",
+                "reference": "044cb8e380682563fb277ed5f6de4f690e4e6239",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.1",
+                "container-interop/container-interop": "^1.2",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-i18n": "^2.7",
-                "zendframework/zend-router": "^3.0",
-                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
-                "zendframework/zend-stdlib": "^2.7.6 || ^3.0",
-                "zendframework/zend-validator": "^2.6"
+                "psr/container": "^1.0"
             },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.2",
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "zendframework/zend-servicemanager": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "mikey179/vfsstream": "^1.6.5",
+                "ocramius/proxy-manager": "^1.0 || ^2.0",
+                "phpbench/phpbench": "^0.13.0",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4"
             },
             "suggest": {
-                "zendframework/zend-cache": "To enable caching of translation strings"
+                "laminas/laminas-stdlib": "laminas-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances",
+                "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services"
             },
+            "bin": [
+                "bin/generate-deps-for-config-factory",
+                "bin/generate-factory-for-class"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev",
-                    "dev-develop": "1.2.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Mvc\\I18n",
-                    "config-provider": "Zend\\Mvc\\I18n\\ConfigProvider"
+                    "dev-master": "3.3-dev",
+                    "dev-develop": "4.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\I18n\\": "src/"
+                    "Laminas\\ServiceManager\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Integration between zend-mvc and zend-i18n",
+            "description": "Factory-Driven Dependency Injection Container",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "i18n",
-                "mvc",
-                "zf"
+                "PSR-11",
+                "dependency-injection",
+                "di",
+                "dic",
+                "laminas",
+                "service-manager",
+                "servicemanager"
             ],
-            "time": "2018-05-01T15:48:40+00:00"
+            "time": "2019-12-31T17:44:47+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-plugin-fileprg",
-            "version": "1.1.0",
+            "name": "laminas/laminas-session",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-plugin-fileprg.git",
-                "reference": "87184f33dbb98eb57c7338a5f026cca29bdd6048"
+                "url": "https://github.com/laminas/laminas-session.git",
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-plugin-fileprg/zipball/87184f33dbb98eb57c7338a5f026cca29bdd6048",
-                "reference": "87184f33dbb98eb57c7338a5f026cca29bdd6048",
+                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/519e8966146536cd97c1cc3d59a21b095fb814d7",
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-form": "^2.7",
-                "zendframework/zend-inputfilter": "^2.8.1",
-                "zendframework/zend-mvc": "^3.0",
-                "zendframework/zend-session": "^2.8.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-validator": "^2.6"
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+            "replace": {
+                "zendframework/zend-session": "^2.9.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.7",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-validator": "^2.6",
+                "mongodb/mongodb": "^1.0.1",
+                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+            },
+            "suggest": {
+                "laminas/laminas-cache": "Laminas\\Cache component",
+                "laminas/laminas-db": "Laminas\\Db component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-validator": "Laminas\\Validator component",
+                "mongodb/mongodb": "If you want to use the MongoDB session save handler"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev",
-                    "dev-develop": "1.2.x-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Mvc\\Plugin\\FilePrg"
+                "laminas": {
+                    "component": "Laminas\\Session",
+                    "config-provider": "Laminas\\Session\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\Plugin\\FilePrg\\": "src/"
+                    "Laminas\\Session\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Post/Redirect/Get plugin with file upload handling for zend-mvc controllers",
+            "description": "Object-oriented interface to PHP sessions and storage",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "zf"
+                "laminas",
+                "session"
             ],
-            "time": "2018-04-30T20:02:13+00:00"
+            "time": "2020-03-29T13:26:04+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-plugin-flashmessenger",
-            "version": "1.1.0",
+            "name": "laminas/laminas-stdlib",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger.git",
-                "reference": "1af2e2d69500da5ca31868c4817b6b7eb7e1cf47"
+                "url": "https://github.com/laminas/laminas-stdlib.git",
+                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-plugin-flashmessenger/zipball/1af2e2d69500da5ca31868c4817b6b7eb7e1cf47",
-                "reference": "1af2e2d69500da5ca31868c4817b6b7eb7e1cf47",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
+                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-mvc": "^3.0",
-                "zendframework/zend-session": "^2.8.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-view": "^2.10"
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+            "replace": {
+                "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-i18n": "^2.8"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpbench/phpbench": "^0.13",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev",
-                    "dev-develop": "1.2.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Mvc\\Plugin\\FlashMessenger"
+                    "dev-master": "3.2.x-dev",
+                    "dev-develop": "3.3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\Plugin\\FlashMessenger\\": "src/"
+                    "Laminas\\Stdlib\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Plugin for creating and exposing flash messages via zend-mvc controllers",
+            "description": "SPL extensions, array utilities, error handlers, and more",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "zf"
+                "laminas",
+                "stdlib"
             ],
-            "time": "2018-04-30T18:47:56+00:00"
+            "time": "2019-12-31T17:51:15+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-plugin-identity",
-            "version": "1.1.0",
+            "name": "laminas/laminas-tag",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-plugin-identity.git",
-                "reference": "4073192d875d6f7ae90adadd21d7e980faaac4a1"
+                "url": "https://github.com/laminas/laminas-tag.git",
+                "reference": "6af061af4d7a54f3ee6ba94846c0f21ad284dc10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-plugin-identity/zipball/4073192d875d6f7ae90adadd21d7e980faaac4a1",
-                "reference": "4073192d875d6f7ae90adadd21d7e980faaac4a1",
+                "url": "https://api.github.com/repos/laminas/laminas-tag/zipball/6af061af4d7a54f3ee6ba94846c0f21ad284dc10",
+                "reference": "6af061af4d7a54f3ee6ba94846c0f21ad284dc10",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.1",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-authentication": "^2.5.3",
-                "zendframework/zend-mvc": "^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+            "replace": {
+                "zendframework/zend-tag": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "suggest": {
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev",
-                    "dev-develop": "1.2.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Mvc\\Plugin\\Identity"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\Plugin\\Identity\\": "src/"
+                    "Laminas\\Tag\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Plugin for retrieving the current authenticated identity within zend-mvc controllers",
+            "description": "Manipulate and weight taggable items, and create tag clouds",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "zf"
+                "laminas",
+                "tag"
             ],
-            "time": "2018-04-30T19:50:13+00:00"
+            "time": "2019-12-31T17:52:40+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-plugin-prg",
-            "version": "1.1.0",
+            "name": "laminas/laminas-text",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-plugin-prg.git",
-                "reference": "9b9d555f936002b90f14fbbfe477e734601307b2"
+                "url": "https://github.com/laminas/laminas-text.git",
+                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-plugin-prg/zipball/9b9d555f936002b90f14fbbfe477e734601307b2",
-                "reference": "9b9d555f936002b90f14fbbfe477e734601307b2",
+                "url": "https://api.github.com/repos/laminas/laminas-text/zipball/3601b5eacb06ed0a12f658df860cc0f9613cf4db",
+                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-mvc": "^3.0",
-                "zendframework/zend-session": "^2.8.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+            "replace": {
+                "zendframework/zend-text": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev",
-                    "dev-develop": "1.2.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Mvc\\Plugin\\Prg"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Mvc\\Plugin\\Prg\\": "src/"
+                    "Laminas\\Text\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Post/Redirect/Get plugin for zend-mvc controllers",
+            "description": "Create FIGlets and text-based tables",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "zf"
+                "laminas",
+                "text"
             ],
-            "time": "2018-04-30T19:54:38+00:00"
+            "time": "2019-12-31T17:54:52+00:00"
         },
         {
-            "name": "zendframework/zend-mvc-plugins",
-            "version": "1.0.1",
+            "name": "laminas/laminas-uri",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-mvc-plugins.git",
-                "reference": "b00cda46b0a95cbd32ea0743d6d7dc3fd2263f1b"
+                "url": "https://github.com/laminas/laminas-uri.git",
+                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc-plugins/zipball/b00cda46b0a95cbd32ea0743d6d7dc3fd2263f1b",
-                "reference": "b00cda46b0a95cbd32ea0743d6d7dc3fd2263f1b",
+                "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
+                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-mvc-plugin-fileprg": "^1.0",
-                "zendframework/zend-mvc-plugin-flashmessenger": "^1.0",
-                "zendframework/zend-mvc-plugin-identity": "^1.0",
-                "zendframework/zend-mvc-plugin-prg": "^1.0"
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-validator": "^2.10",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
             },
-            "type": "metapackage",
+            "replace": {
+                "zendframework/zend-uri": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
-                "zf": {
-                    "component": [
-                        "Zend\\Mvc\\Plugin\\FilePrg",
-                        "Zend\\Mvc\\Plugin\\FlashMessenger",
-                        "Zend\\Mvc\\Plugin\\Identity",
-                        "Zend\\Mvc\\Plugin\\Prg"
-                    ]
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Uri\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Collection of all stable zend-mvc plugins served via separate packages.",
-            "homepage": "https://github.com/zendframework/zend-mvc-plugins",
+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "mvc",
-                "plugins",
-                "zf2"
+                "laminas",
+                "uri"
             ],
-            "time": "2016-06-02T18:41:26+00:00"
+            "time": "2019-12-31T17:56:00+00:00"
         },
         {
-            "name": "zendframework/zend-navigation",
-            "version": "2.9.0",
+            "name": "laminas/laminas-validator",
+            "version": "2.13.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-navigation.git",
-                "reference": "a8b088f64929e172617e02d2089cc00573a61210"
+                "url": "https://github.com/laminas/laminas-validator.git",
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-navigation/zipball/a8b088f64929e172617e02d2089cc00573a61210",
-                "reference": "a8b088f64929e172617e02d2089cc00573a61210",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/93593684e70b8ed1e870cacd34ca32b0c0ace185",
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.1"
+            },
+            "replace": {
+                "zendframework/zend-validator": "^2.13.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6 || ^3.1",
-                "zendframework/zend-console": "^2.6",
-                "zendframework/zend-http": "^2.6",
-                "zendframework/zend-i18n": "^2.7.3",
-                "zendframework/zend-log": "^2.9.1",
-                "zendframework/zend-mvc": "^2.7.9 || ^3.0.4",
-                "zendframework/zend-permissions-acl": "^2.6",
-                "zendframework/zend-router": "^3.0.2",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-uri": "^2.5.2",
-                "zendframework/zend-view": "^2.9"
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-db": "^2.7",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-math": "^2.6",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-uri": "^2.5",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.2",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
             },
             "suggest": {
-                "zendframework/zend-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)",
-                "zendframework/zend-permissions-acl": "^2.6, to provide ACL-based access restrictions to pages",
-                "zendframework/zend-router": "^3.0, to use router-based URI generation with Mvc pages",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories",
-                "zendframework/zend-view": "^2.8.1, to use the navigation view helpers"
+                "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
+                "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
+                "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
+                "laminas/laminas-i18n-resources": "Translations of validator messages",
+                "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+                "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
+                "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",
+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
+                    "dev-master": "2.13.x-dev",
+                    "dev-develop": "2.14.x-dev"
                 },
-                "zf": {
-                    "component": "Zend\\Navigation",
-                    "config-provider": "Zend\\Navigation\\ConfigProvider"
+                "laminas": {
+                    "component": "Laminas\\Validator",
+                    "config-provider": "Laminas\\Validator\\ConfigProvider"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Navigation\\": "src/"
+                    "Laminas\\Validator\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Manage trees of pointers to web pages in order to build navigation systems",
+            "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "navigation",
-                "zf"
+                "laminas",
+                "validator"
             ],
-            "time": "2018-04-25T20:19:50+00:00"
+            "time": "2020-03-31T18:57:01+00:00"
         },
         {
-            "name": "zendframework/zend-paginator",
-            "version": "2.8.1",
+            "name": "laminas/laminas-view",
+            "version": "2.11.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-paginator.git",
-                "reference": "fd58828c8280a90f133b9e0af2fe1a7885d47206"
+                "url": "https://github.com/laminas/laminas-view.git",
+                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-paginator/zipball/fd58828c8280a90f133b9e0af2fe1a7885d47206",
-                "reference": "fd58828c8280a90f133b9e0af2fe1a7885d47206",
+                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3bbb2e94287383604c898284a18d2d06cf17301e",
+                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^5.6",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-json": "^2.6.1 || ^3.0",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-view": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2.1 || ^5.7.15",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6.0",
-                "zendframework/zend-db": "^2.9.2",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-json": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-view": "^2.6.3"
+                "laminas/laminas-authentication": "^2.5",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-feed": "^2.7",
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-log": "^2.7",
+                "laminas/laminas-modulemanager": "^2.7.1",
+                "laminas/laminas-mvc": "^2.7.14 || ^3.0",
+                "laminas/laminas-navigation": "^2.5",
+                "laminas/laminas-paginator": "^2.5",
+                "laminas/laminas-permissions-acl": "^2.6",
+                "laminas/laminas-router": "^3.0.1",
+                "laminas/laminas-serializer": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8.1",
+                "laminas/laminas-uri": "^2.5",
+                "phpunit/phpunit": "^5.7.15 || ^6.0.8"
             },
             "suggest": {
-                "zendframework/zend-cache": "Zend\\Cache component to support cache features",
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-json": "Zend\\Json component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-view": "Zend\\View component"
+                "laminas/laminas-authentication": "Laminas\\Authentication component",
+                "laminas/laminas-escaper": "Laminas\\Escaper component",
+                "laminas/laminas-feed": "Laminas\\Feed component",
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-i18n": "Laminas\\I18n component",
+                "laminas/laminas-mvc": "Laminas\\Mvc component",
+                "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up",
+                "laminas/laminas-navigation": "Laminas\\Navigation component",
+                "laminas/laminas-paginator": "Laminas\\Paginator component",
+                "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-uri": "Laminas\\Uri component"
             },
+            "bin": [
+                "bin/templatemap_generator.php"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Paginator",
-                    "config-provider": "Zend\\Paginator\\ConfigProvider"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Paginator\\": "src/"
+                    "Laminas\\View\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "zend-paginator is a flexible component for paginating collections of data and presenting that data to users.",
-            "homepage": "https://github.com/zendframework/zend-paginator",
+            "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "paginator",
-                "zf2"
+                "laminas",
+                "view"
             ],
-            "time": "2018-01-30T15:52:44+00:00"
+            "time": "2019-12-31T18:03:30+00:00"
         },
         {
-            "name": "zendframework/zend-permissions-acl",
-            "version": "2.7.0",
+            "name": "laminas/laminas-xml",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-permissions-acl.git",
-                "reference": "c9568f4aee2887e43bf07769973f9686e8f61707"
+                "url": "https://github.com/laminas/laminas-xml.git",
+                "reference": "879cc66d1bba6a37705e98074f52a6960c220020"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-permissions-acl/zipball/c9568f4aee2887e43bf07769973f9686e8f61707",
-                "reference": "c9568f4aee2887e43bf07769973f9686e8f61707",
+                "url": "https://api.github.com/repos/laminas/laminas-xml/zipball/879cc66d1bba6a37705e98074f52a6960c220020",
+                "reference": "879cc66d1bba6a37705e98074f52a6960c220020",
                 "shasum": ""
             },
             "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            "replace": {
+                "zendframework/zendxml": "self.version"
             },
-            "suggest": {
-                "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "1.2.x-dev",
+                    "dev-develop": "1.3.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Permissions\\Acl\\": "src/"
+                    "Laminas\\Xml\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Provides a lightweight and flexible access control list (ACL) implementation for privileges management",
+            "description": "Utility library for XML usage, best practices, and security in PHP",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "acl",
-                "zf"
+                "laminas",
+                "security",
+                "xml"
             ],
-            "time": "2018-05-01T21:53:20+00:00"
+            "time": "2019-12-31T18:05:42+00:00"
         },
         {
-            "name": "zendframework/zend-permissions-rbac",
-            "version": "2.6.0",
+            "name": "laminas/laminas-xmlrpc",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-permissions-rbac.git",
-                "reference": "c10ad55e50f402bf14eb2eb9bc424dd9a44dfc78"
+                "url": "https://github.com/laminas/laminas-xmlrpc.git",
+                "reference": "1461f9777ec59f6c5dcbd727e23548ea1cbe4dcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-permissions-rbac/zipball/c10ad55e50f402bf14eb2eb9bc424dd9a44dfc78",
-                "reference": "c10ad55e50f402bf14eb2eb9bc424dd9a44dfc78",
+                "url": "https://api.github.com/repos/laminas/laminas-xmlrpc/zipball/1461f9777ec59f6c5dcbd727e23548ea1cbe4dcc",
+                "reference": "1461f9777ec59f6c5dcbd727e23548ea1cbe4dcc",
                 "shasum": ""
             },
             "require": {
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-math": "^2.7 || ^3.0",
+                "laminas/laminas-server": "^2.7",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-xml": "^1.0.2",
+                "laminas/laminas-zendframework-bridge": "^1.0",
                 "php": "^5.6 || ^7.0"
             },
+            "replace": {
+                "zendframework/zend-xmlrpc": "self.version"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.15|| ^6.2.1",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "laminas/laminas-cache": "To support Laminas\\XmlRpc\\Server\\Cache usage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Permissions\\Rbac\\": "src/"
+                    "Laminas\\XmlRpc\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a role-based access control management",
-            "homepage": "https://github.com/zendframework/zend-permissions-rbac",
+            "description": "Fully-featured XML-RPC server and client implementations",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "rbac",
-                "zf2"
+                "laminas",
+                "xmlrpc"
             ],
-            "time": "2018-02-01T09:55:50+00:00"
+            "time": "2019-12-31T18:07:12+00:00"
         },
         {
-            "name": "zendframework/zend-progressbar",
-            "version": "2.6.0",
+            "name": "laminas/laminas-zendframework-bridge",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-progressbar.git",
-                "reference": "ae5565bbed54f9081d5695bc2f62fe3f27583bdd"
+                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-progressbar/zipball/ae5565bbed54f9081d5695bc2f62fe3f27583bdd",
-                "reference": "ae5565bbed54f9081d5695bc2f62fe3f27583bdd",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-json": "^2.6.1",
-                "zendframework/zend-session": "^2.8.5"
-            },
-            "suggest": {
-                "zendframework/zend-json": "Zend\\Json component",
-                "zendframework/zend-session": "To support progressbar persistent"
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+                "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "1.0.x-dev",
+                    "dev-develop": "1.1.x-dev"
+                },
+                "laminas": {
+                    "module": "Laminas\\ZendFrameworkBridge"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
                 "psr-4": {
-                    "Zend\\ProgressBar\\": "src/"
+                    "Laminas\\ZendFrameworkBridge\\": "src//"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Create and update progress bars in different environments",
+            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
             "keywords": [
                 "ZendFramework",
-                "progressbar",
+                "autoloading",
+                "laminas",
                 "zf"
             ],
-            "time": "2018-04-30T19:15:33+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-04-03T16:01:00+00:00"
         },
         {
-            "name": "zendframework/zend-router",
-            "version": "3.3.0",
+            "name": "lsolesen/pel",
+            "version": "0.9.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-router.git",
-                "reference": "b113a4cfd910ee4723079fa58a9bcf3198631620"
+                "url": "https://github.com/pel/pel.git",
+                "reference": "92da891eaeeabbb00bcd09e0cea53796cf9ca967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-router/zipball/b113a4cfd910ee4723079fa58a9bcf3198631620",
-                "reference": "b113a4cfd910ee4723079fa58a9bcf3198631620",
+                "url": "https://api.github.com/repos/pel/pel/zipball/92da891eaeeabbb00bcd09e0cea53796cf9ca967",
+                "reference": "92da891eaeeabbb00bcd09e0cea53796cf9ca967",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-http": "^2.8.1",
-                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
-                "zendframework/zend-stdlib": "^3.2.1"
-            },
-            "conflict": {
-                "zendframework/zend-mvc": "<3.0.0"
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.22 || ^6.4.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-i18n": "^2.7.4"
-            },
-            "suggest": {
-                "zendframework/zend-i18n": "^2.7.4, if defining translatable HTTP path segments"
+                "ext-gd": "*",
+                "phpunit/phpunit": ">=4.8.36 <8",
+                "satooshi/php-coveralls": "1.0.*",
+                "squizlabs/php_codesniffer": "^3.0.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3.x-dev",
-                    "dev-develop": "4.0.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Router",
-                    "config-provider": "Zend\\Router\\ConfigProvider"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Router\\": "src/"
+                    "lsolesen\\pel\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "GPL-2.0"
             ],
-            "description": "Flexible routing system for HTTP and console applications",
+            "authors": [
+                {
+                    "name": "Lars Olesen",
+                    "email": "lars@intraface.dk",
+                    "homepage": "http://intraface.dk",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Martin Geisler",
+                    "email": "martin@geisler.net",
+                    "homepage": "http://geisler.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.",
+            "homepage": "http://pel.github.com/pel/",
             "keywords": [
-                "ZendFramework",
-                "mvc",
-                "routing",
-                "zend",
-                "zf"
+                "exif",
+                "image"
             ],
-            "time": "2019-02-26T20:24:12+00:00"
+            "time": "2020-02-11T12:05:42+00:00"
         },
         {
-            "name": "zendframework/zend-serializer",
-            "version": "2.9.0",
+            "name": "ml/iri",
+            "version": "1.1.4",
+            "target-dir": "ML/IRI",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
+                "url": "https://github.com/lanthaler/IRI.git",
+                "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
-                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
+                "url": "https://api.github.com/repos/lanthaler/IRI/zipball/cbd44fa913e00ea624241b38cefaa99da8d71341",
+                "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-json": "^2.5 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-math": "^2.6 || ^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-            },
-            "suggest": {
-                "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-                "zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+                "lib-pcre": ">=4.0",
+                "php": ">=5.3.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Serializer",
-                    "config-provider": "Zend\\Serializer\\ConfigProvider"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Zend\\Serializer\\": "src/"
+                "psr-0": {
+                    "ML\\IRI": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Markus Lanthaler",
+                    "email": "mail@markus-lanthaler.com",
+                    "homepage": "http://www.markus-lanthaler.com",
+                    "role": "Developer"
+                }
             ],
-            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "description": "IRI handling for PHP",
+            "homepage": "http://www.markus-lanthaler.com",
             "keywords": [
-                "ZendFramework",
-                "serializer",
-                "zf"
+                "URN",
+                "iri",
+                "uri",
+                "url"
             ],
-            "time": "2018-05-14T18:45:18+00:00"
+            "time": "2014-01-21T13:43:39+00:00"
         },
         {
-            "name": "zendframework/zend-server",
-            "version": "2.8.0",
+            "name": "ml/json-ld",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-server.git",
-                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
+                "url": "https://github.com/lanthaler/JsonLD.git",
+                "reference": "b5f82820c255cb64067b1c7adbb819cad4afa70a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
-                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/b5f82820c255cb64067b1c7adbb819cad4afa70a",
+                "reference": "b5f82820c255cb64067b1c7adbb819cad4afa70a",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-code": "^2.5 || ^3.0",
-                "zendframework/zend-stdlib": "^2.5 || ^3.0"
+                "ext-json": "*",
+                "ml/iri": "^1.1.1",
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "json-ld/tests": "1.0",
+                "phpunit/phpunit": "^4"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Server\\": "src/"
+                    "ML\\JsonLD\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Create Reflection-based RPC servers",
+            "authors": [
+                {
+                    "name": "Markus Lanthaler",
+                    "email": "mail@markus-lanthaler.com",
+                    "homepage": "http://www.markus-lanthaler.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "JSON-LD Processor for PHP",
+            "homepage": "http://www.markus-lanthaler.com",
             "keywords": [
-                "ZendFramework",
-                "server",
-                "zf"
+                "JSON-LD",
+                "jsonld"
             ],
-            "time": "2018-04-30T22:21:28+00:00"
+            "time": "2018-11-18T20:26:18+00:00"
         },
         {
-            "name": "zendframework/zend-servicemanager",
-            "version": "3.4.0",
+            "name": "ocramius/package-versions",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "a1ed6140d0d3ee803fec96582593ed024950067b"
+                "url": "https://github.com/Ocramius/PackageVersions.git",
+                "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/a1ed6140d0d3ee803fec96582593ed024950067b",
-                "reference": "a1ed6140d0d3ee803fec96582593ed024950067b",
+                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
+                "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.6 || ^7.0",
-                "psr/container": "^1.0",
-                "zendframework/zend-stdlib": "^3.2.1"
-            },
-            "provide": {
-                "container-interop/container-interop-implementation": "^1.2",
-                "psr/container-implementation": "^1.0"
+                "composer-plugin-api": "^1.0.0",
+                "php": "^7.1.0"
             },
             "require-dev": {
-                "mikey179/vfsstream": "^1.6.5",
-                "ocramius/proxy-manager": "^1.0 || ^2.0",
-                "phpbench/phpbench": "^0.13.0",
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "composer/composer": "^1.6.3",
+                "doctrine/coding-standard": "^5.0.1",
+                "ext-zip": "*",
+                "infection/infection": "^0.7.1",
+                "phpunit/phpunit": "^7.5.17"
             },
-            "suggest": {
-                "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services",
-                "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances"
-            },
-            "bin": [
-                "bin/generate-deps-for-config-factory",
-                "bin/generate-factory-for-class"
-            ],
-            "type": "library",
+            "type": "composer-plugin",
             "extra": {
+                "class": "PackageVersions\\Installer",
                 "branch-alias": {
-                    "dev-master": "3.3-dev",
-                    "dev-develop": "4.0-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\ServiceManager\\": "src/"
+                    "PackageVersions\\": "src/PackageVersions"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Factory-Driven Dependency Injection Container",
-            "keywords": [
-                "PSR-11",
-                "ZendFramework",
-                "dependency-injection",
-                "di",
-                "dic",
-                "service-manager",
-                "servicemanager",
-                "zf"
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
             ],
-            "time": "2018-12-22T06:05:09+00:00"
+            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+            "time": "2019-11-15T16:17:10+00:00"
         },
         {
-            "name": "zendframework/zend-session",
-            "version": "2.8.5",
+            "name": "omeka-s-themes/default",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-session.git",
-                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b"
+                "url": "https://github.com/omeka-s-themes/default.git",
+                "reference": "750d45f7ee8033be96a7645d7882fab48843f630"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/2cfd90e1a2f6b066b9f908599251d8f64f07021b",
-                "reference": "2cfd90e1a2f6b066b9f908599251d8f64f07021b",
+                "url": "https://api.github.com/repos/omeka-s-themes/default/zipball/750d45f7ee8033be96a7645d7882fab48843f630",
+                "reference": "750d45f7ee8033be96a7645d7882fab48843f630",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "omeka/omeka-s": "*"
             },
-            "require-dev": {
-                "container-interop/container-interop": "^1.1",
-                "mongodb/mongodb": "^1.0.1",
-                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-                "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-db": "^2.7",
-                "zendframework/zend-http": "^2.5.4",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-validator": "^2.6"
+            "type": "omeka-s-theme",
+            "support": {
+                "source": "https://github.com/omeka-s-themes/default/tree/v1.5.1",
+                "issues": "https://github.com/omeka-s-themes/default/issues"
             },
-            "suggest": {
-                "mongodb/mongodb": "If you want to use the MongoDB session save handler",
-                "zendframework/zend-cache": "Zend\\Cache component",
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-validator": "Zend\\Validator component"
+            "time": "2020-03-31T18:36:01+00:00"
+        },
+        {
+            "name": "omeka/composer-addon-installer",
+            "version": "1.0",
+            "dist": {
+                "type": "path",
+                "url": "application/data/composer-addon-installer",
+                "reference": "acaf7604e506ac3a4cba691e89e8e2527d0d8194"
             },
-            "type": "library",
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "type": "composer-plugin",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Session",
-                    "config-provider": "Zend\\Session\\ConfigProvider"
-                }
+                "class": "Omeka\\Composer\\AddonInstallerPlugin"
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Session\\": "src/"
+                    "Omeka\\Composer\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
-            "keywords": [
-                "ZendFramework",
-                "session",
-                "zf"
-            ],
-            "time": "2018-02-22T16:33:54+00:00"
+                "GPL-3.0"
+            ]
         },
         {
-            "name": "zendframework/zend-soap",
-            "version": "2.6.0",
+            "name": "paragonie/random_compat",
+            "version": "v9.99.99",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-soap.git",
-                "reference": "2d6012e7231cce550219eccfc80836a028d20bf1"
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/2d6012e7231cce550219eccfc80836a028d20bf1",
-                "reference": "2d6012e7231cce550219eccfc80836a028d20bf1",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "zendframework/zend-server": "^2.6.1",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-uri": "^2.5.2"
+                "php": "^7"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "squizlabs/php_codesniffer": "^2.3.1",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-http": "^2.5.4"
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
             },
             "suggest": {
-                "zendframework/zend-http": "Zend\\Http component"
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Soap\\": "src/"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
             ],
-            "homepage": "https://github.com/zendframework/zend-soap",
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
             "keywords": [
-                "soap",
-                "zf2"
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
             ],
-            "time": "2016-04-21T16:06:27+00:00"
+            "time": "2018-07-02T15:55:56+00:00"
         },
         {
-            "name": "zendframework/zend-stdlib",
-            "version": "3.2.1",
+            "name": "psr/cache",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "66536006722aff9e62d1b331025089b7ec71c065"
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
-                "reference": "66536006722aff9e62d1b331025089b7ec71c065",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpbench/phpbench": "^0.13",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev",
-                    "dev-develop": "3.3.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Stdlib\\": "src/"
+                    "Psr\\Cache\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "SPL extensions, array utilities, error handlers, and more",
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
             "keywords": [
-                "ZendFramework",
-                "stdlib",
-                "zf"
+                "cache",
+                "psr",
+                "psr-6"
             ],
-            "time": "2018-08-28T21:34:05+00:00"
+            "time": "2016-08-06T20:24:11+00:00"
         },
         {
-            "name": "zendframework/zend-tag",
-            "version": "2.7.1",
+            "name": "psr/container",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-tag.git",
-                "reference": "a9f92a01157dac2ce20bf5d5de2291b1294d3f88"
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-tag/zipball/a9f92a01157dac2ce20bf5d5de2291b1294d3f88",
-                "reference": "a9f92a01157dac2ce20bf5d5de2291b1294d3f88",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-            },
-            "suggest": {
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Tag\\": "src/"
+                    "Psr\\Container\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Manipulate and weight taggable items, and create tag clouds",
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
             "keywords": [
-                "ZendFramework",
-                "tag",
-                "zf"
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
             ],
-            "time": "2019-04-30T21:23:21+00:00"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
-            "name": "zendframework/zend-text",
-            "version": "2.7.0",
+            "name": "psr/log",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-text.git",
-                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Text\\": "src/"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Create FIGlets and text-based tables",
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
-                "ZendFramework",
-                "text",
-                "zf"
+                "log",
+                "psr",
+                "psr-3"
             ],
-            "time": "2018-04-30T14:55:10+00:00"
+            "time": "2020-03-23T09:12:05+00:00"
         },
         {
-            "name": "zendframework/zend-uri",
-            "version": "2.7.0",
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-validator": "^2.10"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Uri\\": "src/"
+                    "Psr\\SimpleCache\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
             "keywords": [
-                "ZendFramework",
-                "uri",
-                "zf"
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
             ],
-            "time": "2019-02-27T21:39:04+00:00"
+            "time": "2017-10-23T01:57:42+00:00"
         },
         {
-            "name": "zendframework/zend-validator",
-            "version": "2.12.0",
+            "name": "symfony/console",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-validator.git",
-                "reference": "64c33668e5fa2d39c6289a878f927ea2b0850c30"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "bf60d5e606cd595391c5f82bf6b570d9573fa120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/64c33668e5fa2d39c6289a878f927ea2b0850c30",
-                "reference": "64c33668e5fa2d39c6289a878f927ea2b0850c30",
+                "url": "https://api.github.com/repos/symfony/console/zipball/bf60d5e606cd595391c5f82bf6b570d9573fa120",
+                "reference": "bf60d5e606cd595391c5f82bf6b570d9573fa120",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.1",
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-stdlib": "^3.2.1"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-                "psr/http-message": "^1.0",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-db": "^2.7",
-                "zendframework/zend-filter": "^2.6",
-                "zendframework/zend-http": "^2.5.4",
-                "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-math": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-session": "^2.8",
-                "zendframework/zend-uri": "^2.5"
+                "psr/log": "~1.0",
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
-                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
-                "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
-                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
-                "zendframework/zend-i18n-resources": "Translations of validator messages",
-                "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-                "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
-                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
-                },
-                "zf": {
-                    "component": "Zend\\Validator",
-                    "config-provider": "Zend\\Validator\\ConfigProvider"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\Validator\\": "src/"
-                }
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "provides a set of commonly needed validators",
-            "homepage": "https://github.com/zendframework/zend-validator",
-            "keywords": [
-                "validator",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2019-01-30T14:26:10+00:00"
+            "time": "2020-03-27T17:07:22+00:00"
         },
         {
-            "name": "zendframework/zend-view",
-            "version": "2.11.2",
+            "name": "symfony/debug",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2"
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
-                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29",
+                "reference": "ce9f3b5e8e1c50f849fded59b3a1b6bc3562ec29",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-json": "^2.6.1 || ^3.0",
-                "zendframework/zend-loader": "^2.5",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.15 || ^6.0.8",
-                "zendframework/zend-authentication": "^2.5",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-config": "^2.6",
-                "zendframework/zend-console": "^2.6",
-                "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-feed": "^2.7",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-http": "^2.5.4",
-                "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-log": "^2.7",
-                "zendframework/zend-modulemanager": "^2.7.1",
-                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
-                "zendframework/zend-navigation": "^2.5",
-                "zendframework/zend-paginator": "^2.5",
-                "zendframework/zend-permissions-acl": "^2.6",
-                "zendframework/zend-router": "^3.0.1",
-                "zendframework/zend-serializer": "^2.6.1",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-session": "^2.8.1",
-                "zendframework/zend-uri": "^2.5"
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
-            "suggest": {
-                "zendframework/zend-authentication": "Zend\\Authentication component",
-                "zendframework/zend-escaper": "Zend\\Escaper component",
-                "zendframework/zend-feed": "Zend\\Feed component",
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-mvc": "Zend\\Mvc component",
-                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
-                "zendframework/zend-navigation": "Zend\\Navigation component",
-                "zendframework/zend-paginator": "Zend\\Paginator component",
-                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-uri": "Zend\\Uri component"
+            "require-dev": {
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
             },
-            "bin": [
-                "bin/templatemap_generator.php"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\View\\": "src/"
-                }
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "provides a system of helpers, output filters, and variable escaping",
-            "homepage": "https://github.com/zendframework/zend-view",
-            "keywords": [
-                "view",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
             ],
-            "time": "2019-02-19T17:40:15+00:00"
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-23T10:22:40+00:00"
         },
         {
-            "name": "zendframework/zend-xmlrpc",
-            "version": "2.7.0",
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-xmlrpc.git",
-                "reference": "97e7d70d71b040c8fc94807a911ee9a53dc35ef5"
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-xmlrpc/zipball/97e7d70d71b040c8fc94807a911ee9a53dc35ef5",
-                "reference": "97e7d70d71b040c8fc94807a911ee9a53dc35ef5",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "zendframework/zend-http": "^2.5.4",
-                "zendframework/zend-math": "^2.7 || ^3.0",
-                "zendframework/zend-server": "^2.7",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zendxml": "^1.0.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "php": ">=5.3.3"
             },
             "suggest": {
-                "zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"
+                "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Zend\\XmlRpc\\": "src/"
-                }
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Fully-featured XML-RPC server and client implementations",
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
             "keywords": [
-                "ZendFramework",
-                "xmlrpc",
-                "zf"
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2018-05-14T19:17:17+00:00"
+            "time": "2020-03-09T19:04:49+00:00"
         },
         {
-            "name": "zendframework/zendxml",
-            "version": "1.2.0",
+            "name": "true/punycode",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/ZendXml.git",
-                "reference": "eceab37a591c9e140772a1470338258857339e00"
+                "url": "https://github.com/true/php-punycode.git",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/eceab37a591c9e140772a1470338258857339e00",
-                "reference": "eceab37a591c9e140772a1470338258857339e00",
+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=5.3.0",
+                "symfony/polyfill-mbstring": "^1.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-                "zendframework/zend-coding-standard": "~1.0.0"
+                "phpunit/phpunit": "~4.7",
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev",
-                    "dev-develop": "1.3.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "ZendXml\\": "src/"
+                    "TrueBV\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Utility library for XML usage, best practices, and security in PHP",
+            "authors": [
+                {
+                    "name": "Renan Gonçalves",
+                    "email": "renan.saddam@gmail.com"
+                }
+            ],
+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
+            "homepage": "https://github.com/true/php-punycode",
             "keywords": [
-                "ZendFramework",
-                "security",
-                "xml",
-                "zf"
+                "idna",
+                "punycode"
             ],
-            "time": "2019-01-22T19:42:14+00:00"
+            "time": "2016-11-16T10:37:54+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.3",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0",
+                "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
             },
             "type": "library",
             "autoload": {
@@ -5079,25 +5409,31 @@
                     "email": "john-stevenson@blueyonder.co.uk"
                 }
             ],
-            "description": "Restarts a process without xdebug.",
+            "description": "Restarts a process without Xdebug.",
             "keywords": [
                 "Xdebug",
                 "performance"
             ],
-            "time": "2019-05-27T17:52:04+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                }
+            ],
+            "time": "2020-03-01T12:26:26+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.15.0",
+            "version": "v2.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91"
+                "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
-                "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c8afb599858876e95e8ebfcd97812d383fa23f02",
+                "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02",
                 "shasum": ""
             },
             "require": {
@@ -5108,15 +5444,15 @@
                 "ext-tokenizer": "*",
                 "php": "^5.6 || ^7.0",
                 "php-cs-fixer/diff": "^1.3",
-                "symfony/console": "^3.4.17 || ^4.1.6",
-                "symfony/event-dispatcher": "^3.0 || ^4.0",
-                "symfony/filesystem": "^3.0 || ^4.0",
-                "symfony/finder": "^3.0 || ^4.0",
-                "symfony/options-resolver": "^3.0 || ^4.0",
+                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
+                "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
+                "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
+                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
+                "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
                 "symfony/polyfill-php70": "^1.0",
                 "symfony/polyfill-php72": "^1.4",
-                "symfony/process": "^3.0 || ^4.0",
-                "symfony/stopwatch": "^3.0 || ^4.0"
+                "symfony/process": "^3.0 || ^4.0 || ^5.0",
+                "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
                 "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
@@ -5127,9 +5463,10 @@
                 "php-cs-fixer/accessible-object": "^1.0",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
                 "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.0"
+                "symfony/phpunit-bridge": "^4.3 || ^5.0",
+                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@@ -5141,56 +5478,124 @@
                 "php-cs-fixer"
             ],
             "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "classmap": [
+                    "tests/Test/AbstractFixerTestCase.php",
+                    "tests/Test/AbstractIntegrationCaseFactory.php",
+                    "tests/Test/AbstractIntegrationTestCase.php",
+                    "tests/Test/Assert/AssertTokensTrait.php",
+                    "tests/Test/IntegrationCase.php",
+                    "tests/Test/IntegrationCaseFactory.php",
+                    "tests/Test/IntegrationCaseFactoryInterface.php",
+                    "tests/Test/InternalIntegrationCaseFactory.php",
+                    "tests/TestCase.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "time": "2019-11-25T22:10:32+00:00"
+        },
+        {
+            "name": "laminas/laminas-test",
+            "version": "3.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-test.git",
+                "reference": "b540d62ca1d3efc0813cdb50bfaf8e4abcf88426"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-test/zipball/b540d62ca1d3efc0813cdb50bfaf8e4abcf88426",
+                "reference": "b540d62ca1d3efc0813cdb50bfaf8e4abcf88426",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-dom": "^2.6",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-http": "^2.8.3",
+                "laminas/laminas-mvc": "^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-uri": "^2.5",
+                "laminas/laminas-view": "^2.6.3",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "replace": {
+                "zendframework/zend-test": "^3.3.0"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-log": "^2.7.1",
+                "laminas/laminas-modulemanager": "^2.7.1",
+                "laminas/laminas-mvc-console": "^1.1.8",
+                "laminas/laminas-mvc-plugin-flashmessenger": "^0.1.0",
+                "laminas/laminas-serializer": "^2.6.1",
+                "laminas/laminas-session": "^2.8.5",
+                "laminas/laminas-validator": "^2.8",
+                "mikey179/vfsstream": "~1.2"
+            },
+            "suggest": {
+                "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
+            },
+            "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.15-dev"
+                    "dev-master": "3.4.x-dev",
+                    "dev-develop": "3.5.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "autoload/phpunit-class-aliases.php"
+                ],
                 "psr-4": {
-                    "PhpCsFixer\\": "src/"
-                },
-                "classmap": [
-                    "tests/Test/AbstractFixerTestCase.php",
-                    "tests/Test/AbstractIntegrationCaseFactory.php",
-                    "tests/Test/AbstractIntegrationTestCase.php",
-                    "tests/Test/Assert/AssertTokensTrait.php",
-                    "tests/Test/IntegrationCase.php",
-                    "tests/Test/IntegrationCaseFactory.php",
-                    "tests/Test/IntegrationCaseFactoryInterface.php",
-                    "tests/Test/InternalIntegrationCaseFactory.php",
-                    "tests/TestCase.php"
-                ]
+                    "Laminas\\Test\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
+            "description": "Tools to facilitate unit testing of laminas-mvc applications",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "test"
             ],
-            "description": "A tool to automatically fix PHP code style",
-            "time": "2019-05-06T07:13:51+00:00"
+            "time": "2020-03-29T13:38:04+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.1",
+            "version": "1.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
                 "shasum": ""
             },
             "require": {
@@ -5225,26 +5630,26 @@
                 "object",
                 "object graph"
             ],
-            "time": "2019-04-07T13:18:21+00:00"
+            "time": "2020-01-17T21:11:47+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
+                "phar-io/version": "^2.0",
                 "php": "^5.6 || ^7.0"
             },
             "type": "library",
@@ -5280,20 +5685,20 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
+            "time": "2018-07-08T19:23:20+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
                 "shasum": ""
             },
             "require": {
@@ -5327,7 +5732,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
+            "time": "2018-07-08T19:19:57+00:00"
         },
         {
             "name": "php-cs-fixer/diff",
@@ -5382,35 +5787,33 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5432,31 +5835,32 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.1",
+            "version": "4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c",
+                "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
+                "doctrine/instantiator": "^1.0.5",
                 "mockery/mockery": "^1.0",
+                "phpdocumentor/type-resolver": "0.4.*",
                 "phpunit/phpunit": "^6.4"
             },
             "type": "library",
@@ -5483,41 +5887,40 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-04-30T17:48:53+00:00"
+            "time": "2019-12-28T18:55:12+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.1",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "^7.1",
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5530,42 +5933,43 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
+                "phpspec/phpspec": "^2.5 || ^3.2",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.10.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5593,44 +5997,44 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.3.2",
+            "version": "6.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0",
-                "phpunit/php-file-iterator": "^1.4.2",
+                "php": "^7.1",
+                "phpunit/php-file-iterator": "^2.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0.1",
+                "phpunit/php-token-stream": "^3.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.0",
+                "sebastian/environment": "^3.1 || ^4.0",
                 "sebastian/version": "^2.0.1",
                 "theseer/tokenizer": "^1.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^7.0"
             },
             "suggest": {
-                "ext-xdebug": "^2.5.5"
+                "ext-xdebug": "^2.6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.3.x-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -5656,29 +6060,32 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-06T15:36:58+00:00"
+            "time": "2018-10-31T16:06:48+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -5693,7 +6100,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -5703,7 +6110,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-27T13:52:08+00:00"
+            "time": "2018-09-13T20:33:42+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -5748,28 +6155,28 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.9",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -5784,7 +6191,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -5793,33 +6200,33 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "time": "2019-06-07T04:22:29+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "2.0.2",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -5842,57 +6249,57 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-11-27T05:48:46+00:00"
+            "time": "2019-09-17T06:23:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.5.14",
+            "version": "7.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7"
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7",
-                "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
                 "shasum": ""
             },
             "require": {
+                "doctrine/instantiator": "^1.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.0",
+                "myclabs/deep-copy": "^1.7",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
+                "php": "^7.1",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-code-coverage": "^6.0.7",
+                "phpunit/php-file-iterator": "^2.0.1",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.9",
-                "sebastian/comparator": "^2.1",
-                "sebastian/diff": "^2.0",
-                "sebastian/environment": "^3.1",
+                "phpunit/php-timer": "^2.1",
+                "sebastian/comparator": "^3.0",
+                "sebastian/diff": "^3.0",
+                "sebastian/environment": "^4.0",
                 "sebastian/exporter": "^3.1",
                 "sebastian/global-state": "^2.0",
                 "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
+                "sebastian/resource-operations": "^2.0",
                 "sebastian/version": "^2.0.1"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2",
-                "phpunit/dbunit": "<3.0"
+                "phpunit/phpunit-mock-objects": "*"
             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
+                "ext-soap": "*",
                 "ext-xdebug": "*",
-                "phpunit/php-invoker": "^1.1"
+                "phpunit/php-invoker": "^2.0"
             },
             "bin": [
                 "phpunit"
@@ -5900,7 +6307,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.5.x-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -5926,67 +6333,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-02-01T05:22:47+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.5.11"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "abandoned": true,
-            "time": "2018-08-09T05:50:03+00:00"
+            "time": "2020-01-08T08:45:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -6035,30 +6382,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.1.3",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
+                "php": "^7.1",
+                "sebastian/diff": "^3.0",
                 "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6095,32 +6442,33 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-02-01T13:46:46+00:00"
+            "time": "2018-07-12T15:12:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2"
+                "phpunit/phpunit": "^7.5 || ^8.0",
+                "symfony/process": "^2 || ^3.3 || ^4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -6145,34 +6493,40 @@
             "description": "Diff implementation",
             "homepage": "https://github.com/sebastianbergmann/diff",
             "keywords": [
-                "diff"
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
             ],
-            "time": "2017-08-03T08:09:46+00:00"
+            "time": "2019-02-04T06:01:07+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "3.1.0",
+            "version": "4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+                "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.1"
+                "phpunit/phpunit": "^7.5"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -6197,20 +6551,20 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-07-01T08:51:00+00:00"
+            "time": "2019-11-20T08:46:58+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.0",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
                 "shasum": ""
             },
             "require": {
@@ -6237,6 +6591,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -6245,17 +6603,13 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -6264,7 +6618,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2019-09-14T09:02:43+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -6464,25 +6818,25 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -6502,7 +6856,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "time": "2018-10-04T04:07:39+00:00"
         },
         {
             "name": "sebastian/version",
@@ -6549,16 +6903,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff"
+                "reference": "9d4e22943b73acc1ba50595b7de1a01fe9dbad48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a088aafcefb4eef2520a290ed82e4374092a6dff",
-                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9d4e22943b73acc1ba50595b7de1a01fe9dbad48",
+                "reference": "9d4e22943b73acc1ba50595b7de1a01fe9dbad48",
                 "shasum": ""
             },
             "require": {
@@ -6608,20 +6962,34 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-04-02T08:51:52+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-15T09:38:08+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb"
+                "reference": "ec47520778d524b1736e768e0678cd1f01c03019"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/acf99758b1df8e9295e6b85aa69f294565c9fedb",
-                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ec47520778d524b1736e768e0678cd1f01c03019",
+                "reference": "ec47520778d524b1736e768e0678cd1f01c03019",
                 "shasum": ""
             },
             "require": {
@@ -6658,20 +7026,34 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-04T21:34:32+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-16T08:31:04+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "fa5d962a71f2169dfe1cbae217fa5a2799859f6c"
+                "reference": "5ec813ccafa8164ef21757e8c725d3a57da59200"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/fa5d962a71f2169dfe1cbae217fa5a2799859f6c",
-                "reference": "fa5d962a71f2169dfe1cbae217fa5a2799859f6c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5ec813ccafa8164ef21757e8c725d3a57da59200",
+                "reference": "5ec813ccafa8164ef21757e8c725d3a57da59200",
                 "shasum": ""
             },
             "require": {
@@ -6707,20 +7089,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-24T12:25:55+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-02-14T07:34:21+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44"
+                "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
-                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
+                "reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
                 "shasum": ""
             },
             "require": {
@@ -6761,20 +7157,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2019-04-10T16:00:48+00:00"
+            "time": "2020-01-01T11:03:25+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.11.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "82ebae02209c21113908c229e9883c419720738a"
+                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
                 "shasum": ""
             },
             "require": {
@@ -6786,7 +7182,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
@@ -6802,13 +7198,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Gert de Pagter",
                     "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -6819,20 +7215,34 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-02-27T09:26:54+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.11.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "bc4858fb611bda58719124ca079baff854149c89"
+                "reference": "2a18e37a489803559284416df58c71ccebe50bf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
-                "reference": "bc4858fb611bda58719124ca079baff854149c89",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/2a18e37a489803559284416df58c71ccebe50bf0",
+                "reference": "2a18e37a489803559284416df58c71ccebe50bf0",
                 "shasum": ""
             },
             "require": {
@@ -6842,7 +7252,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
@@ -6878,20 +7288,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2020-02-27T09:26:54+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.11.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
-                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
                 "shasum": ""
             },
             "require": {
@@ -6900,7 +7310,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.15-dev"
                 }
             },
             "autoload": {
@@ -6933,20 +7343,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-02-27T09:26:54+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "afe411c2a6084f25cff55a01d0d4e1474c97ff13"
+                "reference": "1dbc09f6e14703ae2398efc86b02ae2bcd9a9931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/afe411c2a6084f25cff55a01d0d4e1474c97ff13",
-                "reference": "afe411c2a6084f25cff55a01d0d4e1474c97ff13",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1dbc09f6e14703ae2398efc86b02ae2bcd9a9931",
+                "reference": "1dbc09f6e14703ae2398efc86b02ae2bcd9a9931",
                 "shasum": ""
             },
             "require": {
@@ -6982,20 +7406,34 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-22T12:54:11+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-20T06:07:50+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.4.28",
+            "version": "v3.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58"
+                "reference": "a7a98f40dcc382a332c3729a6d04b298ffbb8f1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2a651c2645c10bbedd21170771f122d935e0dd58",
-                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a7a98f40dcc382a332c3729a6d04b298ffbb8f1f",
+                "reference": "a7a98f40dcc382a332c3729a6d04b298ffbb8f1f",
                 "shasum": ""
             },
             "require": {
@@ -7031,20 +7469,34 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T09:39:14+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-03-15T09:38:08+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
-                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
                 "shasum": ""
             },
             "require": {
@@ -7071,36 +7523,33 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-04-04T09:56:43+00:00"
+            "time": "2019-06-13T22:48:21+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.4.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
+                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "vimeo/psalm": "<3.6.0"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -7122,78 +7571,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-12-25T11:19:39+00:00"
-        },
-        {
-            "name": "zendframework/zend-test",
-            "version": "3.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-test.git",
-                "reference": "2fdfc0965d76e27214a2104610e138cbfe6a3561"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-test/zipball/2fdfc0965d76e27214a2104610e138cbfe6a3561",
-                "reference": "2fdfc0965d76e27214a2104610e138cbfe6a3561",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0",
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-                "sebastian/version": "^1.0.4 || ^2.0",
-                "zendframework/zend-console": "^2.6",
-                "zendframework/zend-dom": "^2.6",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-http": "^2.8.3",
-                "zendframework/zend-mvc": "^3.0",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-uri": "^2.5",
-                "zendframework/zend-view": "^2.6.3"
-            },
-            "require-dev": {
-                "mikey179/vfsstream": "~1.2",
-                "symfony/finder": "^2.2",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-log": "^2.7.1",
-                "zendframework/zend-modulemanager": "^2.7.1",
-                "zendframework/zend-mvc-console": "^1.1.8",
-                "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
-                "zendframework/zend-serializer": "^2.6.1",
-                "zendframework/zend-session": "^2.8.5",
-                "zendframework/zend-validator": "^2.8"
-            },
-            "suggest": {
-                "zendframework/zend-mvc-console": "^1.1.8, to test MVC <-> console integration"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev",
-                    "dev-develop": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "autoload/phpunit-class-aliases.php"
-                ],
-                "psr-4": {
-                    "Zend\\Test\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Tools to facilitate unit testing of zend-mvc applications",
-            "keywords": [
-                "ZendFramework",
-                "test",
-                "zf"
-            ],
-            "time": "2019-01-08T17:06:56+00:00"
+            "time": "2020-02-14T12:15:55+00:00"
         },
         {
             "name": "zerocrates/extract-tagged-strings",
@@ -7231,6 +7609,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "easyrdf/easyrdf": 20,
         "omeka-s-themes/default": 20,
         "zerocrates/extract-tagged-strings": 20
     },
@@ -7242,5 +7621,6 @@
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.1"
-    }
+    },
+    "plugin-api-version": "1.1.0"
 }
diff --git a/config/database.ini.dist b/config/database.ini.dist
index 87c700e536..c3cbe5c36d 100644
--- a/config/database.ini.dist
+++ b/config/database.ini.dist
@@ -1,7 +1,7 @@
-user     = 
-password = 
-dbname   = 
-host     = 
+user     = ""
+password = ""
+dbname   = ""
+host     = ""
 ;port     = 
 ;unix_socket = 
 ;log_path = 
diff --git a/config/local.config.php.dist b/config/local.config.php.dist
index 9400659c47..7d71787cfc 100644
--- a/config/local.config.php.dist
+++ b/config/local.config.php.dist
@@ -2,7 +2,7 @@
 return [
     'logger' => [
         'log' => false,
-        'priority' => \Zend\Log\Logger::NOTICE,
+        'priority' => \Laminas\Log\Logger::NOTICE,
     ],
     'http_client' => [
         'sslcapath' => null,
diff --git a/index.php b/index.php
index 04bba8b593..0eb6a6f80b 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-use Zend\View\Model\ViewModel;
+use Laminas\View\Model\ViewModel;
 
 error_reporting(E_ALL);
 if ((isset($_SERVER['APPLICATION_ENV'])
diff --git a/package-lock.json b/package-lock.json
index 41b1084a0a..73082fb69e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,12 +10,12 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
-      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
@@ -335,9 +335,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
       "dev": true
     },
     "bach": {
@@ -755,9 +755,9 @@
       "dev": true
     },
     "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -1276,15 +1276,15 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
       "dev": true
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
     "fill-range": {
@@ -1438,8 +1438,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1460,14 +1459,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1482,20 +1479,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1612,8 +1606,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1625,7 +1618,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1640,7 +1632,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1648,14 +1639,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -1674,7 +1663,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1755,8 +1743,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1768,7 +1755,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1854,8 +1840,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1891,7 +1876,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1911,7 +1895,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -1955,14 +1938,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -2134,13 +2115,13 @@
       }
     },
     "globule": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
+      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "~4.17.12",
         "minimatch": "~3.0.2"
       }
     },
@@ -2613,13 +2594,10 @@
       "dev": true
     },
     "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
@@ -2763,9 +2741,9 @@
       "integrity": "sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ=="
     },
     "js-base64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
+      "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
       "dev": true
     },
     "js-yaml": {
@@ -2841,9 +2819,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "last-run": {
@@ -2913,9 +2891,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
-      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lodash.clonedeep": {
@@ -3049,18 +3027,18 @@
       }
     },
     "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
       "dev": true,
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.43.0"
       }
     },
     "minimatch": {
@@ -3073,9 +3051,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "mixin-deep": {
@@ -3205,9 +3183,9 @@
       }
     },
     "node-sass": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
-      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
+      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -3217,7 +3195,7 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.15",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
         "nan": "^2.13.2",
@@ -3672,9 +3650,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
+      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
       "dev": true
     },
     "pump": {
@@ -3871,9 +3849,9 @@
       }
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -3883,7 +3861,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -3893,7 +3871,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       }
@@ -4535,21 +4513,13 @@
       }
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "trim-newlines": {
@@ -4713,9 +4683,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
     "v8flags": {
diff --git a/package.json b/package.json
index c071c30f7a..c3e3eeba31 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "gulp-replace": "^1.0.0",
     "gulp-sass": "^4.0.2",
     "gulp-zip": "^4.2.0",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.3",
     "rimraf": "^2.6.0",
     "susy": "^2.2.12",
     "tmp": "0.0.33"