7.6.9 release

ChangeLog

@@ -1,3 +1,10 @@
+15-NOV-2017: 7.6.9
+
+- Adds predefined filters for Trello picker
+- Fixes picker for GDriveConnector and Google Docs Add-on
+- Fixes UTF8 strings in imported SVG images
+- Adds context menu for links in hints
+
 13-NOV-2017: 7.6.8
 
 - Updates to latest AWS stencils

VERSION

@@ -1 +1 @@
-7.6.8
+7.6.9

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 11/13/2017 03:27 PM
+# 11/15/2017 05:18 PM
 
 app.html
 index.html?offline=1

war/js/diagramly/EditorUi.js

@@ -5867,7 +5867,7 @@
 					    				// Checks if SVG contains content attribute
 				    					var data = e.target.result;
 				    					var comma = data.indexOf(',');
-				    					var svgText = atob(data.substring(comma + 1));
+				    					var svgText = decodeURIComponent(escape(atob(data.substring(comma + 1))));
 				    					var root = mxUtils.parseXml(svgText);
 			    						var svgs = root.getElementsByTagName('svg');
 			    						
@@ -5936,7 +5936,6 @@
 									    						}
 		
 									    						data = this.createSvgDataUri(mxUtils.getXml(svgs[0]));
-									    						
 									    						var s = Math.min(1, Math.min(maxSize / Math.max(1, w)), maxSize / Math.max(1, h));
 											    				
 											    				return fn(data, file.type, x + index * gs, y + index * gs,
@@ -6357,7 +6356,7 @@
 			}
 			
 			result += f.substring(pos - 8, pos - 4 + n);
-			value = fread(f,n);
+			fread(f,n);
 			fread(f,4);
 		}
 		while (n);

war/js/diagramly/TrelloClient.js

@@ -32,14 +32,14 @@ TrelloClient.prototype.extension = '.xml'; //TODO export to png
  * Authorizes the client, used with methods that can be called without a user click and popup blockers will interfere
  * Show the AuthDialog to work around the popup blockers if the file is opened directly
  */
-TrelloClient.prototype.authenticate = function(success, error, force)
+TrelloClient.prototype.authenticate = function(fn, error, force)
 {
 	if (force)
 	{
 		this.logout();
 	}
 	
-	var callback = mxUtils.bind(this, function(remember)
+	var callback = mxUtils.bind(this, function(remember, success)
 	{
 		Trello.authorize(
 		{
@@ -51,8 +51,27 @@ TrelloClient.prototype.authenticate = function(success, error, force)
 			    write: 'true'
 			},
 			expiration: remember ? 'never' : '1hour',
-			success: success,
-			error: error
+			success: function()
+			{
+				if (success != null)
+				{
+					success();
+				}
+				
+				fn();
+			},
+			error: function()
+			{
+				if (success != null)
+				{
+					success();
+				}
+				
+				if (error != null)
+				{
+					error(mxResources.get('loggedOut'));
+				}
+			}
 		});
 	});
 	
@@ -391,14 +410,14 @@ TrelloClient.prototype.pickFile = function(fn, returnObject)
 	{
 		this.ui.loadFile('T' + encodeURIComponent(id));
 	});
-	
+
 	this.authenticate(mxUtils.bind(this, function()
 	{
 	  	// show file select
 		this.showTrelloDialog(true, fn);
 	}), mxUtils.bind(this, function(e)
 	{
-		this.ui.showError(mxResources.get('error'), e);
+		this.ui.showError(mxResources.get('error'), e, mxResources.get('ok'));
 	}));
 };
 
@@ -409,7 +428,7 @@ TrelloClient.prototype.pickFile = function(fn, returnObject)
 TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 {
 	var cardId = null;
-	var filter = null;
+	var filter = '@me';
 	var linkCounter = 0;
 	
 	var content = document.createElement('div');
@@ -437,7 +456,7 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 	{
 		linkCounter++;
 		var div = document.createElement('div');
-		div.style = "width:100%;vertical-align:middle;background:" + (linkCounter % 2 == 0? "#eee" : "#fff");
+		div.style = "width:100%;text-overflow:ellipsis;overflow:hidden;vertical-align:middle;background:" + (linkCounter % 2 == 0? "#eee" : "#fff");
 		var link = document.createElement('a');
 		link.setAttribute('href', 'javascript:void(0);');
 		
@@ -464,51 +483,66 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 		this.ui.handleError(err, null, mxUtils.bind(this, function()
 		{
 			this.ui.spinner.stop();
-			
 			this.ui.hideDialog();
 		}));
 	});
-	
+
 	var selectAtt = mxUtils.bind(this, function()
 	{
 		linkCounter = 0;
 		div.innerHTML = '';
 		this.ui.spinner.spin(div, mxResources.get('loading'));
 		
-		Trello.cards.get(cardId + '/attachments', {fields: 'id,name,previews'}, mxUtils.bind(this, function(data)
+		var callback = mxUtils.bind(this, function()
 		{
-			this.ui.spinner.stop();
-			var files = data;
-			div.appendChild(createLink('../ [Up]', mxUtils.bind(this, function()
+			Trello.cards.get(cardId + '/attachments', {fields: 'id,name,previews'}, mxUtils.bind(this, function(data)
 			{
-				selectCard();
-			})));
-			mxUtils.br(div);
-
-			if (files == null || files.length == 0)
-			{
-				mxUtils.write(div, mxResources.get('noFiles'));
-			}
-			else
-			{
-				var listFiles = mxUtils.bind(this, function()
+				this.ui.spinner.stop();
+				var files = data;
+				div.appendChild(createLink('../ [Up]', mxUtils.bind(this, function()
 				{
-					for (var i = 0; i < files.length; i++)
+					selectCard();
+				})));
+				mxUtils.br(div);
+	
+				if (files == null || files.length == 0)
+				{
+					mxUtils.write(div, mxResources.get('noFiles'));
+				}
+				else
+				{
+					var listFiles = mxUtils.bind(this, function()
 					{
-						(mxUtils.bind(this, function(file)
+						for (var i = 0; i < files.length; i++)
 						{
-							div.appendChild(createLink(file.name, mxUtils.bind(this, function()
+							(mxUtils.bind(this, function(file)
 							{
-								this.ui.hideDialog();
-								fn(cardId + this.SEPARATOR + file.id);
-							}), file.previews != null? file.previews[0] : null));
-						}))(files[i]);
-					}
-				});
-				
-				listFiles();
-			}
-		}), error);
+								div.appendChild(createLink(file.name, mxUtils.bind(this, function()
+								{
+									this.ui.hideDialog();
+									fn(cardId + this.SEPARATOR + file.id);
+								}), file.previews != null? file.previews[0] : null));
+							}))(files[i]);
+						}
+					});
+					
+					listFiles();
+				}
+			}),
+			mxUtils.bind(this, function(req)
+			{
+		    		if (req.status == 401)
+		    		{
+		    			this.authenticate(callback, error, true);
+		    		}
+		    		else if (error != null)
+		    		{
+		    			error(req);
+		    		}	
+			}));
+		});
+		
+		callback();
 	});
 	
 	// Adds paging for cards (files limited to 1000 by API)
