diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv
index 3f9080f6..98ceae5c 100644
--- a/inter/uae_dubai/menu/lang.tsv
+++ b/inter/uae_dubai/menu/lang.tsv
@@ -1018,7 +1018,7 @@ TextID	Note	English	arabic
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1031,7 +1031,7 @@ TextID	Note	English	arabic
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
index f19449d5..f7e37aa7 100644
--- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml
@@ -3469,7 +3469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6755,7 +6755,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -7023,7 +7023,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -7035,7 +7035,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -10311,7 +10311,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -14645,7 +14645,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -18219,7 +18219,7 @@
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
 		Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE"
-		Var NameLang[2][1] = "عصير الشاي التايلاندي والقهوة واللاتيه"
+		Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي"
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml
index e78174ed..516cee3e 100644
--- a/inter/uae_dubai/xml/page_catalog_group_health.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml
@@ -1828,7 +1828,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -2102,7 +2102,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "Iced MOCHA"
-		Var NameLang[1][1] = "موكا مثلجة"
+		Var NameLang[1][1] = "موكا مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -5384,7 +5384,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -5396,7 +5396,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -7040,7 +7040,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
-		Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج"
+		Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
diff --git a/inter/uae_dubai/xml/page_catalog_group_other.lxml b/inter/uae_dubai/xml/page_catalog_group_other.lxml
index e2837423..8a34b9cc 100644
--- a/inter/uae_dubai/xml/page_catalog_group_other.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_other.lxml
@@ -955,15 +955,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0062 53-05-03-0062 
+	; - 53-05-02-0062 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0062.Button,53-05-03-0062.Button,$Sum53050200625305030062) </State> 
+	<State> Flag( 53-05-02-0062.Button,$Sum5305020062) </State> 
 	<Button>
-	<State> $Sum53050200625305030062 </State> 
+	<State> $Sum5305020062 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Black.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Black.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" </FilenameDisable>
@@ -974,10 +974,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0062.Price
-		Var PriceD3 = $53-05-03-0062.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0062"
-		Var PD_CODE3 = "53-05-03-0062"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black"
 		Var aliasDesc[0] = "Pepsi Black, Ice"
@@ -1015,13 +1015,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI  Black Smoothie"
+		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Pepsi, Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -1030,7 +1030,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0062.Button
-		Var PD_STAGE_3 = $53-05-03-0062.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -1051,7 +1051,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0062"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -1144,7 +1144,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0062.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -1154,8 +1154,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0062.Button </State>
-	<Value> StringFmt(  $53-05-03-0062.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1180,10 +1180,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200625305030062 = "Disable" Then
+			If $Sum5305020062 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0062.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0062.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -1217,7 +1217,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200625305030062 </State> 
+	<State> $Sum5305020062 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
@@ -5870,7 +5870,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Pepsi, Banana Syrup& Ice"
-		Var DescLang[1][1] = "بيبسي، شراب موز و ثلج"
+		Var DescLang[1][1] = "بيبسي، شراب الموز والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -6085,15 +6085,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0074 53-05-03-0074 
+	; - 53-05-02-0074 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0074.Button,53-05-03-0074.Button,$Sum53050200745305030074) </State> 
+	<State> Flag( 53-05-02-0074.Button,$Sum5305020074) </State> 
 	<Button>
-	<State> $Sum53050200745305030074 </State> 
+	<State> $Sum5305020074 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_plum.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_plum.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_plum.png" </FilenameDisable>
@@ -6104,10 +6104,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0074.Price
-		Var PriceD3 = $53-05-03-0074.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0074"
-		Var PD_CODE3 = "53-05-03-0074"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black PLUM"
 		Var aliasDesc[0] = "Pepsi Black, Ume Syrup & Ice"
@@ -6145,13 +6145,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI Black PLUM Smoothie"
+		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Pepsi Black, Ume Syrup & Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -6160,7 +6160,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0074.Button
-		Var PD_STAGE_3 = $53-05-03-0074.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -6181,7 +6181,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0074"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6274,7 +6274,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0074.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -6284,8 +6284,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0074.Button </State>
-	<Value> StringFmt(  $53-05-03-0074.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6310,10 +6310,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200745305030074 = "Disable" Then
+			If $Sum5305020074 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0074.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0074.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -6347,7 +6347,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200745305030074 </State> 
+	<State> $Sum5305020074 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
@@ -6355,15 +6355,15 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; - 53-05-02-0075 53-05-03-0075 
+	; - 53-05-02-0075 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 53-05-02-0075.Button,53-05-03-0075.Button,$Sum53050200755305030075) </State> 
+	<State> Flag( 53-05-02-0075.Button,$Sum5305020075) </State> 
 	<Button>
