Merge branch 'dev'

Author: justinjung04

assets/ic-triangle.svg

@@ -14,7 +14,11 @@ const compiler = webpack(config);
 
 app.use(devMiddleware(compiler, {
 	logLevel: 'warn',
-	publicPath: config.output.publicPath
+	publicPath: config.output.publicPath,
+	watchOptions: {
+		aggregateTimeout: 300,
+		poll: true
+	}
 }));
 app.use(hotMiddleware(compiler));
 

assets/ic_annotation_add_redact_black_24px.svg

@@ -1,5 +1,7 @@
 {
   "action": {
+    "apply": "Apply",
+    "applyAll": "Apply all",
     "cancel": "Cancel",
     "clear": "Clear",
     "close": "Close",
@@ -15,12 +17,15 @@
     "fitToWidth": "Fit to width",
     "openFile": "Open file",
     "print": "Print",
+    "ok": "OK",
     "reply": "Reply",
     "rotate": "Rotate",
     "rotateClockwise": "Clockwise",
     "rotateCounterClockwise": "Counter-clockwise",
     "save": "Save",
+    "create": "Create",
     "showMoreResults": "Show more results",
+    "saveSignature": "Save signature",
     "sign": "Sign",
     "style": "Style",
     "submit": "Submit",
@@ -29,8 +34,10 @@
     "zoomOut": "Zoom out"
   },
   "annotation": {
+    "areaMeasurement": "Area measurement",
     "arrow": "Arrow",
     "callout": "Callout",
+    "distanceMeasurement": "Distance measurement",
     "ellipse": "Ellipse",
     "freehand": "Free hand",
     "freehand2": "Free hand",
@@ -39,10 +46,12 @@
     "highlight": "Highlight",
     "highlight2": "Highlight",
     "line": "Line",
+    "perimeterMeasurement": "Perimeter measurement",
     "polygon": "Polygon",
     "polygonCloud": "Cloud",
     "polyline": "Polyline",
     "rectangle": "Rectangle",
+    "redact": "Redact",
     "signature": "Signature",
     "squiggly": "Squiggly",
     "stamp": "Stamp",
@@ -63,7 +72,9 @@
     "textToolsButton": "Text tools",
     "thumbnailsPanel": "Thumbnails",
     "toolsButton": "Tools",
-    "viewControlsOverlay": "View controls"
+    "redaction": "Redaction",
+    "viewControlsOverlay": "View controls",
+    "measurementToolsButton": "Measurement tools"
   },
   "message": {
     "badDocument": "Failed to load document. The document is either corrupt or not valid.",
@@ -72,7 +83,7 @@
     "encryptedUserCancelled": "Failed to load encrypted document. Password entry cancelled.",
     "enterPassword": "This document is password protected. Please enter a password",
     "incorrectPassword": "Incorrect password, attempts left: {{ remainingAttempts }}",
-    "noAnnotations": "This document has no annotation.",
+    "noAnnotations": "This document has no annotations.",
     "noOutlines": "This document has no outline.",
     "noResults": "No results found.",
     "notSupported": "That file type is not supported.",
@@ -83,7 +94,7 @@
     "processing": "Processing...",
     "searching": "Searching...",
     "searchPlaceholder": "Search comments...",
-    "signHere": "Sign Here",
+    "signHere": "Sign here",
     "insertTextHere": "Insert text here"
   },
   "option": {
@@ -119,10 +130,18 @@
       "pages": "Pages",
       "includeComments": "Include comments"
     },
+    "redaction": {
+      "markForRedaction": "Mark for redaction",
+      "warningPopupMessage": "This action will permanently remove all items selected for redaction. It cannot be undone.",
+      "warningPopupTitle": "Apply Redaction"
+    },
     "searchPanel": {
       "caseSensitive": "Case sensitive",
       "wholeWordOnly": "Whole word"
     },
+    "signatureOverlay": {
+      "addSignature": "Add a signature"
+    },
     "slider": {
       "opacity": "Opacity",
       "thickness": "Thickness",
@@ -160,4 +179,4 @@
     "pan": "Pan",
     "select": "Select"
   }
-}
+}

assets/ic_annotation_apply_redact_black_24px.svg

