14.5.5 release

ChangeLog

@@ -1,3 +1,7 @@
+01-APR-2021: 14.5.5
+
+- Improves BPMN symbols to 2.0 spec
+
 31-MAR-2021: 14.5.4
 
 - Fixes for vsdx export

VERSION

@@ -1 +1 @@
-14.5.4
+14.5.5

etc/build/build.xml

@@ -111,7 +111,7 @@
 				<file name="Sidebar-Azure2.js" />
 				<file name="Sidebar-Basic.js" />
 				<file name="Sidebar-Bootstrap.js" />
-				<file name="Sidebar-BPMN.js" />
+				<file name="Sidebar-BPMN2.js" />
 				<file name="Sidebar-C4.js" />
 				<file name="Sidebar-Cabinet.js" />
 				<file name="Sidebar-Cisco.js" />

src/main/java/com/mxgraph/online/AbsAuthServlet.java

@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.google.appengine.api.memcache.MemcacheServiceException;
 import com.google.appengine.api.utils.SystemProperty;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;

src/main/webapp/js/diagramly/Devel.js

@@ -157,7 +157,7 @@ mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Azure.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Azure2.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Basic.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Bootstrap.js');
-mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-BPMN.js');
+mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-BPMN2.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-C4.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Cabinet.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Cisco.js');

src/main/webapp/js/diagramly/sidebar/Sidebar-BPMN.js