@@ -545,8 +579,10 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 		
 		mxEvent.addListener(nextPageDiv, 'click', nextPage);
 		
-		Trello.get('search', {
-				'query': (filter != null ? filter : 'is:open'),
+		var callback = mxUtils.bind(this, function()
+		{
+			Trello.get('search', {
+				'query': (mxUtils.trim(filter) == '') ? 'is:open' : filter,
 				'cards_limit': pageSize,
 				'cards_page': page-1
 			},
@@ -557,46 +593,25 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 				
 				if (cards == null || cards.length == 0)
 				{
-					if (filter != null)
-					{
-						div.appendChild(createLink(mxResources.get('clearFilter'), mxUtils.bind(this, function()
-						{
-							filter = null;
-							selectCard();
-						})));
-						mxUtils.br(div);
-					}
-					
 					mxUtils.write(div, mxResources.get('noFiles'));
 				}
 				else
 				{
 					if (page == 1)
 					{
-						if (filter != null)
+						div.appendChild(createLink(mxResources.get('filterCards') + '...', mxUtils.bind(this, function()
 						{
-							div.appendChild(createLink(mxResources.get('clearFilter'), mxUtils.bind(this, function()
+							var dlg = new FilenameDialog(this.ui, filter, mxResources.get('ok'), mxUtils.bind(this, function(value)
 							{
-								filter = null;
-								selectCard();
-							})));
-						}
-						else
-						{
-							div.appendChild(createLink(mxResources.get('filterCards') + '...', mxUtils.bind(this, function()
-							{
-								var dlg = new FilenameDialog(this.ui, 'is:open', mxResources.get('ok'), mxUtils.bind(this, function(value)
+								if (value != null)
 								{
-									if (value != null)
-									{
-										filter = value;
-										selectCard();
-									}
-								}), mxResources.get('cardName'), null, null, 'http://help.trello.com/article/808-searching-for-cards-all-boards');
-								this.ui.showDialog(dlg.container, 300, 80, true, false);
-								dlg.init();
-							})));
-						}
+									filter = value;
+									selectCard();
+								}
+							}), mxResources.get('filterCards'), null, null, 'http://help.trello.com/article/808-searching-for-cards-all-boards');
+							this.ui.showDialog(dlg.container, 300, 80, true, false);
+							dlg.init();
+						})));
 						
 						mxUtils.br(div);
 					}
@@ -637,7 +652,20 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 					}
 				}
 			}),
-		error);
+			mxUtils.bind(this, function(req)
+			{
+		    		if (req.status == 401)
+		    		{
+		    			this.authenticate(callback, error, true);
+		    		}
+		    		else if (error != null)
+		    		{
+		    			error({message: req.responseText});
+		    		}	
+			}));
+		});
+		
+		callback();
 	});
 	
 	selectCard();

war/js/diagramly/graphml/mxGraphMlCodec.js

@@ -454,7 +454,7 @@ mxGraphMlCodec.prototype.importNode = function (nodeElement, graph, nodesMap, pa
 					"fill.yjs:SolidColorFill.color": {key: "strokeColor", mod: "color"},
 					//"lineCap": "", //??
 					"thickness.sys:Double": "strokeWidth",
-					"thickness": "strokeWidth",
+					"thickness": "strokeWidth"
 				}
 			};
 
@@ -665,9 +665,16 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 				console.log(tableObj);
 				
 				this.mapObject(tableObj, {
-					"backgroundStyle.demotablestyle:TableBackgroundStyle.insetFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "fillColor", mod: "color"},
+					"backgroundStyle.demotablestyle:TableBackgroundStyle": {
+						"insetFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "fillColor", mod: "color"},
+						"tableBackgroundFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "swimlaneFillColor", mod: "color"},
+						"tableBackgroundStroke.yjs:Stroke":{
+							"fill": {key: "strokeColor", mod: "color"},
+							"thickness": "strokeWidth" 
+						}
+					},
 					"backgroundStyle.yjs:ShapeNodeStyle.fill": {key: "fillColor", mod: "color"},
-					"backgroundStyle.yjs:ShapeNodeStyle.fill.yjs:SolidColorFill.color": {key: "fillColor", mod: "color"},
+					"backgroundStyle.yjs:ShapeNodeStyle.fill.yjs:SolidColorFill.color": {key: "fillColor", mod: "color"}
 				}, styleMap);
 				
 				//Lane fill color is the same as the fill color
@@ -718,9 +725,17 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 							"backgroundFill": {key: "oddLaneFill", mod: "color"}
 						}
 						//parentDescriptor ??
-						//TODO Handle labels 
 						//TODO collect common types in a special mapping hash
 					},
+					"Style.yjs:NodeStyleStripeStyleAdapter":{
+						"demotablestyle:DemoStripeStyle": {
+							"stripeInsetFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "fillColor", mod: "color"},
+							"tableLineFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "strokeColor", mod: "color"}
+						},
+						"yjs:ShapeNodeStyle": {
+							"fill": {key: "swimlaneFillColor", mod: "color"}
+						}
+					},
 					"Size": "height"
 				};
 				this.mapObject(tableObj["RowDefaults"], {
@@ -738,8 +753,26 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 					{
 						map["startSize"] = val.split(',')[1];
 					},
-					"Style.yjs:NodeStyleStripeStyleAdapter.yjs:ShapeNodeStyle": {
-						"fill": {key: "swimlaneFillColor", mod: "color"}
+					"Style.bpmn:AlternatingLeafStripeStyle": {
+						"evenLeafDescriptor.bpmn:StripeDescriptor": {
+							"insetFill": {key: "evenFill", mod: "color"},
+							"backgroundFill": {key: "evenLaneFill", mod: "color"}
+						},
+						"oddLeafDescriptor.bpmn:StripeDescriptor": {
+							"insetFill": {key: "oddFill", mod: "color"},
+							"backgroundFill": {key: "oddLaneFill", mod: "color"}
+						}
+						//parentDescriptor ??
+						//TODO collect common types in a special mapping hash
+					},
+					"Style.yjs:NodeStyleStripeStyleAdapter":{
+						"demotablestyle:DemoStripeStyle": {
+							"stripeInsetFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "fillColor", mod: "color"},
+							"tableLineFill.yjs:SolidColorFill.color.yjs:Color.value": {key: "strokeColor", mod: "color"}
+						},
+						"yjs:ShapeNodeStyle": {
+							"fill": {key: "swimlaneFillColor", mod: "color"}
+						}
 					},
 					"Size": "width"
 				};
@@ -758,6 +791,7 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 				var rows = tableObj["Rows"]["y:Row"];
 				y += parseFloat(defColStyle["startSize"]);
 				
+				//TODO We need two passes to determine the header size!
 				if (rows)
 				{
 					if (!(rows instanceof Array))
@@ -765,33 +799,7 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 					
 					for (var i = 0; i < rows.length; i++)
 					{
-						var cell = new mxCell();
-						cell.vertex = true;
-						var rowStyle = mxUtils.clone(defRowStyle);
-						this.mapObject(rows[i], rowMapping, rowStyle);
-						
-						if (i & 1) //odd
-						{
-							if (rowStyle["oddFill"]) 
-							{
-								rowStyle["fillColor"] = rowStyle["oddFill"];
-								rowStyle["swimlaneFillColor"] = rowStyle["oddLaneFill"];
-							}
-						}
-						else
-						{
-							if (rowStyle["evenFill"]) 
-							{
-								rowStyle["fillColor"] = rowStyle["evenFill"];
-								rowStyle["swimlaneFillColor"] = rowStyle["evenLaneFill"];
-							}
-						}
-						var height = parseFloat(rowStyle["height"]);
-						cell.geometry = new mxGeometry(xShift, y, pGeo.width - xShift, height);
-						y += height;
-						
-						cell.style = this.styleMap2Str(rowStyle);
-						node.insert(cell);
+						y = this.addRow(rows[i], node, (i & 1), y, xShift, rowMapping, defRowStyle);
 					}
 				}
 
@@ -805,24 +813,124 @@ mxGraphMlCodec.prototype.handleCompoundShape = function (node, styleMap, mlStyle
 					
 					for (var i = 0; i < columns.length; i++)
 					{
-						var cell = new mxCell();
-						cell.vertex = true;
-						var colStyle = mxUtils.clone(defColStyle);
-						this.mapObject(columns[i], colMapping, colStyle);
-						
-						var width = parseFloat(colStyle["width"]);
-						cell.geometry = new mxGeometry(x, yShift, width, pGeo.height - yShift);
-						x += width;
-						
-						cell.style = this.styleMap2Str(colStyle);
-						node.insert(cell);
+						x = this.addColumn(columns[i], node, (i & 1), x, yShift, colMapping, defColStyle);
 					}
 				}
+				
 			break;
 		}
 	}
 };
 