-	<State> $Sum53050200755305030075 </State> 
+	<State> $Sum5305020075 </State> 
 	<Filename> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/inter/uae_dubai/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
@@ -6374,10 +6374,10 @@
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $53-05-02-0075.Price
-		Var PriceD3 = $53-05-03-0075.Price
+		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
 		Var PD_CODE2 = "53-05-02-0075"
-		Var PD_CODE3 = "53-05-03-0075"
+		Var PD_CODE3 = "##-##-##-####"
 		; begin lang 
 		Var aliasName[0] = "PEPSI Black MELON"
 		Var aliasDesc[0] = "Pepsi Black, Melon Syrup& Ice"
@@ -6415,13 +6415,13 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "PEPSI Black MELON Smoothie"
+		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
 		Var NameLang[2][3] = ""
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
-		Var DescLang[2][0] = "Pepsi Black, Melon Syrup& Ice"
+		Var DescLang[2][0] = ""
 		Var DescLang[2][1] = ""
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
@@ -6430,7 +6430,7 @@
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = $53-05-02-0075.Button
-		Var PD_STAGE_3 = $53-05-03-0075.Button
+		Var PD_STAGE_3 = "Disable2"
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -6451,7 +6451,7 @@
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
 			Else
-			Topping "Load" "53-05-03-0075"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		
@@ -6544,7 +6544,7 @@
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $53-05-03-0075.Button </State>
+	<State> "Invisible" </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -6554,8 +6554,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $53-05-03-0075.Button </State>
-	<Value> StringFmt(  $53-05-03-0075.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -6580,10 +6580,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum53050200755305030075 = "Disable" Then
+			If $Sum5305020075 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
 				STRCONTAIN "ERR" $53-05-02-0075.TAG tag2_is_disable
-				STRCONTAIN "ERR" $53-05-03-0075.TAG tag3_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -6617,7 +6617,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum53050200755305030075 </State> 
+	<State> $Sum5305020075 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
diff --git a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
index 0eea259f..ec288707 100644
--- a/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_recommend.lxml
@@ -6201,7 +6201,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -6469,7 +6469,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -6481,7 +6481,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
diff --git a/inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml b/inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml
index 432f9815..6242959e 100644
--- a/inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_recommend_multi_pro.lxml
@@ -5582,7 +5582,7 @@
 		Var DescLang[0][4] = ""
 		Var DescLang[0][5] = ""
 		Var NameLang[1][0] = "MANDARINE  \nIced AMERICANO"
-		Var NameLang[1][1] = "مندرين \nأمريكان مثلج"
+		Var NameLang[1][1] = "مندرين \nأمريكانو مثلج"
 		Var NameLang[1][2] = ""
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
@@ -5850,7 +5850,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -5862,7 +5862,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-		Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
+		Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
diff --git a/inter/uae_dubai/xml/page_catalog_group_tea.lxml b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
index aa6559c5..765fd7dd 100644
--- a/inter/uae_dubai/xml/page_catalog_group_tea.lxml
+++ b/inter/uae_dubai/xml/page_catalog_group_tea.lxml
@@ -2923,7 +2923,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[0][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[0][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -2935,7 +2935,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[1][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[1][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
@@ -2947,7 +2947,7 @@
 		Var NameLang[2][4] = ""
 		Var NameLang[2][5] = ""
 		Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
-		Var DescLang[2][1] = "الشاي التايلاندي والليمون والسكر والماء"
+		Var DescLang[2][1] = "شاي تايلاندي، ليمون، سكر وماء"
 		Var DescLang[2][2] = ""
 		Var DescLang[2][3] = ""
 		Var DescLang[2][4] = ""
@@ -11143,7 +11143,7 @@
 		Var NameLang[0][4] = ""
 		Var NameLang[0][5] = ""
 		Var DescLang[0][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[0][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[0][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[0][2] = ""
 		Var DescLang[0][3] = ""
 		Var DescLang[0][4] = ""
@@ -11155,7 +11155,7 @@
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
 		Var DescLang[1][0] = "Taiwan tea, Limenade, Water, and Ice"
-		Var DescLang[1][1] = "شاي تايوان، ليمون، ماء وثلج"
+		Var DescLang[1][1] = "شاي تايوان والليمون والماء والثلج"
 		Var DescLang[1][2] = ""
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""