CanadaMes.git - Gitblit

			@@ -227,8 +227,8 @@
			"deleteCancelledMessage": "Deletion cancelled",


			"Enter the glass lD":"Enter the glass lD",
			"Manually feed the glass":"Manually feed the glass",
			"Enter the glass barcode":"Enter the glass barcode",
			"Manually Infeed Glass":"Manually Infeed Glass",
			"Enter the order number":"Enter the order number",
			"Exit the glass by order number":"Exit the glass by order number",
			"Please confirm the glass information":"Please confirm the glass information",
			@@ -236,32 +236,30 @@
			"Alarm Information":"Alarm Information",
			"Cage Details":"Cage Details",
			"order":"order",
			"length":"length",
			"width":"width",
			"coating":"coating",
			"Length":"Length",
			"Width":"Width",
			"Operate":"Operate",
			"end task":"end task",
			"cancal":"cancal",
			"Terminate Task":"Terminate Task",
			"cancel":"cancel",
			"confirm":"confirm",
			"number":"number",
			"Coming out glass ID":"Coming out glass ID",
			"Incoming glass ID":"Incoming glass ID",
			"The Cage number being used":"The Cage number being used",
			"The Grille number being used":"The Grille number being used",
			"Order Nmuber":"Order Nmuber",
			"Length and width":"Length and width",
			"Number":"Number",
			"Outfeed glass barcode":"Outfeed glass barcode",
			"Infeed glass barcode":"Infeed glass barcode",
			"Cage No":"Cage No",
			"Slot No":"Slot No",
			"Dim":"Dim",
			"id":"id",
			"content":"content",
			"timeon":"timeon",
			"endTime":"endTime",

			"The Cage number":"The Cage number",
			"tier":"tier",
			"cell":"cell",
			"glassid":"glassid",
			"order number":"order number",
			"delete":"delete",
			"out":"out",
			"The Side":"The Side",
			"barcode":"barcode",
			"Order No":"Order No",
			"List No":"List No",
			"Box No":"Box No",
			"Delete":"Delete",
			"Out":"Out",

			"Operation successful":"Operation successful",
			"Operation canceled":"Operation canceled",
			@@ -272,18 +270,41 @@
			"No delete allowed":"No delete allowed",
			"No out allowed":"No out allowed",
			"Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
			"prompt":"prompt",
			"Yes":"Yes",
			<<<<<<< .mine
			"No":"No",
			"ElectricalPassword":"ElectricalPassword"



			=======
			"No":"No",
			"Please enter the password":"Please enter the password",
			"Password error":"Password error",
			"DataBase Connection failed":"DataBase Connection failed"
			>>>>>>> .theirs
			"DataBase Connection failed":"DataBase Connection failed",
			"Distribute parameters":"Distribute parameters",
			"The glass size is not within the range":"The glass size is not within the range",
			"Increase":"Increase",
			"Enable":"Enable",
			"Disable":"Disable",
			"Usage":"Usage",
			"Space (Pieces)":"Space (Pieces)",
			"This glass is already in the cage":"This glass is already in the cage",
			"Enter the Order No":"Enter the Order No",
			"OrderInfo":"OrderInfo",
			"Query":"Query",
			"permission update":"permission update",
			"query was successful":"query was successful",
			"Scan Code Point":"Scan Code Point",
			"Upper film position":"Upper film position",
			"Glass Information":"Glass Information",
			"current Information":"current information",
			"Modify Information":"Modify information",
			"Clear Current":"Clear Current",
			"Confirm Modification":"Confirm modification",
			"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",
			"Production queue":"Production queue",
			"Enter the Frame No":"Enter the Frame No",
			"Frame No":"Frame No",
			"Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
			"In the cage":"In the cage",
			"Flip":"Flip",
			"In the queue":"In the queue"

			}