CanadaMes.git - Gitblit

			@@ -1,6 +1,6 @@
			{

			"ip": "localhost",
			"Clear":"Clear",
			"ip":"192.168.10.21",
			"systemTitle": "Login System",
			"usernamePlaceholder": "Please enter username",
			"passwordPlaceholder": "Please enter password",
			@@ -303,7 +303,7 @@
			"current Information":"current information",
			"Modify Information":"Modify information",
			"Clear Current":"Clear Current",
			"Confirm Modification":"Confirm modification",
			"Confirm":"Confirm",
			"The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",
			"This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",
			"Outing Queue":"Outing Queue",
			@@ -344,6 +344,23 @@
			"Queue State":"Queue State",
			"Sorting State":"Sorting State",
			"Confirm State":"Confirm State",
			"Next":"Next",
			"Current Frame":"Current Frame",
			"Outside":"Outside",
			"Inside":"Inside",
			"Cancel":"Cancel",
			"Are you sure to clear this barcode ?":"Are you sure to clear this barcode ?",
			"Terminate Feeding":"Terminate Feeding",
			"Terminate Outing":"Terminate Outing",
			"SoftEmergencyStop":"SoftEmergencyStop",
			"Unable to clear glass ID in automatic mode":"Unable to clear glass ID in automatic mode",
			"Are you sure you want an emergency stop ?":"Are you sure you want an emergency stop ?",
			"Current State":"Current State",
			"Automatic":"Automatic",
			"Hand Movement":"Hand Movement",
			"Please enter the correct glassID":"Please enter the correct glassID",
			"Switch":"Switch",
			"This frame has glass that is currently outing":"This frame has glass that is currently outing",
			"ServoManualone": {
			"A01 所在格子": "A01 Current Grid",
			"数量": "Quantity",
			@@ -400,7 +417,8 @@
			"急停后中止/继续选择": "Abort/ResumeTasks",
			"A01终止/继续": "A01Abort/ResumeTasks",
			"A02终止/继续": "A02Abort/ResumeTasks",
			"存片等待延时": "Storage wait delay"
			"存片等待延时": "Storage wait delay",
			"软急停": "emgHMI"

			},
			"langPositioning1": {
			@@ -550,7 +568,8 @@
			"A02行走伺服回零":"A02 SERVE TRAVEL Home"
			},
			"A01行走伺服回零":"A01 SERVE TRAVEL Home",
			"A02行走伺服回零":"A02 SERVE TRAVEL Home"
			"A02行走伺服回零":"A02 SERVE TRAVEL Home",
			"Set":"Set"


			}