@@ -1,199 +0,0 @@
-(function()
-{
-	// Adds BPMN shapes
-	var sidebarAddBpmnPalette = Sidebar.prototype.addBpmnPalette;
-	
-	Sidebar.prototype.addBpmnPalette = function(dir, expand)
-	{
-		sidebarAddBpmnPalette.apply(this, arguments);
-
-		var w = 50;
-		var h = 50;
-
-		this.setCurrentSearchEntryLibrary('bpmn', 'bpmnGateways');
-		this.addBPMNGatewaysPalette(dir, expand, w, h);
-		this.setCurrentSearchEntryLibrary('bpmn', 'bpmnEvents');
-		this.addBPMNEventsPalette(dir, expand, w, h);
-		this.setCurrentSearchEntryLibrary();
-	}
-	
-	Sidebar.prototype.addBPMNGatewaysPalette = function(dir, expand, w, h)
-	{
-		var s = 'shape=mxgraph.bpmn.shape;html=1;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;verticalAlign=top;align=center;perimeter=rhombusPerimeter;background=gateway;outlineConnect=0;';
-		//default tags
-		var dt = 'bpmn business process model gateway ';
-		
-		this.addPaletteFunctions('bpmnGateways', 'BPMN Gateways', false,
-		[
-			this.createVertexTemplateEntry(s + 'outline=none;symbol=exclusiveGw;', w, h, '', 'Exclusive Gateway', null, null, dt + 'exclusive'),
-			this.createVertexTemplateEntry(s + 'outline=none;symbol=parallelGw;', w, h, '', 'Parallel Gateway', null, null, dt + 'parallel'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=general;', w, h, '', 'Inclusive Gateway', null, null, dt + 'inclusive'),
-			this.createVertexTemplateEntry(s + 'outline=none;symbol=complexGw;', w, h, '', 'Complex Gateway', null, null, dt + 'complex'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=general;', w, h, '', 'General Start Gateway', null, null, dt + 'general start'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=general;', w, h, '', 'General Intermediate Gateway', null, null, dt + 'general intermediate'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=general;', w, h, '', 'General End Gateway', null, null, dt + 'general end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=message;', w, h, '', 'Message Standard Gateway', null, null, dt + 'message standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=message;', w, h, '', 'Message Interrupting Gateway', null, null, dt + 'message interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=message;', w, h, '', 'Message Non-Interrupting Gateway', null, null, dt + 'message non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=message;', w, h, '', 'Message Catching Gateway', null, null, dt + 'message catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=message;', w, h, '', 'Message Boundary Interrupting Gateway', null, null, dt + 'message boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=message;', w, h, '', 'Message Boundary Non-Interrupting Gateway', null, null, dt + 'message boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=message;', w, h, '', 'Message Throwing Gateway', null, null, dt + 'message throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=message;', w, h, '', 'Message End Gateway', null, null, dt + 'message end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=timer;', w, h, '', 'Timer Standard Gateway', null, null, dt + 'timer standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=timer;', w, h, '', 'Timer Interrupting Gateway', null, null, dt + 'timer interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=timer;', w, h, '', 'Timer Non-Interrupting Gateway', null, null, dt + 'timer non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=timer;', w, h, '', 'Timer Catching Gateway', null, null, dt + 'timer catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=timer;', w, h, '', 'Timer Boundary Interrupting Gateway', null, null, dt + 'timer boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=timer;', w, h, '', 'Timer Boundary Non-Interrupting Gateway', null, null, dt + 'timer boundary non interrupting noninterrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=escalation;', w, h, '', 'Escalation Interrupting Gateway', null, null, dt + 'escalation interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=escalation;', w, h, '', 'Escalation Non-Interrupting Gateway', null, null, dt + 'escalation non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=escalation;', w, h, '', 'Escalation Boundary Interrupting Gateway', null, null, dt + 'escalation boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=escalation;', w, h, '', 'Escalation Boundary Non-Interrupting Gateway', null, null, dt + 'escalation boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=escalation;', w, h, '', 'Escalation Throwing Gateway', null, null, dt + 'escalation throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=escalation;', w, h, '', 'Escalation End Gateway', null, null, dt + 'escalation end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=conditional;', w, h, '', 'Conditional Standard Gateway', null, null, dt + 'conditional standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=conditional;', w, h, '', 'Conditional Interrupting Gateway', null, null, dt + 'conditional interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=conditional;', w, h, '', 'Conditional Non-Interrupting Gateway', null, null, dt + 'conditional non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=conditional;', w, h, '', 'Conditional Catching Gateway', null, null, dt + 'conditional catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=conditional;', w, h, '', 'Conditional Boundary Interrupting Gateway', null, null, dt + 'conditional boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=conditional;', w, h, '', 'Conditional Boundary Non-Interrupting Gateway', null, null, dt + 'conditional boundary non interrupting noninterrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=link;', w, h, '', 'Link Catching Gateway', null, null, dt + 'link catching'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=link;', w, h, '', 'Link Throwing Gateway', null, null, dt + 'link throwing'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=error;', w, h, '', 'Error Interrupting Gateway', null, null, dt + 'error interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=error;', w, h, '', 'Error Boundary Interrupting Gateway', null, null, dt + 'error boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=error;', w, h, '', 'Error End Gateway', null, null, dt + 'error end'),
-
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=cancel;', w, h, '', 'Cancel Boundary Interrupting Gateway', null, null, dt + 'cancel boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=cancel;', w, h, '', 'Cancel End Gateway', null, null, dt + 'cancel end'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=compensation;', w, h, '', 'Compensation Interrupting Gateway', null, null, dt + 'compensation interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=compensation;', w, h, '', 'Compensation Boundary Interrupting Gateway', null, null, dt + 'compensation boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=compensation;', w, h, '', 'Compensation Throwing Gateway', null, null, dt + 'compensation throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=compensation;', w, h, '', 'Compensation End Gateway', null, null, dt + 'compensation end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=signal;', w, h, '', 'Signal Standard Gateway', null, null, dt + 'signal standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=signal;', w, h, '', 'Signal Interrupting Gateway', null, null, dt + 'signal interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=signal;', w, h, '', 'Signal Non-Interrupting Gateway', null, null, dt + 'signal non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=signal;', w, h, '', 'Signal Catching Gateway', null, null, dt + 'signal catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=signal;', w, h, '', 'Signal Boundary Interrupting Gateway', null, null, dt + 'signal boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=signal;', w, h, '', 'Signal Boundary Non-Interrupting Gateway', null, null, dt + 'signal boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=signal;', w, h, '', 'Signal Throwing Gateway', null, null, dt + 'signal throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=signal;', w, h, '', 'Signal End Gateway', null, null, dt + 'signal end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=multiple;', w, h, '', 'Multiple Standard Gateway', null, null, dt + 'multiple standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=multiple;', w, h, '', 'Multiple Interrupting Gateway', null, null, dt + 'multiple interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=multiple;', w, h, '', 'Multiple Non-Interrupting Gateway', null, null, dt + 'multiple non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=multiple;', w, h, '', 'Multiple Catching Gateway', null, null, dt + 'multiple catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=multiple;', w, h, '', 'Multiple Boundary Interrupting Gateway', null, null, dt + 'multiple boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=multiple;', w, h, '', 'Multiple Boundary Non-Interrupting Gateway', null, null, dt + 'multiple boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=multiple;', w, h, '', 'Multiple Throwing Gateway', null, null, dt + 'multiple throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=multiple;', w, h, '', 'Multiple End Gateway', null, null, dt + 'multiple end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=star;', w, h, '', 'Multiple Start Gateway', null, null, dt + 'multiple end'),
-			
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Standard Gateway', null, null, dt + 'parallel multiple standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Interrupting Gateway', null, null, dt + 'parallel multiple interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Non-Interrupting Gateway', null, null, dt + 'parallel multiple non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Catching Gateway', null, null, dt + 'parallel multiple catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Boundary Interrupting Gateway', null, null, dt + 'parallel multiple boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Boundary Non-Interrupting Gateway', null, null, dt + 'parallel multiple boundary non interrupting noninterrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=terminate;', w, h, '', 'Terminate Gateway', null, null, dt + 'terminate')
-		]);
-	}
-	
-	Sidebar.prototype.addBPMNEventsPalette = function(dir, expand, w, h)
-	{
-		s = 'shape=mxgraph.bpmn.shape;html=1;verticalLabelPosition=bottom;labelBackgroundColor=#ffffff;verticalAlign=top;align=center;perimeter=ellipsePerimeter;outlineConnect=0;';
-		var dt = 'bpmn business process model event ';
-		
-		this.addPaletteFunctions('bpmnEvents', 'BPMN Events', false,
-		[
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=general;', w, h, '', 'General Start', null, null, dt + 'general start'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=general;', w, h, '', 'General Intermediate', null, null, dt + 'general intermediate'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=general;', w, h, '', 'General End', null, null, dt + 'general end'),
-			
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=message;', w, h, '', 'Message Standard', null, null, dt + 'message standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=message;', w, h, '', 'Message Interrupting', null, null, dt + 'message interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=message;', w, h, '', 'Message Non-Interrupting', null, null, dt + 'message non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=message;', w, h, '', 'Message Catching', null, null, dt + 'message catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=message;', w, h, '', 'Message Boundary Interrupting', null, null, dt + 'message boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=message;', w, h, '', 'Message Boundary Non-Interrupting', null, null, dt + 'message boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=message;', w, h, '', 'Message Throwing', null, null, dt + 'message throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=message;', w, h, '', 'Message End', null, null, dt + 'message end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=timer;', w, h, '', 'Timer Standard', null, null, dt + 'timer standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=timer;', w, h, '', 'Timer Interrupting', null, null, dt + 'timer interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=timer;', w, h, '', 'Timer Non-Interrupting', null, null, dt + 'timer non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=timer;', w, h, '', 'Timer Catching', null, null, dt + 'timer catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=timer;', w, h, '', 'Timer Boundary Interrupting', null, null, dt + 'timer boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=timer;', w, h, '', 'Timer Boundary Non-Interrupting', null, null, dt + 'timer boundary non interrupting noninterrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=escalation;', w, h, '', 'Escalation Interrupting', null, null, dt + 'escalation interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=escalation;', w, h, '', 'Escalation Non-Interrupting', null, null, dt + 'escalation non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=escalation;', w, h, '', 'Escalation Boundary Interrupting', null, null, dt + 'escalation boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=escalation;', w, h, '', 'Escalation Boundary Non-Interrupting', null, null, dt + 'escalation boundary non interrupting nonimpterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=escalation;', w, h, '', 'Escalation Throwing', null, null, dt + 'escalation throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=escalation;', w, h, '', 'Escalation End', null, null, dt + 'escalation end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=conditional;', w, h, '', 'Conditional Standard', null, null, dt + 'conditional standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=conditional;', w, h, '', 'Conditional Interrupting', null, null, dt + 'conditional interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=conditional;', w, h, '', 'Conditional Non-Interrupting', null, null, dt + 'conditional non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=conditional;', w, h, '', 'Conditional Catching', null, null, dt + 'conditional catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=conditional;', w, h, '', 'Conditional Boundary Interrupting', null, null, dt + 'conditional boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=conditional;', w, h, '', 'Conditional Boundary Non-Interrupting', null, null, dt + 'conditional boundary non interrupting noninterrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=link;', w, h, '', 'Link Catching', null, null, dt + 'link catching'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=link;', w, h, '', 'Link Throwing', null, null, dt + 'link throwing'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=error;', w, h, '', 'Error Interrupting', null, null, dt + 'error interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=error;', w, h, '', 'Error Boundary Interrupting', null, null, dt + 'error boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=error;', w, h, '', 'Error End', null, null, dt + 'error end'),
-
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=cancel;', w, h, '', 'Cancel Boundary Interrupting', null, null, dt + 'cancel boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=cancel;', w, h, '', 'Cancel End', null, null, dt + 'cancel end'),
-
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=compensation;', w, h, '', 'Compensation Interrupting', null, null, dt + 'compensation interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=compensation;', w, h, '', 'Compensation Boundary Interrupting', null, null, dt + 'compensation boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=compensation;', w, h, '', 'Compensation Throwing', null, null, dt + 'compensation throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=compensation;', w, h, '', 'Compensation End', null, null, dt + 'compensation end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=signal;', w, h, '', 'Signal Standard', null, null, dt + 'signal standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=signal;', w, h, '', 'Signal Interrupting', null, null, dt + 'signal interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=signal;', w, h, '', 'Signal Non-Interrupting', null, null, dt + 'signal non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=signal;', w, h, '', 'Signal Catching', null, null, dt + 'signal catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=signal;', w, h, '', 'Signal Boundary Interrupting', null, null, dt + 'signal boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=signal;', w, h, '', 'Signal Boundary Non-Interrupting', null, null, dt + 'signal boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=signal;', w, h, '', 'Signal Throwing', null, null, dt + 'signal throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=signal;', w, h, '', 'Signal End', null, null, dt + 'signal end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=multiple;', w, h, '', 'Multiple Standard', null, null, dt + 'multiple standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=multiple;', w, h, '', 'Multiple Interrupting', null, null, dt + 'multiple interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=multiple;', w, h, '', 'Multiple Non-Interrupting', null, null, dt + 'multiple non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=multiple;', w, h, '', 'Multiple Catching', null, null, dt + 'multiple catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=multiple;', w, h, '', 'Multiple Boundary Interrupting', null, null, dt + 'multiple boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=multiple;', w, h, '', 'Multiple Boundary Non-Interrupting', null, null, dt + 'multiple boundary non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=throwing;symbol=multiple;', w, h, '', 'Multiple Throwing', null, null, dt + 'multiple throwing'),
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=multiple;', w, h, '', 'Multiple End', null, null, dt + 'multiple end'),
-
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=star;', w, h, '', 'Multiple Start', null, null, dt + 'multiple start'),
-			
-			this.createVertexTemplateEntry(s + 'outline=standard;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Standard', null, null, dt + 'parallel multiple standard'),
-			this.createVertexTemplateEntry(s + 'outline=eventInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Interrupting', null, null, dt + 'parallel multiple interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=eventNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Non-Interrupting', null, null, dt + 'parallel multiple non interrupting noninterrupting'),
-			this.createVertexTemplateEntry(s + 'outline=catching;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Catching', null, null, dt + 'parallel multiple catching'),
-			this.createVertexTemplateEntry(s + 'outline=boundInt;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Boundary Interrupting', null, null, dt + 'parallel multiple boundary interrupting'),
-			this.createVertexTemplateEntry(s + 'outline=boundNonint;symbol=parallelMultiple;', w, h, '', 'Parallel Multiple Boundary Non-Interrupting', null, null, dt + 'parallel multiple boundary non interrupting'),
-
-			this.createVertexTemplateEntry(s + 'outline=end;symbol=terminate;', w, h, '', 'Terminate', null, null, dt + 'terminate')
-		]);
-	};
-})();

src/main/webapp/js/diagramly/sidebar/Sidebar-Flowchart.js

@@ -28,7 +28,7 @@
 			this.createVertexTemplateEntry('shape=internalStorage;whiteSpace=wrap;html=1;dx=15;dy=15;rounded=1;arcSize=8;strokeWidth=2;', w * 0.7, h * 0.7, '', 'Internal Storage', null, null, this.getTagsForStencil(gn, 'internal_storage', dt).join(' ')),
 			this.createVertexTemplateEntry(s + 'loop_limit;whiteSpace=wrap;', w, h * 0.6, '', 'Loop Limit', null, null, this.getTagsForStencil(gn, 'loop_limit', dt).join(' ')),
 			this.createVertexTemplateEntry('html=1;strokeWidth=2;shape=manualInput;whiteSpace=wrap;rounded=1;size=26;arcSize=11;', w, h * 0.6, '', 'Manual Input', null, null, this.getTagsForStencil(gn, 'manual_input', dt).join(' ')),
-			this.createVertexTemplateEntry(s3 + 'trapezoid;perimeter=trapezoidPerimeter;whiteSpace=wrap;size=0.23;arcSize=10;flipV=1;', w, h * 0.6, '', 'Manual Operation', null, null, this.getTagsForStencil(gn, 'manual_operation', dt).join(' ')),
+			this.createVertexTemplateEntry('verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=trapezoid;perimeter=trapezoidPerimeter;whiteSpace=wrap;size=0.23;arcSize=10;flipV=1;labelPosition=center;align=center;', w, h * 0.6, '', 'Manual Operation', null, null, this.getTagsForStencil(gn, 'manual_operation', dt).join(' ')),
 			this.createVertexTemplateEntry(s + 'merge_or_storage;whiteSpace=wrap;', w * 0.95, h * 0.6, '', 'Merge or Storage', null, null, this.getTagsForStencil(gn, 'merge_or_storage', dt).join(' ')),
 			this.createVertexTemplateEntry(s + 'multi-document;whiteSpace=wrap;', w * 0.88, h * 0.6, '', 'Multi-Document', null, null, this.getTagsForStencil(gn, 'multi-document', dt).join(' ')),
 			this.createVertexTemplateEntry(s3 + 'offPageConnector;rounded=0;size=0.5;', w * 0.6, h * 0.6, '', 'Off-Page Reference', null, null, this.getTagsForStencil(gn, 'off-page_reference', dt).join(' ')),

src/main/webapp/resources/dia.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_am.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_ar.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_bg.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Открита е чернова за {1}. За да продължите, я качете в редактора или я откажете. 
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Опцията плъзгане и пускане не се поддържа за изображения. Желаете ли да импортирате вместо това?
 dropboxCharsNotAllowed=Следните знаци не са позволени: \ / : ? * " |

src/main/webapp/resources/dia_bn.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_bs.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound={1} nacrt pronađen. Učitajte ga u uređivač ili ga odbacite kako biste nastavili.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Prevlačenje nije podržano kada je riječ o slikama. Želite li uvesti umjesto toga?
 dropboxCharsNotAllowed=Sljedeći znakovi nisu dozvoljeni: \ / : ? * " |

src/main/webapp/resources/dia_ca.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Imatge de mapa de bits editable
 diagramSvgDesc=Imatge vectorial editable
 didYouMeanToExportToPdf=Voleu exportar-ho a PDF?
 draftFound=S'ha trobat un esborrany per a '{1}'. Carrega'l a l'editor o descarta'l per continuar.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Les imatges no es poden arrossegar i deixar anar. Voleu importar-les?
 dropboxCharsNotAllowed=No es permeten aquests caràcters: \ / : ? * " |

src/main/webapp/resources/dia_cs.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Byl nalezen koncept pro '{1}'. Abyste mohli pokračovat, nahrajte ho do editoru nebo jej zahoďte.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Pro obrázky není funkce Drag & Drop k dispozici. Chcete ho místo toho naimportovat?
 dropboxCharsNotAllowed=Následující znaky nejsou povoleny: \ / : ? * " |

src/main/webapp/resources/dia_da.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Et udkast for '{1}' blev fundet. Load det i editoren eller kasser det for at fortsætte.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag & drop er ikke understøttet for billeder Vil du importere i stedet?
 dropboxCharsNotAllowed=Følgende tegn er ikke tilladt: \ / : ? * " |

src/main/webapp/resources/dia_de.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editierbares Bitmap Bild
 diagramSvgDesc=Editierbares Vektor Bild
 didYouMeanToExportToPdf=Wollten Sie als PDF exportieren?
 draftFound=Ein Entwurf für '{1}' wurde gefunden. Setzen Sie die Bearbeitung fort oder verwerfen Sie die Änderungen.
-draftRevisionMismatch=Es gibt eine neuere Version dieses Diagramms auf einem freigegebenen Entwurf dieser Seite. Bitte bearbeiten Sie die Seite und dann das Diagramm, um sicherzustellen, dass Sie mit der neuesten Version arbeiten.
+draftRevisionMismatch=Es gibt eine andere Version dieses Diagramms auf einem freigegebenen Entwurf dieser Seite. Bitte bearbeiten Sie das Diagramm aus dem Entwurf, um sicherzustellen, dass Sie mit der neuesten Version arbeiten.
 selectDraft=Wählen Sie einen Entwurf zur Bearbeitung:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=Unzulässige Zeichen: \ / : ? * " |

src/main/webapp/resources/dia_el.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Έχει βρεθει ένα σχέδιο για το '{1}' . Φορτώστε το στον επεξεργαστή ή απορρίψτε το για να συνεχίσετε.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Το Drag & Drop δεν υποστηρίζεται για τις εικόνες. Θα θέλατε να τις εισάγετε παρόλα αυτά;
 dropboxCharsNotAllowed=Οι παρακάτω χαρακτήρες δεν υποστηρίζονται: \ / : ? * " |

src/main/webapp/resources/dia_eo.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_es.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Imagen Bitmap Editable
 diagramSvgDesc=Imagen por Vectores Editable
 didYouMeanToExportToPdf=Intentó exportar a PDF?
 draftFound=Se encontró un borrador para '{1}'. Cárguelo en el editor o descártelo para continuar.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Seleccione un borrador para continuar editando:
 dragAndDropNotSupported=La opción de arrastrar y soltar no está soportada para las imágenes. ¿En lugar de eso, le gustaría importar?
 dropboxCharsNotAllowed=Los siguientes caracteres no están permitidos: \ / : ? * " |

src/main/webapp/resources/dia_et.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Kas soovisid PDFi eksportida?
 draftFound=Mustand {1} jaoks on leitud. Lae see töötluskeskkonda või tühista jätkamiseks.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Piltidele puudub pukseerimise tugi. Kas sooviksid selle asemel importida?
 dropboxCharsNotAllowed=Järgnevad tähemärgid pole lubatud:  \ / : ? * " |

src/main/webapp/resources/dia_eu.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Edita daitekeen bitmap irudia
 diagramSvgDesc=Edita daitekeen bektore irudia
 didYouMeanToExportToPdf=PDF-era esportatzea nahi?
 draftFound={1}'-ren zirriborro bat aurkitu da. Kargatu editorean edo baztertu segitzeko.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Aukeratu zirriborro bat editatzen jarraitzeko:
 dragAndDropNotSupported=Arrastatu eta jaregitea ez da onartzen irudientzat. Nahi al duzu inportatzea hala ere?
 dropboxCharsNotAllowed=Honako karaktereak ez dira onartzen:  \ / : ? * " |

src/main/webapp/resources/dia_fa.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=‫پیش نویس '{1}' یافت شد. آن را به داخل ویرایشگر بارگذاری کنید و یا آن را برای ادامه دادن حذف کنید.‬
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=‫حرکت و کشیدن و انداختن برای تصاویر امکانپذیر نیست. آیا می خواهید بجای آن تصاویر را وارد کنید؟‬
 dropboxCharsNotAllowed=‫کاراکترهای زیر مجاز نمی باشند: \ / : ? * " |‬

src/main/webapp/resources/dia_fi.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Muokattava bittikarttakuva
 diagramSvgDesc=Muokattava vektorikuva
 didYouMeanToExportToPdf=Tarkoititko PDF-muotoon viemistä?
 draftFound=Luonnos tiedostolle '{1}' on löytynyt. Lataa se muokattavaksi tai hylkää se jatkaaksesi.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Valitse luonnos jatkaaksesi muokkausta:
 dragAndDropNotSupported=Vedä ja pudota -toiminto ei tue kuvia. Haluatko tuoda kuvat?
 dropboxCharsNotAllowed=Seuraavat merkit eivät ole sallittuja: \ / : ? * " |

src/main/webapp/resources/dia_fil.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Isang draft para sa '{1}' ang nahanap. Ikarga ito sa loob ng editor o isantabi ito para magpatuloy
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Ang paghila at paglagay ay hindi suportado para sa mga imahe. Gusto mo bang mag angkat na lang?
 dropboxCharsNotAllowed=Ang mga sumusunod na simbolo ay hindi pinahihintulutan: \ / : ? * " |

src/main/webapp/resources/dia_fr.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Image bitmap éditable
 diagramSvgDesc=Image vectorielle éditable
 didYouMeanToExportToPdf=Vouliez vous exporter en PDF ?
 draftFound=Un brouillon pour '{1}' a été trouvé. Pour poursuivre, souhaitez-vous l'afficher dans l'éditeur ou l'ignorer ?
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Le glisser-déposer n'est pas supporté pour les images. Voulez-vous importer à la place?
 dropboxCharsNotAllowed=Les caractères suivants ne sont pas autorisés : \ / : ? * " |

src/main/webapp/resources/dia_gl.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Imaxe Bitmap editábel
 diagramSvgDesc=Imaxe Vectorial editábel
 didYouMeanToExportToPdf=Referíaste a exportar a PDF?
 draftFound=Atopouse un borrador para '{1}'. Carrégao no editor ou descártao para continuares.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Escolle un borrador para seguires editando:
 dragAndDropNotSupported=Arrastrar-soltar non está implementado para imaxes. Prefires importalas?
 dropboxCharsNotAllowed=Os seguintes caracteres non están permitidos: \ / : ? * " |

src/main/webapp/resources/dia_gu.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_he.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=‫נמצאה טיוטה עבור '{1}'. טען אותה אל העורך או מחק אותה כדי להמשיך.‬
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=‫גרירה אינה נתמכת עבור תמונות. תרצה לייבא תמונה במקום?‬
 dropboxCharsNotAllowed=‫התווים הבאים אינם מותרים לשימוש: / \ : ? * " |‬

src/main/webapp/resources/dia_hi.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_hr.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_hu.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Vázlat találva a '{1}'-hoz. Töltse a szerkesztőbe, vagy dobja el a folytatásért.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Fogd és vidd nincs támogatva képekhez. Szeretné-e importálni?
 dropboxCharsNotAllowed=A következő betűk nem engedélyezettek: \ / : ? * " |

src/main/webapp/resources/dia_id.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Draf untuk '{1}' ditemukan. Muat ke editor atau buang untuk melanjutkan.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Tidak mendukung seret dan jatuhkan untuk gambar. Anda ingin mengimpor?
 dropboxCharsNotAllowed=Karakter berikut tidak diizinkan: \ / : ? * " |

src/main/webapp/resources/dia_it.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=È stata trovata una bozza per '{1}'. Caricala nell'editor o scartala per continuare.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop delle immagini non supportato. Vuoi importare?
 dropboxCharsNotAllowed=I seguenti caratteri non sono permessi: \ / : ? * " |

src/main/webapp/resources/dia_ja.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=ドラフト{1}が見つかりました。読み込む、または廃棄する。
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=画像のドラッグアンドドロップには対応していません。その代わりに画像読み込みを選択しますか？
 dropboxCharsNotAllowed=次の文字は使用できません: \ / : ? * " |

src/main/webapp/resources/dia_kn.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_ko.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound={1}'의 임시저장이 확인되었습니다. 편집하시려면 불러오기를 클릭하시고, 계속하시려면 취소를 클릭해 주시기 바랍니다.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=이미지 드래그하여 붙여넣기는 지원되지 않습니다. 이미지를 불러오시겠습니까?
 dropboxCharsNotAllowed=다음 문자는 사용할 수 없습니다. \ / : ? * " |

src/main/webapp/resources/dia_lt.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Rastas '{1}' juodraštis. Įkelkite jį į redaktorių arba išmeskite, kad galėtumėte tęsti.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Pasirinkite juodraštį, kad galėtumėte tęsti redagavimą:
 dragAndDropNotSupported=Vaizdų vilkimas nepalaikomas. Ar norėtumėte importuoti?
 dropboxCharsNotAllowed=Šie simboliai neleidžiami: \ /:? * “|

src/main/webapp/resources/dia_lv.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_ml.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_mr.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_ms.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Draf bagi '{1}' telah dijumpai. Muat ia ke dalam editor atau buang untuk meneruskan.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Seret dan lepas tidak disokong untuk imej. Adakah anda mahu mengimport?
 dropboxCharsNotAllowed=Aksara-aksara berikut tidak dibenarkan: \ / : ? * " |

src/main/webapp/resources/dia_my.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_nl.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Bewerkbaar bitmap-bestand
 diagramSvgDesc=Bewerkbaar vector-bestand
 didYouMeanToExportToPdf=Wil je exporteren naar PDF?
 draftFound=Een concept van '{1}' is gevonden. Laad het in de editor of negeer het om door te gaan.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Selecteer een concept om door te gaan met bewerken:
 dragAndDropNotSupported=Slepen en plaatsen is niet beschikbaar voor afbeeldingen. Wilt u in plaats daarvan importeren?
 dropboxCharsNotAllowed=De volgende tekens zijn niet toegestaan: \ / : ? * " |

src/main/webapp/resources/dia_no.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Et utkast av '{1}' er funnet. Last det ned i editoren eller forkast det for å fortsette.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Dra og slipp funksjon er ikke tilgjengelig for bilder. Vil du importere i stedet for?
 dropboxCharsNotAllowed=Følgende tegn er ikke tillatt: \ / : ? * " |

src/main/webapp/resources/dia_pl.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Znaleziono wersję roboczą {1}. Załaduj ją do edytora lub odrzuć, by kontynuować.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Przeciągnij i upuść dla obrazów nie jest wspierane. Czy chcesz zamiast tego użyć importowania?
 dropboxCharsNotAllowed=Następujące znaki są niedozwolone: \ / : ? * " |

src/main/webapp/resources/dia_pt-br.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Foi encontrado um rascunho para '{1}'. Carregue no editor ou descarte para continuar.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Arraste e solte não suportados para imagens. Gostaria de importar?
 dropboxCharsNotAllowed=Os seguintes caracteres não são permitidos: \/:?*"|

src/main/webapp/resources/dia_pt.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Encontrado um projeto. Carregar no editor ou rejeitar para continuar.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Arrastar e largar não suportado para imagens. Deseja importar?
 dropboxCharsNotAllowed=Os seguintes caracteres não são permitidos: \/:?*"|

src/main/webapp/resources/dia_ro.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=O schiță pentru '{1}' a fost găsită. Încarc-o în editor sau înlătureaz-o pentru a continua.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported= „Drag and Drop” nu este suportat pentru imagini. Doriți să importați in schimb?
 dropboxCharsNotAllowed=Următoarele caractere nu sunt permise: \ / : ? * " |

src/main/webapp/resources/dia_ru.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Был обнаружен черновик '{1}'. Загрузите его в редактор или откажитесь, чтобы продолжить.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Перетаскивание изображений не поддерживается. Импортировать изображение?
 dropboxCharsNotAllowed=Следующие символы не допускаются: \ / : ? * " |

src/main/webapp/resources/dia_si.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_sk.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_sl.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_sr.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Pronađen nacrt
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Prevlačenje nije podržano
 dropboxCharsNotAllowed=Sledeći znaci nisu dozvoljeni: \ / : ? * " |

src/main/webapp/resources/dia_sv.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Portable Network Graphics
 diagramSvgDesc=Scalable Vector Graphics
 didYouMeanToExportToPdf=Ville du exportera till PDF?
 draftFound=Ett utkast för '{1}' hittades. Ladda utkastet eller ta bort det för att fortsätta.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Välj ett utkast att fortsätta redigera
 dragAndDropNotSupported=Dra-och-släpp tillåts ej för bilder. Vill du istället importera?
 dropboxCharsNotAllowed=Följande tecken får inte användas: \ / : ? * " |

src/main/webapp/resources/dia_sw.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_ta.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_te.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=A draft for '{1}' has been found. Load it into the editor or discard it to continue.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Drag and drop not supported for images. Would you like to import instead?
 dropboxCharsNotAllowed=The following characters are not allowed: \ / : ? * " |

src/main/webapp/resources/dia_th.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=พบฉบับร่างของ '{1}' แล้ว โหลดไปยังตัวแก้ไขหรือยกเลิกเพื่อดำเนินการต่อ
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=รูปภาพไม่รองรับการลากและวาง คุณต้องการนำเข้าแทนหรือไม่
 dropboxCharsNotAllowed=ไม่อนุญาตให้ใช้อักขระต่อไปนี้: \ / : ? * " |

src/main/webapp/resources/dia_tr.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Düzenlenebilir Bitmap resmi
 diagramSvgDesc=Düzenlenebilir Vektör resmi
 didYouMeanToExportToPdf=PDF olarak dışa aktarmak mı istediniz?
 draftFound=Taslak (1) için bulundu. Editöre yükleyiniz veya devam etmek için iptal ediniz.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Düzenlemeye devam etmek için bir taslak seçiniz:
 dragAndDropNotSupported=Desteklenmeyen resimleri sürükle ve at. Veya bu resimleri geri çağırmak ister misiniz ?
 dropboxCharsNotAllowed=Bu karakterler desteklenmemektedir : \ / : ? * " |

src/main/webapp/resources/dia_uk.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Зображення Bitmap
 diagramSvgDesc=Векторне зображення
 didYouMeanToExportToPdf=Можливо ви мали на увазі експорт в PDF?
 draftFound=Знайдено чернетку '{1}'. Завантажте її в редактор або відмовтеся, щоб продовжити.
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Вибрати чернетку для редагування:
 dragAndDropNotSupported=Перетягування зображень не підтримується. Чи бажаєте натомість привнести його?
 dropboxCharsNotAllowed=Перелічені знаки не підтримувані: \ / : ? * " |

src/main/webapp/resources/dia_vi.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=Tìm thấy một bản nháp cho '{1}'. Tải lại bản nháp này hoặc loại bỏ bản nháp để tiếp tục
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=Kéo và thả không hỗ trợ cho hình ảnh. Thay vào đó, bạn có muốn nhập hình ảnh vào không?
 dropboxCharsNotAllowed=Những kí tự sau không được chấp nhận: \ / : ? * " |

src/main/webapp/resources/dia_zh-tw.txt

@@ -109,7 +109,7 @@ diagramPngDesc=Editable Bitmap Image
 diagramSvgDesc=Editable Vector Image
 didYouMeanToExportToPdf=Did you mean to export to PDF?
 draftFound=發現現有的「{1}」的草圖。要載入它進行編輯或是丟棄以繼續?
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=Select a draft to continue editing:
 dragAndDropNotSupported=不支援圖片拖放。是否使用匯入選項?
 dropboxCharsNotAllowed=不得使用以下字元：\ / : ? * " |

src/main/webapp/resources/dia_zh.txt

@@ -109,7 +109,7 @@ diagramPngDesc=可编辑位图文件
 diagramSvgDesc=可编辑矢量图文件
 didYouMeanToExportToPdf=是否要导出到 PDF？
 draftFound={1} 的草稿已经找到。将其加载到编辑器或将其丢弃以继续。
-draftRevisionMismatch=There is a newer version of this diagram on a shared draft of this page. Please edit the page and then the diagram to ensure you are working with the latest version.
+draftRevisionMismatch=There is a different version of this diagram on a shared draft of this page. Please edit the diagram from the draft to ensure you are working with the latest version.
 selectDraft=选择一个草稿继续编辑:
 dragAndDropNotSupported=暂不支持图片拖放功能。是否要使用导入？
 dropboxCharsNotAllowed=系统不允许使用下列字符：\ / : ? * " |

src/main/webapp/service-worker.js

@@ -6,7 +6,7 @@ if (workbox)
 	workbox.precaching.precacheAndRoute([
   {
     "url": "js/app.min.js",
-    "revision": "dbf4b2ee92c86893f480ae57ad75bfb1"
+    "revision": "978e3c20bcdf87cf0c922bc8bc7d72f4"
   },
   {
     "url": "js/extensions.min.js",
@@ -18,7 +18,7 @@ if (workbox)
   },
   {
     "url": "js/shapes.min.js",
-    "revision": "90f20c3500b9ca12c9a33271b89c0dc8"
+    "revision": "148b4f20d0bac88757bdd15f971746b5"
   },
   {
     "url": "js/math-print.js",
@@ -58,7 +58,7 @@ if (workbox)
   },
   {
     "url": "js/viewer-static.min.js",
-    "revision": "cbeed9063ccd621c2167ac0ccb490518"
+    "revision": "89495c3d06533daed8b8bc1b7ec210ed"
   },
   {
     "url": "connect/jira/editor-1-3-3.html",
@@ -178,231 +178,231 @@ if (workbox)
   },
   {
     "url": "resources/dia.txt",
-    "revision": "4d59f7b35d7ef94a8c29e95a1f74e816"
+    "revision": "53fab577d099f0f69f3f0ca3b3b3cede"
   },
   {
     "url": "resources/dia_am.txt",
-    "revision": "778bf17a8dcdfa24b42b7e88b9b12167"
+    "revision": "5b646bdd433b3b6d4bb811a85473f60f"
   },
   {
     "url": "resources/dia_ar.txt",
-    "revision": "3e4540e98bad46866d7207e18208eb2c"
+    "revision": "b131e98c4aa5e536ba783de7a547b58e"
   },
   {
     "url": "resources/dia_bg.txt",
-    "revision": "057a0a3a26406b08dec83195072097cc"
+    "revision": "8c3b24389799e75d940b8db28fcdf1cc"
   },
   {
     "url": "resources/dia_bn.txt",
-    "revision": "039854799ae52c79b65cb075e7518a6a"
+    "revision": "a423836642ba3129f77da5d820cda371"
   },
   {
     "url": "resources/dia_bs.txt",
-    "revision": "f6a0060958d2df9c067937be66cc7f04"
+    "revision": "d020b4e0865323256d32c6c30d2effa5"
   },
   {
     "url": "resources/dia_ca.txt",
-    "revision": "32f3910c809950e6373282b4aae4962f"
+    "revision": "2f583f040fb9d83b1d0bee3ad5690578"
   },
   {
     "url": "resources/dia_cs.txt",
-    "revision": "0bdb4a84350560d28106ef77b5efa0fc"
+    "revision": "7e337bbf162642a132fd0ed147eb920f"
   },
   {
     "url": "resources/dia_da.txt",
-    "revision": "9968375dac7262948238b6dfc12cc0b8"
+    "revision": "fa3aa430fe68d57b1460c0c3b2ff9027"
   },
   {
     "url": "resources/dia_de.txt",
-    "revision": "abcfc52a70007d9d8c979e57bf1db6a5"
+    "revision": "fde967199bf30e6ba8467f90c0ce8730"
   },
   {
     "url": "resources/dia_el.txt",
-    "revision": "138bc67f1d7eba7ce401605c7829bc39"
+    "revision": "d658ef00c7fcfab66afdfc4ad77f15a9"
   },
   {
     "url": "resources/dia_eo.txt",
-    "revision": "1e01e811e0c9d8e035bd8d9a348576d5"
+    "revision": "c592cb690dd6ede84d58b27dde53060a"
   },
   {
     "url": "resources/dia_es.txt",
-    "revision": "f3df2142a43fd56fcccf17d889b4f30f"
+    "revision": "84f356597a98d7392240bea024d57392"
   },
   {
     "url": "resources/dia_et.txt",
-    "revision": "50b1338a4abf464407245e91535811c4"
+    "revision": "18117709d6cc65d479f00e7cef631edc"
   },
   {
     "url": "resources/dia_eu.txt",
-    "revision": "941cb30bed694e6f04f48e670f88f1a2"
+    "revision": "010d5e5ec82ad539c94962e1f3d826f1"
   },
   {
     "url": "resources/dia_fa.txt",
-    "revision": "0e6efda9ee5eeb62058ca465ab17d87c"
+    "revision": "6950af995ce70edd1278bc3dd6d16223"
   },
   {
     "url": "resources/dia_fi.txt",
-    "revision": "81f8896b839865ad793496da8484bdb0"
+    "revision": "de801cb514e4dc6751ce2ce30727ba4a"
   },
   {
     "url": "resources/dia_fil.txt",
-    "revision": "5288756eaae47ca508ea05fc4eb9e791"
+    "revision": "18a080dfa8d1428920b3546220068345"
   },
   {
     "url": "resources/dia_fr.txt",
-    "revision": "a66a8658eb01837ff96933aca69c4a02"
+    "revision": "b6278c59d3354d78ccba9443c5f8603e"
   },
   {
     "url": "resources/dia_gl.txt",
-    "revision": "e016b6f864b663e6bbaf2101e870c646"
+    "revision": "faf3e9174b90de64448a647b4d260007"
   },
   {
     "url": "resources/dia_gu.txt",
-    "revision": "25dbd0206cec86a57f97ddcd6e57cd13"
+    "revision": "d44c92c6551933cd85c862654c59fe88"
   },
   {
     "url": "resources/dia_he.txt",
-    "revision": "70b2416b6452fb2af2bb68b3e2c49d95"
+    "revision": "4ea6909840150f1765b9d833ff7a0501"
   },
   {
     "url": "resources/dia_hi.txt",
-    "revision": "a36b567c35328bded17ce394b5205c1f"
+    "revision": "c7dd44dfe01afca19fdea363cc976735"
   },
   {
     "url": "resources/dia_hr.txt",
-    "revision": "52f1e46c684386215c015a7b07ae3117"
+    "revision": "ad46611c0fc54ecb1f7bbe83a2e1d10b"
   },
   {
     "url": "resources/dia_hu.txt",
-    "revision": "1e2fccc70b362cd2cba7a3ed5c2a7bcb"
+    "revision": "651ba5c33d4e4d34d0f2a37533862d9f"
   },
   {
     "url": "resources/dia_id.txt",
-    "revision": "17c67b6929c6b0a188ff6ab06806dbc9"
+    "revision": "0cb448ca986b83d2c121387ae46e8b1c"
   },
   {
     "url": "resources/dia_it.txt",
-    "revision": "e6403a2d0ff806717923ae97acb9eac0"
+    "revision": "f71b153c71e4075d5882000c36923a15"
   },
   {
     "url": "resources/dia_ja.txt",
-    "revision": "f190b88637cbd736e0fb0f7a3f2b43c9"
+    "revision": "1ba378d893afdaa3ba683fde2eecbec9"
   },
   {
     "url": "resources/dia_kn.txt",
-    "revision": "0c9d15b9630b2e087acc32e3a127cfda"
+    "revision": "cb80260f63ebc9640bc1c986bb99d73f"
   },
   {
     "url": "resources/dia_ko.txt",
-    "revision": "f3fda47162650384add57b045401bbd8"
+    "revision": "d8e8c67adc20bb3aa7aee557a4f0d053"
   },
   {
     "url": "resources/dia_lt.txt",
-    "revision": "a407efba8b9b9c7ca858dfaba64eedfa"
+    "revision": "ad17c7429b50346b9c1d2e2e422c71c5"
   },
   {
     "url": "resources/dia_lv.txt",
-    "revision": "7103e0c2616ebb93226fd67d49cd3e0b"
+    "revision": "34641c084d78eb31a04bb945f77c8956"
   },
   {
     "url": "resources/dia_ml.txt",
-    "revision": "29250b274ad48f8c5c6c708fb0cb2a89"
+    "revision": "323bc29ee73b5a626a5a712baa2bb00f"
   },
   {
     "url": "resources/dia_mr.txt",
-    "revision": "9ea146d7ba33524bd67e21c7f11052e7"
+    "revision": "e6583de81d4e83f0dee46e0e9019bac9"
   },
   {
     "url": "resources/dia_ms.txt",
-    "revision": "2a54623652440e93a4e74f33af3e4a25"
+    "revision": "cda7fe7c29d44200b87ed62c93c45913"
   },
   {
     "url": "resources/dia_my.txt",
-    "revision": "4d59f7b35d7ef94a8c29e95a1f74e816"
+    "revision": "53fab577d099f0f69f3f0ca3b3b3cede"
   },
   {
     "url": "resources/dia_nl.txt",
-    "revision": "50448eea83d396cce9b65831c70cb575"
+    "revision": "f133a14bd644b50ef1dadbcc8b8813b0"
   },
   {
     "url": "resources/dia_no.txt",
-    "revision": "b7a0b02a59f7f36198d7a5a93e36040c"
+    "revision": "9d2477c19e3e8c3ff29a04f4b3e1cefb"
   },
   {
     "url": "resources/dia_pl.txt",
-    "revision": "27eb079c058d4f73ace38947e19b1aea"
+    "revision": "cf5cd892bd7d850f17c4ee66549a0e0e"
   },
   {
     "url": "resources/dia_pt-br.txt",
-    "revision": "7f07c4be9e6874ca32e7ac6d6022cd64"
+    "revision": "932a636bdbc05009108ea498db199f86"
   },
   {
     "url": "resources/dia_pt.txt",
-    "revision": "8d493d1f818162d847b9167d33e8c13b"
+    "revision": "3c93496ca95a11f4e77f64645f485928"
   },
   {
     "url": "resources/dia_ro.txt",
-    "revision": "cac8614c9c753a8b31a33c54955c5b31"
+    "revision": "347cdf35499dfcc45a8a81aeb6ed097a"
   },
   {
     "url": "resources/dia_ru.txt",
-    "revision": "775a84a39ef1454fbba4c471dbcae7a6"
+    "revision": "b2515f4b189293e2bb8806c7cfeada8a"
   },
   {
     "url": "resources/dia_si.txt",
-    "revision": "4d59f7b35d7ef94a8c29e95a1f74e816"
+    "revision": "53fab577d099f0f69f3f0ca3b3b3cede"
   },
   {
     "url": "resources/dia_sk.txt",
-    "revision": "6cda9aba40212eddb877369cab08411e"
+    "revision": "9bdb5a016fdbec803a82fb0f5636e25a"
   },
   {
     "url": "resources/dia_sl.txt",
-    "revision": "599fc9ac7e63cccc8b859ab1d8e3df07"
+    "revision": "97bd348532541fbdc66292213e161d4d"
   },
   {
     "url": "resources/dia_sr.txt",
-    "revision": "3d63060db04613931b1b0382842ef2e9"
+    "revision": "b40441053a2a8670ffaa07b09809c04a"
   },
   {
     "url": "resources/dia_sv.txt",
-    "revision": "ef083de1f85952ba3ba07878b66e615b"
+    "revision": "ab1450bf1955fb3dfce08201cd97163a"
   },
   {
     "url": "resources/dia_sw.txt",
-    "revision": "ad33695aa7e8c6c321682a4b85f50caa"
+    "revision": "93e4bc002be8224cacf24101288ea565"
   },
   {
     "url": "resources/dia_ta.txt",
-    "revision": "b6e615164d3bf3afb9bde50398f85f48"
+    "revision": "57003ed4b25300c572246bfd6bda6f2d"
   },
   {
     "url": "resources/dia_te.txt",
-    "revision": "dbe04633dfa6c9301bc63ea1702a7733"
+    "revision": "1517bc63e2226669b662ba2cf15b51c3"
   },
   {
     "url": "resources/dia_th.txt",
-    "revision": "8ac425364fc6e5fd8dc74b1a7f760147"
+    "revision": "955910f9e5c06086e70c0967f0a9d71f"
   },
   {
     "url": "resources/dia_tr.txt",
-    "revision": "f7d08e1a2fd1804993cabff20a2e5a36"
+    "revision": "a412ede0867f0551d784f7d2764f4cd9"
   },
   {
     "url": "resources/dia_uk.txt",
-    "revision": "95db5308f5137c0c89f4f938e4c979d1"
+    "revision": "6c9ee51f8fe2ce03b892ab63be563032"
   },
   {
     "url": "resources/dia_vi.txt",
-    "revision": "dd1527ab8b802a7e139cad22b453ea9a"
+    "revision": "1a2909a3955812d1f6887ae2dc1397d8"
   },
   {
     "url": "resources/dia_zh-tw.txt",
-    "revision": "51225e37a7cc3aefe979df5c41899f8f"
+    "revision": "652aa1890b628f5a722a594ad33addce"
   },
   {
     "url": "resources/dia_zh.txt",
-    "revision": "a69d685cb661136b6ca72610a532f9b8"
+    "revision": "510f08142ac552524cfb73e1fe03839a"
   },
   {
     "url": "favicon.ico",