+mxGraphMlCodec.prototype.addRow = function(row, parent, odd, y, xShift, rowMapping, defRowStyle)
+{
+	var cell = new mxCell();
+	cell.vertex = true;
+	var rowStyle = mxUtils.clone(defRowStyle);
+	this.mapObject(row, rowMapping, rowStyle);
+	
+	if (odd)
+	{
+		if (rowStyle["oddFill"]) 
+			rowStyle["fillColor"] = rowStyle["oddFill"];
+
+		if (rowStyle["oddLaneFill"])
+			rowStyle["swimlaneFillColor"] = rowStyle["oddLaneFill"];
+	}
+	else
+	{
+		if (rowStyle["evenFill"]) 
+			rowStyle["fillColor"] = rowStyle["evenFill"];
+		
+		if (rowStyle["evenLaneFill"])
+			rowStyle["swimlaneFillColor"] = rowStyle["evenLaneFill"];
+	}
+	
+	var height = parseFloat(rowStyle["height"]);
+	cell.geometry = new mxGeometry(xShift, y, parent.geometry.width - xShift, height);
+
+	var lblObj = row["Labels"];
+	
+	if (lblObj)
+		this.addLabels(cell, lblObj, rowStyle)
+	
+	cell.style = this.styleMap2Str(rowStyle);
+	parent.insert(cell);
+	
+	var subRow = row["y:Row"];
+	
+	var subY = 0;
+	if (subRow)
+	{
+		if (!(subRow instanceof Array))
+			subRow = [subRow];
+		
+		for (var i = 0; i < subRow.length; i++)
+		{
+			subY = this.addRow(subRow[i], cell, (i & 1), subY, xShift, rowMapping, defRowStyle);
+		}
+	}
+	height = Math.max(height, subY);
+	cell.geometry.height = height;
+	y += height;
+
+	return y;
+}
+
+mxGraphMlCodec.prototype.addColumn = function(column, parent, odd, x, yShift, colMapping, defColStyle)
+{
+	var cell = new mxCell();
+	cell.vertex = true;
+	var colStyle = mxUtils.clone(defColStyle);
+	this.mapObject(column, colMapping, colStyle);
+	
+	if (odd)
+	{
+		if (colStyle["oddFill"]) 
+			colStyle["fillColor"] = colStyle["oddFill"];
+		
+		if (colStyle["oddLaneFill"])
+			colStyle["swimlaneFillColor"] = colStyle["oddLaneFill"];
+	}
+	else
+	{
+		if (colStyle["evenFill"]) 
+			colStyle["fillColor"] = colStyle["evenFill"];
+		
+		if (colStyle["evenLaneFill"])
+			colStyle["swimlaneFillColor"] = colStyle["evenLaneFill"];
+	}
+
+	var width = parseFloat(colStyle["width"]);
+	cell.geometry = new mxGeometry(x, yShift, width, parent.geometry.height - yShift);
+
+	var lblObj = column["Labels"];
+	
+	if (lblObj)
+		this.addLabels(cell, lblObj, colStyle)
+
+	cell.style = this.styleMap2Str(colStyle);
+	parent.insert(cell);
+	
+	var subCol = column["y:Column"];
+	
+	var subX = 0;
+	if (subCol)
+	{
+		if (!(subCol instanceof Array))
+			subCol = [subCol];
+		
+		for (var i = 0; i < subCol.length; i++)
+		{
+			subX = this.addColumn(subCol[i], cell, (i & 1), subX, yShift, colMapping, defColStyle);
+		}
+	}
+	width = Math.max(width, subX);
+	cell.geometry.width = width;
+	x += width;
+	return x;
+}
+
 mxGraphMlCodec.prototype.handleFixedRatio = function (node, styleMap)
 {
 	var shape = styleMap["shape"];
@@ -983,7 +1091,7 @@ mxGraphMlCodec.prototype.addEdgeStyle = function (edge, styleObj, styleMap)
 				"fill.yjs:SolidColorFill.color": {key: "strokeColor", mod: "color"},
 				//"lineCap": "", //??
 				"thickness.sys:Double": "strokeWidth",
-				"thickness": "strokeWidth",
+				"thickness": "strokeWidth"
 			},
 			"targetArrow.yjs:Arrow": {
 				"defaults" : 
@@ -1018,6 +1126,11 @@ mxGraphMlCodec.prototype.addLabels = function (node, LblObj, nodeStyle)
 	
 	if (lblList)
 	{
+		if (!(lblList instanceof Array)) 
+		{
+			lblList = [lblList];
+		}
+		
 		for (var i = 0; i < lblList.length; i++)
 		{
 			var lbl = lblList[i];

war/js/mxgraph/EditorUi.js

@@ -86,14 +86,35 @@ EditorUi = function(editor, container, lightbox)
 	// And uses built-in context menu while editing
 	if (!this.editor.chromeless || this.editor.editable)
 	{
+		// Allows context menu for links in hints
+		var linkHandler = function(evt)
+		{
+			var source = mxEvent.getSource(evt);
+			
+			if (source.nodeName == 'A')
+			{
+				while (source != null)
+				{
+					if (source.className == 'geHint')
+					{
+						return true;
+					}
+					
+					source = source.parentNode;
+				}
+			}
+			
+			return textEditing(evt);
+		};
+		
 		if (mxClient.IS_IE && (typeof(document.documentMode) === 'undefined' || document.documentMode < 9))
 		{
-			mxEvent.addListener(this.diagramContainer, 'contextmenu', textEditing);
+			mxEvent.addListener(this.diagramContainer, 'contextmenu', linkHandler);
 		}
 		else
 		{
 			// Allows browser context menu outside of diagram and sidebar
-			this.diagramContainer.oncontextmenu = textEditing;
+			this.diagramContainer.oncontextmenu = linkHandler;
 		}
 	}
 	else
@@ -1357,7 +1378,7 @@ EditorUi.prototype.initCanvas = function()
                 
                 var ns = (autoscale) ? Math.max(0.3, Math.min(maxScale || 1, cw / b.width)) : s;
                 var dx = ((cw - ns * b.width) / 2) / ns;
-                var dy = ((ch - ns * b.height) / this.lightboxVerticalDivider) / ns;
+                var dy = (this.lightboxVerticalDivider == 0) ? 0 : ((ch - ns * b.height) / this.lightboxVerticalDivider) / ns;
                 
                 if (scroll)
                 {
@@ -1385,7 +1406,7 @@ EditorUi.prototype.initCanvas = function()
 		// Removable resize listener
 		var autoscaleResize = mxUtils.bind(this, function()
 	   	{
-			resize(false);
+			this.chromelessResize(false);
 	   	});
 		
 	   	mxEvent.addListener(window, 'resize', autoscaleResize);
@@ -1397,11 +1418,19 @@ EditorUi.prototype.initCanvas = function()
 	   	
 		this.editor.addListener('resetGraphView', mxUtils.bind(this, function()
 		{
-			resize(true);
+			this.chromelessResize(true);
 		}));
 
-		this.actions.get('zoomIn').funct = function(evt) { graph.zoomIn(); resize(false); };
-		this.actions.get('zoomOut').funct = function(evt) { graph.zoomOut(); resize(false); };
+		this.actions.get('zoomIn').funct = mxUtils.bind(this, function(evt)
+		{
+			graph.zoomIn();
+			this.chromelessResize(false);
+		});
+		this.actions.get('zoomOut').funct = mxUtils.bind(this, function(evt)
+		{
+			graph.zoomOut();
+			this.chromelessResize(false);
+		});
 		
 		// Creates toolbar for viewer - do not use CSS here
 		// as this may be used in a viewer that has no CSS
@@ -1540,11 +1569,11 @@ EditorUi.prototype.initCanvas = function()
 						graph.zoomTo(1);
 					}
 					
-					resize(false);
+					this.chromelessResize(false);
 				}
 				else
 				{
-					resize(true);
+					this.chromelessResize(true);
 				}
 				
 				mxEvent.consume(evt);
@@ -1938,8 +1967,8 @@ EditorUi.prototype.initCanvas = function()
             {
                 if (resize != null)
                 {
-                    resize(false, null, dx * (this.cumulativeZoomFactor - 1),
-                           dy * (this.cumulativeZoomFactor - 1));
+                		this.chromelessResize(false, null, dx * (this.cumulativeZoomFactor - 1),
+                				dy * (this.cumulativeZoomFactor - 1));
                 }
                 
                 if (mxUtils.hasScrollbars(graph.container) && (dx != 0 || dy != 0))

war/js/mxgraph/Graph.js

@@ -5823,9 +5823,9 @@ if (typeof mxVertexHandler != 'undefined')
 			}
 			
 			// Adds shortened label to link
-			var max = 60;
-			var head = 36;
-			var tail = 20;
+			var max = 40;
+			var head = 26;
+			var tail = 10;
 			
 			if (label.length > max)
 			{
@@ -6652,13 +6652,26 @@ if (typeof mxVertexHandler != 'undefined')
 				
 				this.hint.style.left = bb.x + Math.round((bb.width - this.hint.clientWidth) / 2) + 'px';
 				this.hint.style.top = (bb.y + bb.height + 12) + 'px';
+				
+				if (this.linkHint != null)
+				{
+					this.linkHint.style.display = 'none';
+				}
 			}
 		};
 	
 		/**
 		 * Updates the hint for the current operation.
 		 */
-		mxVertexHandler.prototype.removeHint = mxGraphHandler.prototype.removeHint;
+		mxVertexHandler.prototype.removeHint = function()
+		{
+			mxGraphHandler.prototype.removeHint.apply(this, arguments);
+			
+			if (this.linkHint != null)
+			{
+				this.linkHint.style.display = '';
+			}
+		};
 	
 		/**
 		 * Updates the hint for the current operation.
@@ -7481,7 +7494,7 @@ if (typeof mxVertexHandler != 'undefined')
 					b = Math.max(b, tb.y + tb.height);
 				}
 				
-				this.linkHint.style.left = Math.round(rs.x + (rs.width - this.linkHint.clientWidth) / 2) + 'px';
+				this.linkHint.style.left = Math.max(0, Math.round(rs.x + (rs.width - this.linkHint.clientWidth) / 2)) + 'px';
 				this.linkHint.style.top = Math.round(b + this.verticalOffset / 2 + 6 +
 					this.state.view.graph.tolerance) + 'px';
 			}
@@ -7549,7 +7562,7 @@ if (typeof mxVertexHandler != 'undefined')
 						b.add(this.state.text.bounds);
 					}
 					
-					this.linkHint.style.left = Math.round(b.x + (b.width - this.linkHint.clientWidth) / 2) + 'px';
+					this.linkHint.style.left = Math.max(0, Math.round(b.x + (b.width - this.linkHint.clientWidth) / 2)) + 'px';
 					this.linkHint.style.top = Math.round(b.y + b.height + 6 + this.state.view.graph.tolerance) + 'px';
 				}
 			}

war/resources/dia.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_am.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_ar.txt

@@ -79,7 +79,6 @@ center=‫توسيط‬
 cannotLoad=‫لقد فشلت محاولات الرفع. المرجو المحاولة لاحقا.‬
 cannotLogin=‫لقد فشلت محاولات تسجيل الدخول. المرجو المحاولة لاحقا‬
 cannotOpenFile=‫تعذر فتح الملف‬
-cardName=Card Name
 change=‫تغيير‬
 changeOrientation=‫تغيير الاتجاه‬
 changeUser=‫تغيير المستخدم‬
@@ -100,7 +99,6 @@ circle=‫دائرة‬
 cisco=Cisco
 classic=‫تقليدي‬
 clearDefaultStyle=‫نمط شفاف افتراضي‬
-clearFilter=Clear Filter
 clearWaypoints=‫إزالة نقط المسار‬
 clipart=‫قصاصة فنية‬
 close=‫إغلاق‬

war/resources/dia_bg.txt

@@ -79,7 +79,6 @@ center=Центриране
 cannotLoad=Опитите за качване са неуспешни. Моля опитайте отново по-късно.
 cannotLogin=Опитите за качване са неуспешни. Моля опитайте отново по-късно.
 cannotOpenFile=Файлът не може да бъде отворен
-cardName=Card Name
 change=Промяна
 changeOrientation=Промяна на ориентацията
 changeUser=Промяна на потребител
@@ -100,7 +99,6 @@ circle=Кръг
 cisco=Cisco
 classic=Класически
 clearDefaultStyle=Изчистване на стила по подразбиране
-clearFilter=Clear Filter
 clearWaypoints=Изчистване на ориентирите
 clipart=Клипарт
 close=Затваряне

war/resources/dia_bn.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_bs.txt

@@ -79,7 +79,6 @@ center=Centar
 cannotLoad=Pokušaji učitavanja nisu uspjeli. Molimo pokušajte ponovo kasnije.
 cannotLogin=Pokušaji prijave nisu uspjeli. Molimo pokušajte ponovo kasnije.
 cannotOpenFile=Fajl se ne može otvoriti.
-cardName=Card Name
 change=Promijeni
 changeOrientation=Promijeni orijentaciju
 changeUser=Promijeni korisnika
@@ -100,7 +99,6 @@ circle=Krug
 cisco=Cisco
 classic=Klasičan
 clearDefaultStyle=Očisti osnovni stil
-clearFilter=Clear Filter
 clearWaypoints=Očisti međutačke
 clipart=Klip art
 close=Zatvori

war/resources/dia_ca.txt

@@ -79,7 +79,6 @@ center=Centra
 cannotLoad=La càrrega ha fallat. Si us plau, torna a intentar-ho més tard.
 cannotLogin=L'inici de sessió ha fallat. Si us plau, torna a intentar-ho més tard.
 cannotOpenFile=No es pot obrir el fitxer
-cardName=Card Name
 change=Canvia
 changeOrientation=Canvia l'orientació
 changeUser=Canvia d'usuari
@@ -100,7 +99,6 @@ circle=Cercle
 cisco=Cisco
 classic=Clàssic
 clearDefaultStyle=Esborra l'estil predeterminat
-clearFilter=Clear Filter
 clearWaypoints=Esborra els waypoint
 clipart=Imatges predissenyades
 close=Tanca

war/resources/dia_cs.txt

@@ -79,7 +79,6 @@ center=Na střed
 cannotLoad=Pokus o načtení selhal. Prosím zkuste to znovu později.
 cannotLogin=Pokus o přihlášení selhal. Prosím zkuste to znovu později.
 cannotOpenFile=Nelze otevřít soubor
-cardName=Card Name
 change=Změnit 
 changeOrientation=Změnit orientaci
 changeUser=Změnit uživatele
@@ -100,7 +99,6 @@ circle=Kruh
 cisco=Cisco
 classic=Klasické
 clearDefaultStyle=Vymazat výchozí styl
-clearFilter=Clear Filter
 clearWaypoints=Vymazat waypoint
 clipart=Klipart
 close=Zavřít

war/resources/dia_da.txt

@@ -79,7 +79,6 @@ center=Centrer
 cannotLoad=Forsøg på indlæsning mislykkedes. Prøv igen senere.
 cannotLogin=Login-forsøg mislykkedes. Prøv igen senere.
 cannotOpenFile=Kan ikke åbne fil
-cardName=Card Name
 change=Skift
 changeOrientation=Skift Orientering
 changeUser=Skift bruger
@@ -100,7 +99,6 @@ circle=Cirkel
 cisco=Cisco
 classic=Klassisk
 clearDefaultStyle=Slet standardtypografi
-clearFilter=Clear Filter
 clearWaypoints=Slet støttepunkter
 clipart=Clipart
 close=Luk

war/resources/dia_de.txt

@@ -79,7 +79,6 @@ center=Zentriert
 cannotLoad=Ladeversuche fehlgeschlagen. Bitte versuchen Sie es später noch einmal.
 cannotLogin=Anmeldeversuche fehlgeschlagen. Bitte versuchen Sie es später noch einmal.
 cannotOpenFile=Kann Datei nicht öffnen
-cardName=Card Name
 change=Ändern
 changeOrientation=Orientierung ändern
 changeUser=Benutzer ändern
@@ -100,7 +99,6 @@ circle=Kreis
 cisco=Cisco
 classic=Klassisch
 clearDefaultStyle=Standardstyle löschen
-clearFilter=Clear Filter
 clearWaypoints=Wegpunkte löschen
 clipart=Clipart
 close=Schließen

war/resources/dia_el.txt

@@ -79,7 +79,6 @@ center=Κεντράρετε
 cannotLoad=Οι προσπάθειες φόρτωσης απέτυχαν. Παρακαλούμε, δοκιμάστε ξανά αργότερα. 
 cannotLogin=Οι προσπάθειες σύνδεσης απέτυχαν. Παρακαλούμε, δοκιμάστε ξανά αργότερα.
 cannotOpenFile=Το αρχείο δεν μπορεί να ανοίξει
-cardName=Card Name
 change=Αλλαγή
 changeOrientation=Αλλαγή Προσανατολισμού
 changeUser=Αλλαγή χρήστη
@@ -100,7 +99,6 @@ circle=Κύκλος
 cisco=Cisco
 classic=Κλασικό
 clearDefaultStyle=Καθαρισμός προεπιλεγμένης εμφάνισης
-clearFilter=Clear Filter
 clearWaypoints=Καθαρισμός σημείων αναφοράς
 clipart=Συλλογή εικόνων
 close=Κλείσιμο

war/resources/dia_eo.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_es.txt

@@ -79,7 +79,6 @@ center=Centrar
 cannotLoad=Los intentos de carga fallaron. Por favor, inténtelo nuevamente más tarde.
 cannotLogin=Los intentos de inicio de sesión fallaron. Por favor, inténtelo nuevamente más tarde.
 cannotOpenFile=No se puede abrir el archivo
-cardName=Card Name
 change=Cambiar
 changeOrientation=Cambiar orientación
 changeUser=Cambiar usuario
@@ -100,7 +99,6 @@ circle=Círculo
 cisco=Cisco
 classic=Clásico
 clearDefaultStyle=Quitar estilo predeterminado
-clearFilter=Clear Filter
 clearWaypoints=Quitar punto de referencia
 clipart=Clipart
 close=Cerrar

war/resources/dia_et.txt

@@ -79,7 +79,6 @@ center=Aseta keskele
 cannotLoad=Laadimine ebaõnnestus. Proovi hiljem uuesti.
 cannotLogin=Sisselogimine ebaõnnestus. Proovi hiljem uuesti.
 cannotOpenFile=Faili ei saa avada
-cardName=Card Name
 change=Muuda
 changeOrientation=Muuda suunda
 changeUser=Muuda kasutajat
@@ -100,7 +99,6 @@ circle=Ring
 cisco=Cisco
 classic=Klassikaline
 clearDefaultStyle=Tühjenda vaikestiil
-clearFilter=Clear Filter
 clearWaypoints=Tühjenda teepunktid
 clipart=Clipart
 close=Sulge

war/resources/dia_fa.txt

@@ -79,7 +79,6 @@ center=‫مرکز‬
 cannotLoad=‫تلاش برای بارگذاری اطلاعات موفق نبود. لطفا دوباره تلاش کنید.‬
 cannotLogin=‫تلاش برای وارد شدن موفق نبود. لطفا کمی دیرتر دوباره اقدام نمایید.‬
 cannotOpenFile=‫باز نمون فایل امکان‌پذیر نیست‬
-cardName=Card Name
 change=‫تغییر‬
 changeOrientation=‫تغییر جهت‬
 changeUser=‫تغییر کاربر‬
@@ -100,7 +99,6 @@ circle=‫حلقه‬
 cisco=Cisco
 classic=‫کلاسیک‬
 clearDefaultStyle=‫پاک‌نمودن استایل پیش‌فرض‬
-clearFilter=Clear Filter
 clearWaypoints=‫پاک‌ کردن نقطه مسیر‬
 clipart=Clipart
 close=‫بستن‬

war/resources/dia_fi.txt

@@ -79,7 +79,6 @@ center=Keskennä
 cannotLoad=Lataaminen epäonnistui. Ole hyvä ja yritä myöhemmin uudelleen. 
 cannotLogin=Sisäänkirjautuminen epäonnistui. Ole hyvä ja yritä myöhemmin uudelleen.
 cannotOpenFile=Tiedostoa ei voida avata
-cardName=Card Name
 change=Muuta
 changeOrientation=Vaihda suuntaa
 changeUser=Vaihda käyttäjää
@@ -100,7 +99,6 @@ circle=Ympyrä
 cisco=Cisco
 classic=Klassinen
 clearDefaultStyle=Poista oletystyyli
-clearFilter=Clear Filter
 clearWaypoints=Poista reittipisteet
 clipart=Clipart
 close=Sulje

war/resources/dia_fil.txt

@@ -79,7 +79,6 @@ center=I-sentro
 cannotLoad=Ang mga pagsubok sa pag-load ay nabigo.  Mangyaring subukan ulit mamaya.
 cannotLogin=Ang mga pagsubok sa pag- log in ay nabigo.  Paki subok ulit mamaya.
 cannotOpenFile=Hindi mabuksan ang file
-cardName=Card Name
 change=Baguhin
 changeOrientation=Baguhin ang oryentasyon
 changeUser=Magpalit ng gumagamit
@@ -100,7 +99,6 @@ circle=Bilog
 cisco=Cisco
 classic=Klasiko
 clearDefaultStyle=Alisin ang kusang laan na istilo
-clearFilter=Clear Filter
 clearWaypoints=Alisin ang mga Waypoint
 clipart=Clipart
 close=Isara

war/resources/dia_fr.txt

@@ -79,7 +79,6 @@ center=Centrer
 cannotLoad=Erreur lors du chargement. Merci de réessayer plus tard.
 cannotLogin=Erreur lors de la connexion. Merci de réessayer plus tard.
 cannotOpenFile=Impossible d'ouvrir le fichier
-cardName=Card Name
 change=Modifier
 changeOrientation=Modifier l’orientation
 changeUser=Modifier l'utilisateur
@@ -100,7 +99,6 @@ circle=Cercle
 cisco=Cisco
 classic=Classique
 clearDefaultStyle=Effacer la mise en forme par défaut
-clearFilter=Clear Filter
 clearWaypoints=Effacer les repères
 clipart=Clipart
 close=Fermer

war/resources/dia_gu.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_he.txt

@@ -79,7 +79,6 @@ center=‫מרכז‬
 cannotLoad=‫ניסיונות הטעינה נכשלו. אנא נסה שוב מאוחר יותר.‬
 cannotLogin=‫ניסיונות ההתחברות נכשלו. אנא נסה שוב מאוחר יותר.‬
 cannotOpenFile=‫לא ניתן לפתוח את הקובץ‬
-cardName=Card Name
 change=‫שנה‬
 changeOrientation=‫שנה אוריינטציה‬
 changeUser=‫שנה משתמש‬
@@ -100,7 +99,6 @@ circle=‫עיגול‬
 cisco=Cisco
 classic=‫קלאסי‬
 clearDefaultStyle=‫נקה סגנון ברירת המחדל‬
-clearFilter=Clear Filter
 clearWaypoints=‫נקה נקודות הציון‬
 clipart=‫קליפ ארט‬
 close=‫סגור‬

war/resources/dia_hi.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_hr.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_hu.txt

@@ -79,7 +79,6 @@ center=Közép
 cannotLoad=A betöltési próbálkozások sikertelenek. Kérjük próbálja ismét kesőbb...
 cannotLogin=A bejelentkezési próbálkozások sikertelenek. Kérjük próbálja ismét később...
 cannotOpenFile=Fájl nem nyitható
-cardName=Card Name
 change=Változtat
 changeOrientation=Irányultságváltoztatás
 changeUser=Felhasználó váltás
@@ -100,7 +99,6 @@ circle=Kör
 cisco=Cisco
 classic=Klasszikus
 clearDefaultStyle=Eredeti stílus visszaálítása
-clearFilter=Clear Filter
 clearWaypoints=Útpontok visszaállítása
 clipart=Felhasználható grafikus elemek
 close=Becsuk

war/resources/dia_i18n.txt

@@ -79,7 +79,6 @@ center=center
 cannotLoad=cannotLoad
 cannotLogin=cannotLogin
 cannotOpenFile=cannotOpenFile
-cardName=cardName
 change=change
 changeOrientation=changeOrientation
 changeUser=changeUser
@@ -100,7 +99,6 @@ circle=circle
 cisco=cisco
 classic=classic
 clearDefaultStyle=clearDefaultStyle
-clearFilter=clearFilter
 clearWaypoints=clearWaypoints
 clipart=clipart
 close=close

war/resources/dia_id.txt

@@ -79,7 +79,6 @@ center=Tengah
 cannotLoad=Upaya muat gagal. Harap coba lagi nanti.
 cannotLogin=Upaya login gagal. Harap coba lagi nanti.
 cannotOpenFile=Tidak dapat membuka berkas
-cardName=Card Name
 change=Ubah
 changeOrientation=Ubah Orientasi
 changeUser=Ubah pengguna
@@ -100,7 +99,6 @@ circle=Lingkaran
 cisco=Cisco
 classic=Klasik
 clearDefaultStyle=Hapus Gaya Default
-clearFilter=Clear Filter
 clearWaypoints=Hapus Waypoint
 clipart=Clipart
 close=Tutup

war/resources/dia_it.txt

@@ -79,7 +79,6 @@ center=Al centro
 cannotLoad=Tentativo di caricamento non riuscito. Per favore, riprova più tardi
 cannotLogin=Tentativo di login non riuscito. Per favore, riprova più tardi
 cannotOpenFile=Impossibile aprire il file
-cardName=Card Name
 change=Cambia  
 changeOrientation=Cambia orientamento
 changeUser=Cambia utente
@@ -100,7 +99,6 @@ circle=Cerchio
 cisco=Cisco
 classic=Classico
 clearDefaultStyle=Cancellare lo stile di default
-clearFilter=Clear Filter
 clearWaypoints=Cancellare i punti di passaggio
 clipart=Clipart
 close=Chiudi

war/resources/dia_ja.txt

@@ -79,7 +79,6 @@ center=中央揃え
 cannotLoad=ロードに失敗しました。しばらく後に再試行してください。
 cannotLogin=ログインに失敗しました。しばらく後に再試行してください。
 cannotOpenFile=ファイルを開けません
-cardName=Card Name
 change=変更する
 changeOrientation=向きを変更する
 changeUser=ユーザーを変更する
@@ -100,7 +99,6 @@ circle=円形
 cisco=シスコ
 classic=クラシック
 clearDefaultStyle=デフォルトスタイルをクリア
-clearFilter=Clear Filter
 clearWaypoints=途中点をクリア
 clipart=クリップアート
 close=閉じる

war/resources/dia_kn.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_ko.txt

@@ -79,7 +79,6 @@ center=가운데
 cannotLoad=불러오기에 실패하였습니다. 나중에 다시 시도하십시오.
 cannotLogin=로그인에 실패하였습니다. 나중에 다시 시도하십시오.
 cannotOpenFile=파일을 열 수 없습니다
-cardName=Card Name
 change=변경
 changeOrientation=방향 변경
 changeUser=사용자 변경
@@ -100,7 +99,6 @@ circle=원형
 cisco=시스코
 classic=기본적인
 clearDefaultStyle=기본 스타일 제거
-clearFilter=Clear Filter
 clearWaypoints=중간점 제거
 clipart=클립아트
 close=닫기

war/resources/dia_lt.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_lv.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_ml.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_mr.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_ms.txt

@@ -79,7 +79,6 @@ center=Tengah
 cannotLoad=Percubaan muatan gagal. Sila cuba semula sebentar lagi.
 cannotLogin=Percubaan daftar masuk gagal. Sila cuba semula sebentar lagi.
 cannotOpenFile=Tidak dapat membuka fail
-cardName=Card Name
 change=Tukar
 changeOrientation=Tukar Orientasi
 changeUser=Tukar pengguna
@@ -100,7 +99,6 @@ circle=Bulatan
 cisco=Cisco
 classic=Klasik
 clearDefaultStyle=Kosongkan Gaya Lalai
-clearFilter=Clear Filter
 clearWaypoints=Kosongkan Titik Arah
 clipart=Seni klip
 close=Tutup

war/resources/dia_nl.txt

@@ -79,7 +79,6 @@ center=Centreren
 cannotLoad=Pogingen tot laden mislukt. Probeer het later nog eens.
 cannotLogin=Pogingen tot inloggen mislukt. Probeer het later nog eens.
 cannotOpenFile=Kan bestand niet openen
-cardName=Naam kaart
 change=Wijzigen
 changeOrientation=Oriëntatie wijzigen
 changeUser=Gebruiker wijzigen
@@ -100,7 +99,6 @@ circle=Cirkel
 cisco=Cisco
 classic=Klassiek
 clearDefaultStyle=Standaardstijl wissen
-clearFilter=Filter wissen
 clearWaypoints=Tussenpunten wissen
 clipart=Clipart
 close=Sluiten

war/resources/dia_no.txt

@@ -79,7 +79,6 @@ center=Sentrer
 cannotLoad=Innlasting feilet. Vennligst prøv igjen senere.
 cannotLogin=Innlogging feilet. Vennligst prøv igjen senere.
 cannotOpenFile=Kan ikke åpne fil
-cardName=Card Name
 change=Endre
 changeOrientation=Endre retning
 changeUser=Endre bruker
@@ -100,7 +99,6 @@ circle=Sirkel
 cisco=Cisco
 classic=Klassisk
 clearDefaultStyle=Slett standardstil
-clearFilter=Clear Filter
 clearWaypoints=Slett støttepunkter
 clipart=Clipart
 close=Lukk

war/resources/dia_pl.txt

@@ -79,7 +79,6 @@ center=Do środka
 cannotLoad=Próba załadowania zakończona niepowodzeniem. Spróbuj później.
 cannotLogin=Próba logowania zakończona niepowodzeniem. Spróbuj później.
 cannotOpenFile=Nie można otworzyć pliku
-cardName=Card Name
 change=Zmień
 changeOrientation=Zmień orientację
 changeUser=Zmień użytkownika
@@ -100,7 +99,6 @@ circle=Okrąg
 cisco=Cisco
 classic=Klasyczny
 clearDefaultStyle=Wyczyść styl domyślny
-clearFilter=Clear Filter
 clearWaypoints=Wyczyść punkty trasy
 clipart=Clipart
 close=Zamknij

war/resources/dia_pt-br.txt

@@ -79,7 +79,6 @@ center=Centro
 cannotLoad=Falha na tentativa de carregar. Por favor, tente novamente mais tarde.
 cannotLogin=Falha na tentativa de login. Por favor, tente novamente mais tarde.
 cannotOpenFile=Não é possível abrir o arquivo
-cardName=Card Name
 change=Modificar
 changeOrientation=Modificar orientação
 changeUser=Modificar usuário
@@ -100,7 +99,6 @@ circle=Círculo
 cisco=Cisco
 classic=Clássica
 clearDefaultStyle=Limpar estilo padrão
-clearFilter=Clear Filter
 clearWaypoints=Limpar pontos de notificação
 clipart=Clipart
 close=Fechar 

war/resources/dia_pt.txt

@@ -79,7 +79,6 @@ center=Centrar
 cannotLoad=Ocorreu um erro ao tentar carregar. Por favor, tente novamente.
 cannotLogin=Ocorreu um erro ao iniciar sessão. Por favor, tente novamente.
 cannotOpenFile=Não é possível abrir o ficheiro
-cardName=Card Name
 change=Alterar
 changeOrientation=Alterar orientação
 changeUser=Alterar o usuário
@@ -100,7 +99,6 @@ circle=Círculo
 cisco=Cisco
 classic=Clássico
 clearDefaultStyle=Limpar estilo predefinido
-clearFilter=Clear Filter
 clearWaypoints=Limpar pontos de notificação
 clipart=Clipart
 close=Fechar 

war/resources/dia_ro.txt

@@ -79,7 +79,6 @@ center=Centrează
 cannotLoad=Încercarea de încărcare a eşuat. Te rugăm să încerci din nou mai târziu. 
 cannotLogin=Încercarea de logare a eşuat.Te rugăm să încerci mai târziu.
 cannotOpenFile=Fişierul nu se poate deschide
-cardName=Card Name
 change=Schimbă 
 changeOrientation=Schimbă orientarea
 changeUser=Schimbă utilizatorul
@@ -100,7 +99,6 @@ circle=Cerc
 cisco=Cisco
 classic=Clasic
 clearDefaultStyle=Ştergere stil predeterminat
-clearFilter=Clear Filter
 clearWaypoints=Ştergere repere
 clipart=Clip Art
 close=Închide

war/resources/dia_ru.txt

@@ -79,7 +79,6 @@ center=По центру
 cannotLoad=Загрузка не удалась. Пожалуйста, попробуйте позже.
 cannotLogin=Не удалось войти. Пожалуйста, попробуйте позже.
 cannotOpenFile=Невозможно открыть файл
-cardName=Card Name
 change=Изменить
 changeOrientation=Изменить ориентацию
 changeUser=Сменить пользователя
@@ -100,7 +99,6 @@ circle=Круг
 cisco=Cisco
 classic=Классический
 clearDefaultStyle=Очистить стиль по умолчанию
-clearFilter=Сбросить фильтр
 clearWaypoints=Очистить опорные точки
 clipart=Клипарт
 close=Закрыть

war/resources/dia_sk.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_sl.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_sr.txt

@@ -79,7 +79,6 @@ center=Centar
 cannotLoad=Pokušaji učitavanja neuspešni. Molimo vas pokušajte kasnije.
 cannotLogin=Pokušaji prijavljivanja su bili neuspešni. Molimo vas pokušajte kasnije.
 cannotOpenFile=Neuspešno otvaranje dokumenta
-cardName=Card Name
 change=Promeni
 changeOrientation=Promena orijentacije
 changeUser=Promena korisnika
@@ -100,7 +99,6 @@ circle=Krug
 cisco=Cisko
 classic=Klasičan
 clearDefaultStyle=Resetuj osnovni stil
-clearFilter=Clear Filter
 clearWaypoints=Resetuj međutačke
 clipart=Klip art
 close=Zatvori

war/resources/dia_sv.txt

@@ -79,7 +79,6 @@ center=Centrera
 cannotLoad=Laddningsförsök misslyckades. Vänligen försök igen senare.
 cannotLogin=Inloggningsförsök misslyckades. Vänligen försök igen senare.
 cannotOpenFile=Kan inte öppna fil
-cardName=Card Name
 change=Ändra
 changeOrientation=Ändra riktning
 changeUser=Ändra användare
@@ -100,7 +99,6 @@ circle=Cirkel
 cisco=Cisco
 classic=Klassisk
 clearDefaultStyle=Rensa standardstil
-clearFilter=Clear Filter
 clearWaypoints=Rensa brytpunkter
 clipart=Clipart
 close=Stäng

war/resources/dia_sw.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_ta.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_te.txt

@@ -79,7 +79,6 @@ center=Center
 cannotLoad=Load attempts failed. Please try again later.
 cannotLogin=Log in attempts failed. Please try again later.
 cannotOpenFile=Cannot open file
-cardName=Card Name
 change=Change
 changeOrientation=Change Orientation
 changeUser=Change user
@@ -100,7 +99,6 @@ circle=Circle
 cisco=Cisco
 classic=Classic
 clearDefaultStyle=Clear Default Style
-clearFilter=Clear Filter
 clearWaypoints=Clear Waypoints
 clipart=Clipart
 close=Close

war/resources/dia_th.txt

@@ -79,7 +79,6 @@ center=ตรงกลาง
 cannotLoad=โหลดไม่สำเร็จ กรุณาลองใหม่อีกครั้งภายหลัง
 cannotLogin=การเข้าใช้งานไม่สำเร็จ กรุณาลองใหม่อีกครั้งภายหลัง
 cannotOpenFile=ไม่สามารถเปิดไฟล์ได้
-cardName=Card Name
 change=เปลี่ยนแปลง
 changeOrientation=เปลี่ยนตำแหน่ง
 changeUser=เปลี่ยนผู้ใช้
@@ -100,7 +99,6 @@ circle=วงกลม
 cisco=ซิสโก้ 
 classic=คลาสสิค
 clearDefaultStyle=ล้างรูปแบบหลัก
-clearFilter=Clear Filter
 clearWaypoints=ล้างการวางตำแหน่ง
 clipart=คลิปอาร์ท
 close=ปิด

war/resources/dia_tr.txt

@@ -79,7 +79,6 @@ center=Ortala
 cannotLoad=Yükleme girişimleri başarısız. Lütfen daha sonra tekrar deneyin.
 cannotLogin=Giriş girişimleri başarısız. Lütfen daha sonra tekrar deneyiniz.
 cannotOpenFile=Dosya açılamıyor
-cardName=Card Name
 change=Değiştir
 changeOrientation=Sayfa yönünü değiştir
 changeUser=Kullanıcıyı değiştir
@@ -100,7 +99,6 @@ circle=Çember
 cisco=Cisco
 classic=Klasik
 clearDefaultStyle=Varsayılan stili sil
-clearFilter=Clear Filter
 clearWaypoints=Ara noktaları sil 
 clipart=Küçük resim
 close=Kapat

war/resources/dia_uk.txt

@@ -79,7 +79,6 @@ center=По центру
 cannotLoad=Невдалі спроби завантаження. Будь ласка, спробуйте ще раз пізніше.
 cannotLogin=Невдалі спроби входу. Будь ласка, спробуйте ще раз пізніше. 
 cannotOpenFile=Неможливо відкрити файл
-cardName=Card Name
 change=Змінити
 changeOrientation=Змінити напрямок
 changeUser=Змінити користувача
@@ -100,7 +99,6 @@ circle=Коло
 cisco=Cisco
 classic=Класичний
 clearDefaultStyle=Очистити стиль за замовчуванням
-clearFilter=Clear Filter
 clearWaypoints=Очистити шляхові точки
 clipart=Кліпарт
 close=Закрити

war/resources/dia_vi.txt

@@ -79,7 +79,6 @@ center=Đưa vào giữa
 cannotLoad=Tải thất bại. Vui lòng thử lại sau.
 cannotLogin=Đăng nhập thất bại. Vui lòng thử lại sau.
 cannotOpenFile=Không thể mở tập tin
-cardName=Card Name
 change=Thay đổi
 changeOrientation=Đổi hướng
 changeUser=Đổi người dùng
@@ -100,7 +99,6 @@ circle=Vòng tròn
 cisco=Cisco
 classic=Cổ điển
 clearDefaultStyle=Xóa phong cách mặc định
-clearFilter=Clear Filter
 clearWaypoints=Xóa điểm tham chiếu
 clipart=Ảnh nghệ thuật
 close=Đóng

war/resources/dia_zh-tw.txt

@@ -79,7 +79,6 @@ center=置中
 cannotLoad=戴入失敗。請稍後重試。
 cannotLogin=登入失敗。請稍後重試。
 cannotOpenFile=無法開啟檔案
-cardName=Card Name
 change=變更
 changeOrientation=變更方向
 changeUser=變更使用者
@@ -100,7 +99,6 @@ circle=圓形
 cisco=思科
 classic=經典
 clearDefaultStyle=清除預設樣式
-clearFilter=Clear Filter
 clearWaypoints=清除航點
 clipart=剪貼畫
 close=關閉

war/resources/dia_zh.txt

@@ -79,7 +79,6 @@ center=居中
 cannotLoad=载入失败。请稍后重试。
 cannotLogin=登录失败。请稍后重试。
 cannotOpenFile=无法打开文件
-cardName=Card Name
 change=更改
 changeOrientation=改变方向
 changeUser=更改用户
@@ -100,7 +99,6 @@ circle=圆形
 cisco=思科
 classic=经典
 clearDefaultStyle=清除默认风格
-clearFilter=Clear Filter
 clearWaypoints=清除航点
 clipart=剪贴画
 close=关闭