Merge branch '2.4.0' into update-demo

js/src/widgets/metadataView.js

@@ -128,9 +128,9 @@
 
   getMetadataDetails: function(jsonLd) {
       var mdList = [
-        { label: 'label',
+        { label: i18next.t('label'),
           value: '<b>' + ($.JsonLd.getTextValue(jsonLd.label) || '') + '</b>' },
-        { label: 'description',
+        { label: i18next.t('description'),
           value: $.JsonLd.getTextValue(jsonLd.description) || '' }
       ];
 

locales/de/translation.json

@@ -27,6 +27,7 @@
     "delete": "Löschen",
     "deleteAnnotation": "Wollen Sie diese Annotation und alle dazugehörigen Marker entfernen?",
     "deleteShape":"Wollen Sie diesen Marker löschen?",
+    "description": "Beschreibung",
     "details": "Details",
     "dotDashed":"Punkte & Striche",
     "dropToLoad": "Hier ablegen um das Manifest zu laden",
@@ -74,6 +75,8 @@
     "selectGrid": "Anordnung auswählen",
     "sidePanelTooltip": "Seitenleiste",
     "solid": "Durchgängig",
+    "thick": "Dick",
+    "thickest": "Dicker",
     "thumbnailsView": "Galerie",
     "unspecified": "nicht spezifiziert",
     "url": "URL",

locales/en/translation.json

@@ -23,17 +23,18 @@
     "closeTooltip": "Close this window",
     "comments": "Comments",
     "contrastTooltip": "Adjust contrast",
-    "dashed":"Dashes",
+    "dashed": "Dashes",
     "delete": "Delete",
     "deleteAnnotation": "Do you want to delete this annotation and all associated shapes?",
-    "deleteShape":"Do you want to delete this shape?",
+    "deleteShape": "Do you want to delete this shape?",
+    "description": "Description",
     "details": "Details",
-    "dotDashed":"Dots & Dashes",
+    "dotDashed": "Dots & Dashes",
     "dropToLoad": "Drop to Load Manifest",
     "edit": "Edit",
-    "editModalBtnDeleteAnnotation":"Delete this annotation",
-    "editModalBtnSaveWithoutShapes":"Save annotation without shapes",
-    "editModalSaveAnnotationWithNoShapesMsg":"There are no shapes associated with this annotation.",
+    "editModalBtnDeleteAnnotation": "Delete this annotation",
+    "editModalBtnSaveWithoutShapes": "Save annotation without shapes",
+    "editModalSaveAnnotationWithNoShapesMsg": "There are no shapes associated with this annotation.",
     "ellipseTooltip": "Oval annotation",
     "fillColorTooltip": "Choose fill color",
     "filterObjects": "Filter objects",
@@ -47,6 +48,7 @@
     "invertTooltip": "Invert colors",
     "item": "item",
     "items": "items",
+    "label": "Label",
     "license": "License",
     "links": "Links",
     "load": "Load",
@@ -73,9 +75,9 @@
     "seeAlso": "See Also",
     "selectGrid": "Select a grid below",
     "sidePanelTooltip": "Toggle the side panel",
-    "solid":"Solid",
-    "thick":"Thick",
-    "thickest":"Thickest",
+    "solid": "Solid",
+    "thick": "Thick",
+    "thickest": "Thickest",
     "thumbnailsView": "Gallery View",
     "unspecified": "Unspecified",
     "url": "URL",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirador",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Multi-window image viewer, a web-based tool to support researcher goals",
   "repository": {
     "type": "git",