@@ -1,5 +1,7 @@
 {
   "action": {
+    "apply": "Appliquer",
+    "applyAll": "Appliquer toute",
     "cancel": "Annuler",
     "clear": "Effacer",
     "close": "Fermer",
@@ -15,11 +17,13 @@
     "fitToWidth": "Fit à la largeur",
     "openFile": "Ouvrir un fichier",
     "print": "Imprimer",
+    "ok": "OK",
     "reply": "Répondre",
     "rotate": "Tourner",
     "rotateClockwise": "Tourner horaire",
     "rotateCounterClockwise": "Tourner antihoraire",
     "save": "Enregistrer", 
+    "create": "Créer",
     "showMoreResults": "Montrer plus de résultats",
     "sign": "Signer", 
     "style": "Style",
@@ -43,6 +47,7 @@
     "polygonCloud": "Nuage",
     "polyline": "Ligne polygonale",
     "rectangle": "Rectangle",
+    "redact": "Biffure",
     "signature": "Signature",
     "squiggly": "Ligne ondulée",
     "stamp": "Timbre",
@@ -63,6 +68,7 @@
     "textToolsButton": "Outils de texte",
     "thumbnailsPanel": "Vignettes",
     "toolsButton": "Outils",
+    "redaction": "Biffure",
     "viewControlsOverlay": "Contrôles de l'affichage"
   },
   "message": {
@@ -119,10 +125,18 @@
       "pages": "Pages",
       "includeComments": "Inclure les commentaires"
     },
+    "redaction": {
+      "markForRedaction": "Repérer les biffures",
+      "warningPopupMessage":  "Cette action supprimera définitivement tous les éléments sélectionnés pour la rédaction. Ça ne peut pas être défait.",
+      "warningPopupTitle": "Appliquer les Biffures"
+    },
     "searchPanel": {
       "caseSensitive": "Sensible à la casse",
       "wholeWordOnly": "Mot complet"
     },
+    "signatureOverlay": {
+      "addSignature": "Ajouter une signature"
+    },
     "slider": {
       "opacity": "Opacité",
       "thickness": "Épaisseur",

assets/ic_annotation_area_black_24px.svg

@@ -1,5 +1,7 @@
 {
   "action": {
+    "apply": "Toepassen",
+    "applyAll": "Alles toepassen",
     "cancel": "Annuleren",
     "clear": "Legen",
     "close": "Sluiten",
@@ -15,11 +17,13 @@
     "fitToWidth": "Zoomen naar vensterbreedte",
     "openFile": "Open bestand",
     "print": "Printen",
+    "ok": "OK",
     "reply": "Antwoorden",
     "rotate": "Roteren",
     "rotateClockwise": "Met de klok mee",
     "rotateCounterClockwise": "Tegen de klok in",
     "save": "Bewaren",
+    "create": "creëren",
     "showMoreResults": "Toon meer resultaten",
     "sign": "Ondertekenen",
     "style": "Opmaak",
@@ -42,6 +46,7 @@
     "polygon": "Veelhoek",
     "polygonCloud": "Cloud",
     "polyline": "Polyline",
+    "redact": "Redigeren",
     "rectangle": "Rechthoek",
     "signature": "Handtekening",
     "squiggly": "Squiggly",
@@ -63,6 +68,7 @@
     "textToolsButton": "Tekst tools",
     "thumbnailsPanel": "Miniatuurweergave",
     "toolsButton": "Tools",
+    "redaction": "Redigeren",
     "viewControlsOverlay": "Scherm opties",
     "minimizeButton": "Document normaal weergeven"
   },
@@ -120,10 +126,18 @@
       "pages": "Pagina's",
       "includeComments": "Inclusief commentaar"
     },
+    "redaction": {
+      "markForRedaction": "Markeren voor redactie",
+      "warningPopupMessage": "Met deze actie worden alle items die voor redactie zijn geselecteerd permanent verwijderd. Het kan niet ongedaan gemaakt worden.",
+      "warningPopupTitle": "Redactiewijziging Toepassen"
+    },
     "searchPanel": {
       "caseSensitive": "Hoofdletter gev..",
       "wholeWordOnly": "Alleen hele woorden"
     },
+    "signatureOverlay": {
+      "addSignature": "Voeg een handtekening toe"
+    },
     "slider": {
       "opacity": "Dekking",
       "thickness": "Randdikte",