diff --git a/image/event/pro_peach.png b/image/event/pro_peach.png index b2e47316..7dba8659 100644 Binary files a/image/event/pro_peach.png and b/image/event/pro_peach.png differ diff --git a/image/event/pro_peach_en.mp4 b/image/event/pro_peach_en.mp4 new file mode 100755 index 00000000..b2905600 Binary files /dev/null and b/image/event/pro_peach_en.mp4 differ diff --git a/image/event/pro_peach_th.mp4 b/image/event/pro_peach_th.mp4 new file mode 100755 index 00000000..1602db27 Binary files /dev/null and b/image/event/pro_peach_th.mp4 differ diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml index db647950..4d240104 100644 --- a/inter/aus/xml/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/page_catalog_group_coffee.lxml @@ -12848,7 +12848,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -12858,7 +12858,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -12868,7 +12868,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "CAFE LATTE SMOOTHIE" + Var NameLang[2][0] = "LATTE SMOOTHIE" Var NameLang[2][1] = "ลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -13114,7 +13114,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -13124,7 +13124,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -13134,7 +13134,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "CAFE LATTE SMOOTHIE" + Var NameLang[2][0] = "LATTE SMOOTHIE" Var NameLang[2][1] = "ลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -14720,7 +14720,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Sirap Karamel" - Var NameLang[1][0] = "Iced CARAMELCAFÉ LATTE" + Var NameLang[1][0] = "Iced CARAMEL COFFEE LATTE" Var NameLang[1][1] = "คาราเมลลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -14966,7 +14966,7 @@ Var PD_CODE2 = "51-01-02-0031" Var PD_CODE3 = "51-01-03-0031" ; begin lang - Var aliasName[0] = "MATCHA \nCAFÉ LATTE" + Var aliasName[0] = "MATCHA \nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Matcha, Milk" Var aliasName[1] = "กาแฟมัทฉะลาเต้" Var aliasDesc[1] = "กาแฟ นม ชาเขียวมัทฉะ \nและ นม" @@ -15053,9 +15053,9 @@ KanitMediumTTF 0x322B26 - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ กาแฟมัทฉะลาเต้ @@ -15232,7 +15232,7 @@ Var PD_CODE2 = "51-21-02-0031" Var PD_CODE3 = "51-21-03-0031" ; begin lang - Var aliasName[0] = "MATCHA \nCAFÉ LATTE" + Var aliasName[0] = "MATCHA \nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Matcha, Milk" Var aliasName[1] = "กาแฟมัทฉะลาเต้" Var aliasDesc[1] = "กาแฟ นม ชาเขียวมัทฉะ \nและ นม" @@ -15242,7 +15242,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHACAFÉ LATTE" + Var NameLang[0][0] = "Hot MATCHA COFFEE LATTE" Var NameLang[0][1] = "กาแฟ มัทฉะลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -15252,7 +15252,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Matcha, Susu" - Var NameLang[1][0] = "Iced MATCHACAFÉ LATTE" + Var NameLang[1][0] = "Iced MATCHA COFFEE LATTE" Var NameLang[1][1] = "กาแฟมัทฉะลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -15319,9 +15319,9 @@ KanitMediumTTF 0x322B26 - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ กาแฟมัทฉะลาเต้ @@ -15498,7 +15498,7 @@ Var PD_CODE2 = "51-01-02-0005" Var PD_CODE3 = "51-01-03-0005" ; begin lang - Var aliasName[0] = "MATCHA \nCAFÉ LATTE" + Var aliasName[0] = "MATCHA \nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Matcha, Milk" Var aliasName[1] = "กาแฟมัทฉะลาเต้" Var aliasDesc[1] = "กาแฟ นม ชาเขียวมัทฉะ \nและ นม" @@ -15585,9 +15585,9 @@ KanitMediumTTF 0x322B26 - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ กาแฟมัทฉะลาเต้ @@ -15764,7 +15764,7 @@ Var PD_CODE2 = "51-21-02-0005" Var PD_CODE3 = "51-21-03-0005" ; begin lang - Var aliasName[0] = "MATCHA \nCAFÉ LATTE" + Var aliasName[0] = "MATCHA \nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Matcha, Milk" Var aliasName[1] = "กาแฟมัทฉะลาเต้" Var aliasDesc[1] = "กาแฟ นม ชาเขียวมัทฉะ \nและ นม" @@ -15774,7 +15774,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHACAFÉ LATTE" + Var NameLang[0][0] = "Hot MATCHA COFFEE LATTE" Var NameLang[0][1] = "กาแฟ มัทฉะลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -15784,7 +15784,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Matcha, Susu" - Var NameLang[1][0] = "Iced MATCHACAFÉ LATTE" + Var NameLang[1][0] = "Iced MATCHA COFFEE LATTE" Var NameLang[1][1] = "กาแฟมัทฉะลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -15851,9 +15851,9 @@ KanitMediumTTF 0x322B26 - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ - MATCHA \nCAFÉ LATTE + MATCHA \nCOFFEE LATTE กาแฟมัทฉะลาเต้ กาแฟมัทฉะลาเต้ @@ -16562,7 +16562,7 @@ Var PD_CODE2 = "51-01-02-0039" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MELON\nCAFÉ LATTE" + Var aliasName[0] = "MELON\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Melon, Milk, Sugar" Var aliasName[1] = "กาแฟเมล่อนลาเต้" Var aliasDesc[1] = "กาแฟ เมล่อน น้ำตาล \nและ นม" @@ -16649,9 +16649,9 @@ KanitMediumTTF 0x322B26 - MELON\nCAFÉ LATTE + MELON\nCOFFEE LATTE กาแฟเมล่อนลาเต้ - MELON\nCAFÉ LATTE + MELON\nCOFFEE LATTE กาแฟเมล่อนลาเต้ กาแฟเมล่อนลาเต้ @@ -16828,7 +16828,7 @@ Var PD_CODE2 = "51-21-02-0039" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MELON\nCAFÉ LATTE" + Var aliasName[0] = "MELON\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Melon, Milk, Sugar" Var aliasName[1] = "กาแฟเมล่อนลาเต้" Var aliasDesc[1] = "กาแฟ เมล่อน น้ำตาล \nและ นม" @@ -16915,9 +16915,9 @@ KanitMediumTTF 0x322B26 - MELON\nCAFÉ LATTE + MELON\nCOFFEE LATTE กาแฟเมล่อนลาเต้ - MELON\nCAFÉ LATTE + MELON\nCOFFEE LATTE กาแฟเมล่อนลาเต้ กาแฟเมล่อนลาเต้ @@ -17390,7 +17390,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Teh Taiwan, Susu, Gula, Ais" - Var NameLang[2][0] = "TAIWANESE TEACAFÉ SMOOTHIE" + Var NameLang[2][0] = "TAIWANESE TEA COFFEE SMOOTHIE" Var NameLang[2][1] = "กาแฟชานมไต้หวันปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -17626,7 +17626,7 @@ Var PD_CODE2 = "51-01-02-0055" Var PD_CODE3 = "51-01-03-0055" ; begin lang - Var aliasName[0] = "THAI TEA\nCAFÉ LATTE" + Var aliasName[0] = "THAI TEA\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Thai tea, Milk, Sugar" Var aliasName[1] = "กาแฟชาไทย" Var aliasDesc[1] = "กาแฟ ชาไทย นม น้ำตาล" @@ -17713,9 +17713,9 @@ KanitMediumTTF 0x322B26 - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย กาแฟชาไทย @@ -17892,7 +17892,7 @@ Var PD_CODE2 = "51-21-02-0055" Var PD_CODE3 = "51-21-03-0055" ; begin lang - Var aliasName[0] = "THAI TEA\nCAFÉ LATTE" + Var aliasName[0] = "THAI TEA\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Thai tea, Milk, Sugar" Var aliasName[1] = "กาแฟชาไทย" Var aliasDesc[1] = "กาแฟ ชาไทย นม น้ำตาล" @@ -17979,9 +17979,9 @@ KanitMediumTTF 0x322B26 - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย กาแฟชาไทย @@ -18158,7 +18158,7 @@ Var PD_CODE2 = "51-01-02-0029" Var PD_CODE3 = "51-01-03-0029" ; begin lang - Var aliasName[0] = "THAI TEA\nCAFÉ LATTE" + Var aliasName[0] = "THAI TEA\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Thai tea, Milk, Sugar" Var aliasName[1] = "กาแฟชาไทย" Var aliasDesc[1] = "กาแฟ ชาไทย นม น้ำตาล" @@ -18245,9 +18245,9 @@ KanitMediumTTF 0x322B26 - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย กาแฟชาไทย @@ -18424,7 +18424,7 @@ Var PD_CODE2 = "51-21-02-0029" Var PD_CODE3 = "51-21-03-0029" ; begin lang - Var aliasName[0] = "THAI TEA\nCAFÉ LATTE" + Var aliasName[0] = "THAI TEA\nCOFFEE LATTE" Var aliasDesc[0] = "Espresso, Thai tea, Milk, Sugar" Var aliasName[1] = "กาแฟชาไทย" Var aliasDesc[1] = "กาแฟ ชาไทย นม น้ำตาล" @@ -18434,7 +18434,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot THAI TEACAFÉ LATTE" + Var NameLang[0][0] = "Hot THAI TEA COFFEE LATTE" Var NameLang[0][1] = "กาแฟชาไทยร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -18444,7 +18444,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Teh Thai, Susu, Gula" - Var NameLang[1][0] = "Iced THAI TEACAFÉ LATTE" + Var NameLang[1][0] = "Iced THAI TEA COFFEE LATTE" Var NameLang[1][1] = "กาแฟชาไทยเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -18454,7 +18454,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Teh Thai, Susu, Gula, Ais" - Var NameLang[2][0] = "THAI TEA CAFÉ SMOOTHIE" + Var NameLang[2][0] = "THAI TEA COFFEE SMOOTHIE" Var NameLang[2][1] = "กาแฟชาไทยปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -18511,9 +18511,9 @@ KanitMediumTTF 0x322B26 - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย - THAI TEA\nCAFÉ LATTE + THAI TEA\nCOFFEE LATTE กาแฟชาไทย กาแฟชาไทย @@ -20286,7 +20286,7 @@ Var PD_CODE2 = "51-21-02-0057" Var PD_CODE3 = "51-21-03-0057" ; begin lang - Var aliasName[0] = "MINT ESPRESSO LATTE" + Var aliasName[0] = "MINT ESPRESSO\nLATTE" Var aliasDesc[0] = "Espresso, Mint Syrup,\nSugar, Milk" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -20373,9 +20373,9 @@ KanitMediumTTF 0x322B26 - MINT ESPRESSO LATTE + MINT ESPRESSO\nLATTE - MINT ESPRESSO LATTE + MINT ESPRESSO\nLATTE diff --git a/inter/aus/xml/page_catalog_group_forkid.lxml b/inter/aus/xml/page_catalog_group_forkid.lxml index 6a8b3773..e2983b94 100644 --- a/inter/aus/xml/page_catalog_group_forkid.lxml +++ b/inter/aus/xml/page_catalog_group_forkid.lxml @@ -3054,7 +3054,7 @@ Var PD_CODE2 = "51-05-02-0041" Var PD_CODE3 = "51-05-03-0041" ; begin lang - Var aliasName[0] = "STRAWBERRY SODA" + Var aliasName[0] = "SPARKLING STRAWBERRY" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -3074,7 +3074,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced STRAWBERRY SODA" + Var NameLang[1][0] = "Iced SPARKLING STRAWBERRY" Var NameLang[1][1] = "สตอเบอร์รี่โซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3084,7 +3084,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Sirap Strawberi, Soda, Ais" - Var NameLang[2][0] = "STRAWBERRY SODA SMOOTHIE" + Var NameLang[2][0] = "SPARKLING STRAWBERRY SMOOTHIE" Var NameLang[2][1] = "สตอเบอร์รี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -3141,9 +3141,9 @@ KanitMediumTTF 0x322B26 - STRAWBERRY SODA + SPARKLING STRAWBERRY สตอเบอร์รี่โซดา - STRAWBERRY SODA + SPARKLING STRAWBERRY สตอเบอร์รี่โซดา สตอเบอร์รี่โซดา @@ -3578,7 +3578,7 @@ Var PD_CODE2 = "51-05-02-0044" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MELON SODA" + Var aliasName[0] = "SPARKLING MELON" Var aliasDesc[0] = "Melon Syrup, Soda, Ice" Var aliasName[1] = "เมล่อนโซดา" Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" @@ -3598,7 +3598,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "MELON SODA" + Var NameLang[1][0] = "SPARKLING MELON" Var NameLang[1][1] = "เมล่อนโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3665,9 +3665,9 @@ KanitMediumTTF 0x322B26 - MELON SODA + SPARKLING MELON เมล่อนโซดา - MELON SODA + SPARKLING MELON เมล่อนโซดา เมล่อนโซดา @@ -3840,7 +3840,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZU SODA" + Var aliasName[0] = "SPARKING YUZU" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -3860,7 +3860,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "YUZU SODA" + Var NameLang[1][0] = "SPARKLING YUZU" Var NameLang[1][1] = "ยูซุโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3927,9 +3927,9 @@ KanitMediumTTF 0x322B26 - YUZU SODA + SPARKING YUZU ยูซุโซดา - YUZU SODA + SPARKING YUZU ยูซุโซดา ยูซุโซดา diff --git a/inter/aus/xml/page_catalog_group_health.lxml b/inter/aus/xml/page_catalog_group_health.lxml index 220edff5..c89b5dee 100644 --- a/inter/aus/xml/page_catalog_group_health.lxml +++ b/inter/aus/xml/page_catalog_group_health.lxml @@ -1195,7 +1195,7 @@ Var PD_CODE2 = "51-01-02-1002" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "CAFE' LATTE" + Var aliasName[0] = "LATTE" Var aliasDesc[0] = "Espresso, Milk,\nFoamed milk" Var aliasName[1] = "ลาเต้" Var aliasDesc[1] = "กาแฟ นม และ ฟองนม" @@ -1205,7 +1205,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1215,7 +1215,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1282,9 +1282,9 @@ KanitMediumTTF 0x322B26 - CAFE' LATTE + LATTE ลาเต้ - CAFE' LATTE + LATTE ลาเต้ ลาเต้ @@ -1461,7 +1461,7 @@ Var PD_CODE2 = "51-21-02-1002" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "CAFE' LATTE" + Var aliasName[0] = "LATTE" Var aliasDesc[0] = "Espresso, Milk,\nFoamed milk" Var aliasName[1] = "ลาเต้" Var aliasDesc[1] = "กาแฟ นม และ ฟองนม" @@ -1471,7 +1471,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1481,7 +1481,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1548,9 +1548,9 @@ KanitMediumTTF 0x322B26 - CAFE' LATTE + LATTE ลาเต้ - CAFE' LATTE + LATTE ลาเต้ ลาเต้ @@ -3323,7 +3323,7 @@ Var PD_CODE2 = "51-02-02-1025" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "TAIWANESE \nMILK TEA" + Var aliasName[0] = "MILK TEA" Var aliasDesc[0] = "Taiwanese Tea, Sugar, \nand Milk" Var aliasName[1] = "ชานมไต้หวัน" Var aliasDesc[1] = "ชาไต้หวัน และ นมอุ่น" @@ -3333,7 +3333,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEA" + Var NameLang[0][0] = "Hot MILK TEA" Var NameLang[0][1] = "ชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -3343,7 +3343,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Gula, Susu" - Var NameLang[1][0] = "Iced TAIWANESE TEA" + Var NameLang[1][0] = "Iced MILK TEA" Var NameLang[1][1] = "ชานมไต้หวัน" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3410,9 +3410,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE \nMILK TEA + MILK TEA ชานมไต้หวัน - TAIWANESE \nMILK TEA + MILK TEA ชานมไต้หวัน ชานมไต้หวัน @@ -4121,7 +4121,7 @@ Var PD_CODE2 = "51-02-02-1027" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MATCHA" + Var aliasName[0] = "MATCHA TEA" Var aliasDesc[0] = "Matcha and Hot water" Var aliasName[1] = "ชาเขียวญี่ปุ่น" Var aliasDesc[1] = "ชาเชียว และน้ำ" @@ -4131,7 +4131,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHA" + Var NameLang[0][0] = "Hot MATCHA TEA" Var NameLang[0][1] = "ชาเขียวญี่ปุ่นร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -4141,7 +4141,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Matcha, Air Panas" - Var NameLang[1][0] = "Iced MATCHA" + Var NameLang[1][0] = "Iced MATCHA TEA" Var NameLang[1][1] = "ชาเขียวญี่ปุ่นเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -4208,9 +4208,9 @@ KanitMediumTTF 0x322B26 - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น ชาเขียวญี่ปุ่น @@ -4919,7 +4919,7 @@ Var PD_CODE2 = "51-02-02-1031" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "TAIWANESE TEA" + Var aliasName[0] = "BLACK TEA" Var aliasDesc[0] = "Taiwan tea, Water, and Ice" Var aliasName[1] = "ชาดำไต้หวัน" Var aliasDesc[1] = "ชาอู่หลงไต้หวัน น้ำ" @@ -4929,7 +4929,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEA" + Var NameLang[0][0] = "Hot BLACK TEA" Var NameLang[0][1] = "ชาดำไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -4939,7 +4939,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Air, Ais" - Var NameLang[1][0] = "Iced TAIWANESE TEA" + Var NameLang[1][0] = "Iced BLACK TEA" Var NameLang[1][1] = "ชาดำไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -5006,9 +5006,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA + BLACK TEA ชาดำไต้หวัน - TAIWANESE TEA + BLACK TEA ชาดำไต้หวัน ชาดำไต้หวัน @@ -6781,7 +6781,7 @@ Var PD_CODE2 = "51-02-02-1040" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "BLACK TEA LIMENADE" + Var aliasName[0] = "LIME BLACK TEA" Var aliasDesc[0] = "Thai tea, Limenade and Water" Var aliasName[1] = "ชาดำมะนาว" Var aliasDesc[1] = "ชาไทย ผงมะนาว และน้ำ" @@ -6791,7 +6791,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot BLACK TEA LIMENADE" + Var NameLang[0][0] = "Hot LIME BLACK TEA" Var NameLang[0][1] = "ชาดำมะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -6801,7 +6801,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Thai, Limau, Air" - Var NameLang[1][0] = "Iced BLACK TEA LIMENADE" + Var NameLang[1][0] = "Iced LIME BLACK TEA" Var NameLang[1][1] = "ชาดำมะนาวเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -6868,9 +6868,9 @@ KanitMediumTTF 0x322B26 - BLACK TEA LIMENADE + LIME BLACK TEA ชาดำมะนาว - BLACK TEA LIMENADE + LIME BLACK TEA ชาดำมะนาว ชาดำมะนาว @@ -7047,7 +7047,7 @@ Var PD_CODE2 = "51-05-02-1001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "HOT LIMENADE" + Var aliasName[0] = "THAI LIME TEA" Var aliasDesc[0] = "Limenade, Sugar" Var aliasName[1] = "น้ำมะนาว" Var aliasDesc[1] = "น้ำมะนาว น้ำตาล" @@ -7057,7 +7057,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot LIMENADE" + Var NameLang[0][0] = "LIME TEA" Var NameLang[0][1] = "น้ำมะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -7067,7 +7067,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Limau, Gula" - Var NameLang[1][0] = "Iced LIMENADE" + Var NameLang[1][0] = "Iced LIME TEA" Var NameLang[1][1] = "น้ำมะนาวเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -7134,9 +7134,9 @@ KanitMediumTTF 0x322B26 - HOT LIMENADE + THAI LIME TEA น้ำมะนาว - HOT LIMENADE + THAI LIME TEA น้ำมะนาว น้ำมะนาว @@ -7333,7 +7333,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced LIMENADE SODA" + Var NameLang[1][0] = "Iced SPARKLING LIMENADE" Var NameLang[1][1] = "น้ำมะนาวโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index 562bb00e..e66f129e 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -1451,7 +1451,7 @@ Var PD_CODE2 = "51-05-02-0044" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MELON SODA" + Var aliasName[0] = "SPARKLING MELON" Var aliasDesc[0] = "Melon Syrup, Soda, Ice" Var aliasName[1] = "เมล่อนโซดา" Var aliasDesc[1] = "น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง" @@ -1471,7 +1471,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "MELON SODA" + Var NameLang[1][0] = "SPARKLING MELON" Var NameLang[1][1] = "เมล่อนโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1538,9 +1538,9 @@ KanitMediumTTF 0x322B26 - MELON SODA + SPARKLING MELON เมล่อนโซดา - MELON SODA + SPARKLING MELON เมล่อนโซดา เมล่อนโซดา @@ -1713,7 +1713,7 @@ Var PD_CODE2 = "51-05-02-0045" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZU SODA" + Var aliasName[0] = "SPARKING YUZU" Var aliasDesc[0] = "Yuzu Syrup, Soda, Ice" Var aliasName[1] = "ยูซุโซดา" Var aliasDesc[1] = "น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง" @@ -1733,7 +1733,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "YUZU SODA" + Var NameLang[1][0] = "SPARKLING YUZU" Var NameLang[1][1] = "ยูซุโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -1800,9 +1800,9 @@ KanitMediumTTF 0x322B26 - YUZU SODA + SPARKING YUZU ยูซุโซดา - YUZU SODA + SPARKING YUZU ยูซุโซดา ยูซุโซดา @@ -1975,7 +1975,7 @@ Var PD_CODE2 = "51-05-02-0010" Var PD_CODE3 = "51-05-03-0010" ; begin lang - Var aliasName[0] = "LIMENADE \nSODA" + Var aliasName[0] = "LIMENADE SODA" Var aliasDesc[0] = "Limenade, Sugar, Soda & Ice" Var aliasName[1] = "น้ำมะนาวโซดา" Var aliasDesc[1] = "มะนาว โซดา" @@ -1995,7 +1995,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced LIMENADE SODA" + Var NameLang[1][0] = "Iced SPARKLING LIMENADE" Var NameLang[1][1] = "น้ำมะนาวโซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -2005,7 +2005,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Limau, Gula, Soda, Ais" - Var NameLang[2][0] = "LIMENADE SODA SMOOTHIE" + Var NameLang[2][0] = "SPARKLING LIMENADE SMOOTHIE" Var NameLang[2][1] = "น้ำมะนาวโซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -2062,9 +2062,9 @@ KanitMediumTTF 0x322B26 - LIMENADE \nSODA + LIMENADE SODA น้ำมะนาวโซดา - LIMENADE \nSODA + LIMENADE SODA น้ำมะนาวโซดา น้ำมะนาวโซดา @@ -2237,7 +2237,7 @@ Var PD_CODE2 = "51-05-02-0033" Var PD_CODE3 = "51-05-03-0033" ; begin lang - Var aliasName[0] = "LYCHEE SODA" + Var aliasName[0] = "SPARKLING LYCHEE" Var aliasDesc[0] = "Lychee Syrup, Soda & Ice" Var aliasName[1] = "น้ำลิ้นจี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมลิ้นจี่ โซดา" @@ -2267,7 +2267,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Laici, Gula, Soda, Ais" - Var NameLang[2][0] = "LYCHEE SODA SMOOTHIE" + Var NameLang[2][0] = "SPARKLING LYCHEE SMOOTHIE" Var NameLang[2][1] = "น้ำลิ้นจี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -2324,9 +2324,9 @@ KanitMediumTTF 0x322B26 - LYCHEE SODA + SPARKLING LYCHEE น้ำลิ้นจี่โซดา - LYCHEE SODA + SPARKLING LYCHEE น้ำลิ้นจี่โซดา น้ำลิ้นจี่โซดา @@ -2761,7 +2761,7 @@ Var PD_CODE2 = "51-05-02-0012" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "STRAWBERRY SODA" + Var aliasName[0] = "SPARKLING\nSTRAWBERRY" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -2781,7 +2781,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced STRAWBERRY SODA" + Var NameLang[1][0] = "Iced SPARKLING STRAWBERRY" Var NameLang[1][1] = "สตอเบอร์รี่โซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -2848,9 +2848,9 @@ KanitMediumTTF 0x322B26 - STRAWBERRY SODA + SPARKLING\nSTRAWBERRY สตอเบอร์รี่โซดา - STRAWBERRY SODA + SPARKLING\nSTRAWBERRY สตอเบอร์รี่โซดา สตอเบอร์รี่โซดา @@ -3023,7 +3023,7 @@ Var PD_CODE2 = "51-05-02-0041" Var PD_CODE3 = "51-05-03-0041" ; begin lang - Var aliasName[0] = "STRAWBERRY SODA" + Var aliasName[0] = "SPARKLING\nSTRAWBERRY" Var aliasDesc[0] = "Strawberry Syrup, Soda & Ice" Var aliasName[1] = "สตอเบอร์รี่โซดา" Var aliasDesc[1] = "น้ำเชื่อมสตอเบอร์รี่ โซดา" @@ -3043,7 +3043,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "Iced STRAWBERRY SODA" + Var NameLang[1][0] = "Iced SPARKLING STRAWBERRY" Var NameLang[1][1] = "สตอเบอร์รี่โซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -3053,7 +3053,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Sirap Strawberi, Soda, Ais" - Var NameLang[2][0] = "STRAWBERRY SODA SMOOTHIE" + Var NameLang[2][0] = "SPARKLING STRAWBERRY SMOOTHIE" Var NameLang[2][1] = "สตอเบอร์รี่โซดาปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -3110,9 +3110,9 @@ KanitMediumTTF 0x322B26 - STRAWBERRY SODA + SPARKLING\nSTRAWBERRY สตอเบอร์รี่โซดา - STRAWBERRY SODA + SPARKLING\nSTRAWBERRY สตอเบอร์รี่โซดา สตอเบอร์รี่โซดา @@ -7477,7 +7477,7 @@ Var PD_CODE2 = "51-05-02-0060" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MINT LIME SODA" + Var aliasName[0] = "LIME & MINT\nSPARKLING" Var aliasDesc[0] = "Mint Syrup, Lime, Soda & Ice" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -7497,7 +7497,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "MINT LIME SODA" + Var NameLang[1][0] = "LIME & MINT SPARKLING" Var NameLang[1][1] = "มินต์มะนาวโซดา" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -7564,9 +7564,9 @@ KanitMediumTTF 0x322B26 - MINT LIME SODA + LIME & MINT\nSPARKLING - MINT LIME SODA + LIME & MINT\nSPARKLING @@ -7739,7 +7739,7 @@ Var PD_CODE2 = "51-05-02-0063" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "STRAWBERRY\nMINT SODA" + Var aliasName[0] = "STRAWBERRY & MINT\nSPARKLING" Var aliasDesc[0] = "Mint Syrup, Strawberry Syrup, Lime, Soda & Ice" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -7759,7 +7759,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "STRAWBERRY MINT SODA" + Var NameLang[1][0] = "STRAWBERRY & MINT SPARKLING" Var NameLang[1][1] = "สตรอเบอร์รี่มินต์โซดา" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -7826,9 +7826,9 @@ KanitMediumTTF 0x322B26 - STRAWBERRY\nMINT SODA + STRAWBERRY & MINT\nSPARKLING - STRAWBERRY\nMINT SODA + STRAWBERRY & MINT\nSPARKLING @@ -8001,7 +8001,7 @@ Var PD_CODE2 = "51-05-02-0064" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZU MINT SODA" + Var aliasName[0] = "YUZU & MINT\nSPARKLING" Var aliasDesc[0] = "Mint Syrup, Yuzu Syrup Soda & Ice" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -8021,7 +8021,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "YUZU MINT SODA" + Var NameLang[1][0] = "YUZU & MINT SPARKLING" Var NameLang[1][1] = "ยูซุมินต์โซดา" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -8088,9 +8088,9 @@ KanitMediumTTF 0x322B26 - YUZU MINT SODA + YUZU & MINT\nSPARKLING - YUZU MINT SODA + YUZU & MINT\nSPARKLING @@ -8525,7 +8525,7 @@ Var PD_CODE2 = "51-05-02-0066" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "MINT LYCHEE\nLEMON SODA" + Var aliasName[0] = "LYCHEE & MINT\nSPARKLING" Var aliasDesc[0] = "Mint Syrup,Lychee Syrup, Lime, Soda & Ice" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -8545,7 +8545,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "MINT LYCHEE LEMON SODA" + Var NameLang[1][0] = "LYCHEE & MINT SPARKLING" Var NameLang[1][1] = "มินต์ลิ้นจี่มะนาวโซดา" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -8612,9 +8612,9 @@ KanitMediumTTF 0x322B26 - MINT LYCHEE\nLEMON SODA + LYCHEE & MINT\nSPARKLING - MINT LYCHEE\nLEMON SODA + LYCHEE & MINT\nSPARKLING @@ -9311,7 +9311,7 @@ Var PD_CODE2 = "51-05-02-0014" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "SODA" + Var aliasName[0] = "SPARKLING WATER" Var aliasDesc[0] = "Soda" Var aliasName[1] = "โซดา" Var aliasDesc[1] = "โซดา" @@ -9331,7 +9331,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "SODA" + Var NameLang[1][0] = "SPARKLING WATER" Var NameLang[1][1] = "โซดา" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -9398,9 +9398,9 @@ KanitMediumTTF 0x322B26 - SODA + SPARKLING WATER โซดา - SODA + SPARKLING WATER โซดา โซดา @@ -9573,7 +9573,7 @@ Var PD_CODE2 = "51-05-02-0015" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "ICE & SODA" + Var aliasName[0] = "ICE SPARKLING WATER" Var aliasDesc[0] = "Soda & Ice" Var aliasName[1] = "โซดาน้ำแข็ง" Var aliasDesc[1] = "โซดา" @@ -9593,7 +9593,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = "ICE SODA" + Var NameLang[1][0] = "ICE SPARKLING WATER" Var NameLang[1][1] = "โซดาน้ำแข็ง" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -9660,9 +9660,9 @@ KanitMediumTTF 0x322B26 - ICE & SODA + ICE SPARKLING WATER โซดาน้ำแข็ง - ICE & SODA + ICE SPARKLING WATER โซดาน้ำแข็ง โซดาน้ำแข็ง @@ -11155,7 +11155,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot LIMENADE" + Var NameLang[0][0] = "LIME TEA" Var NameLang[0][1] = "น้ำมะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml index d9e13145..ab42f231 100644 --- a/inter/aus/xml/page_catalog_group_recommend.lxml +++ b/inter/aus/xml/page_catalog_group_recommend.lxml @@ -7592,7 +7592,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -7602,7 +7602,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -7612,7 +7612,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "CAFE LATTE SMOOTHIE" + Var NameLang[2][0] = "LATTE SMOOTHIE" Var NameLang[2][1] = "ลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -7858,7 +7858,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot CAFE' LATTE" + Var NameLang[0][0] = "Hot LATTE" Var NameLang[0][1] = "ลาเต้ร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -7868,7 +7868,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Espresso, Susu, Susu Buih" - Var NameLang[1][0] = "Iced CAFE LATTE" + Var NameLang[1][0] = "Iced LATTE" Var NameLang[1][1] = "ลาเต้เย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -7878,7 +7878,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Espresso, Susu, Gula, Ais" - Var NameLang[2][0] = "CAFE LATTE SMOOTHIE" + Var NameLang[2][0] = "LATTE SMOOTHIE" Var NameLang[2][1] = "ลาเต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml index 152a11bd..af9cb86a 100644 --- a/inter/aus/xml/page_catalog_group_tea.lxml +++ b/inter/aus/xml/page_catalog_group_tea.lxml @@ -1732,7 +1732,7 @@ Var PD_CODE2 = "51-02-02-0007" Var PD_CODE3 = "51-02-03-0007" ; begin lang - Var aliasName[0] = "LIME TEA" + Var aliasName[0] = "THAI LIME TEA" Var aliasDesc[0] = "Thai Tea, Limenade, Sugar & Water" Var aliasName[1] = "ชามะนาว" Var aliasDesc[1] = "ชาไทย มะนาว" @@ -1742,7 +1742,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot LIME TEA" + Var NameLang[0][0] = "Hot THAI LIME TEA" Var NameLang[0][1] = "ชามะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -1819,9 +1819,9 @@ KanitMediumTTF 0x322B26 - LIME TEA + THAI LIME TEA ชามะนาว - LIME TEA + THAI LIME TEA ชามะนาว ชามะนาว @@ -2796,7 +2796,7 @@ Var PD_CODE2 = "51-02-02-0040" Var PD_CODE3 = "51-02-03-0040" ; begin lang - Var aliasName[0] = "LIME TEA" + Var aliasName[0] = "THAI LIME TEA" Var aliasDesc[0] = "Thai Tea, Limenade, Sugar & Water" Var aliasName[1] = "ชามะนาว" Var aliasDesc[1] = "ชาไทย มะนาว" @@ -2806,7 +2806,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot LIME TEA" + Var NameLang[0][0] = "Hot THAI LIME TEA" Var NameLang[0][1] = "ชามะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -2816,7 +2816,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Thai, Limau, Gula, Air" - Var NameLang[1][0] = "Iced LIME TEA" + Var NameLang[1][0] = "Iced THAI LIME TEA" Var NameLang[1][1] = "ชามะนาวเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -2826,7 +2826,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Teh Thai, Limau, Gula, Air" - Var NameLang[2][0] = "LIME TEA SMOOTHIE" + Var NameLang[2][0] = "THAI LIME TEA SMOOTHIE" Var NameLang[2][1] = "ชามะนาวปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -2883,9 +2883,9 @@ KanitMediumTTF 0x322B26 - LIME TEA + THAI LIME TEA ชามะนาว - LIME TEA + THAI LIME TEA ชามะนาว ชามะนาว @@ -4126,7 +4126,7 @@ Var PD_CODE2 = "51-02-02-0007" Var PD_CODE3 = "51-02-03-0007" ; begin lang - Var aliasName[0] = "LIME TEA" + Var aliasName[0] = "THAI LIME TEA" Var aliasDesc[0] = "Thai Tea, Limenade, Sugar & Water" Var aliasName[1] = "ชามะนาว" Var aliasDesc[1] = "ชาไทย มะนาว" @@ -4136,7 +4136,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot LIME TEA" + Var NameLang[0][0] = "Hot THAI LIME TEA" Var NameLang[0][1] = "ชามะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -4213,9 +4213,9 @@ KanitMediumTTF 0x322B26 - LIME TEA + THAI LIME TEA ชามะนาว - LIME TEA + THAI LIME TEA ชามะนาว ชามะนาว @@ -4658,7 +4658,7 @@ Var PD_CODE2 = "51-02-02-0027" Var PD_CODE3 = "51-02-03-0027" ; begin lang - Var aliasName[0] = "MATCHA" + Var aliasName[0] = "MATCHA TEA" Var aliasDesc[0] = "Matcha & Water" Var aliasName[1] = "ชาเขียวญี่ปุ่น" Var aliasDesc[1] = "ชาเชียว และน้ำ" @@ -4668,7 +4668,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHA" + Var NameLang[0][0] = "Hot MATCHA TEA" Var NameLang[0][1] = "ชาเขียวญี่ปุ่นร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -4678,7 +4678,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Matcha, Air" - Var NameLang[1][0] = "Iced MATCHA" + Var NameLang[1][0] = "Iced MATCHA TEA" Var NameLang[1][1] = "ชาเขียวญี่ปุ่นเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -4745,9 +4745,9 @@ KanitMediumTTF 0x322B26 - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น ชาเขียวญี่ปุ่น @@ -5190,7 +5190,7 @@ Var PD_CODE2 = "51-02-02-0011" Var PD_CODE3 = "51-02-03-0011" ; begin lang - Var aliasName[0] = "MATCHA" + Var aliasName[0] = "MATCHA TEA" Var aliasDesc[0] = "Matcha & Water" Var aliasName[1] = "ชาเขียวญี่ปุ่น" Var aliasDesc[1] = "ชาเชียว และน้ำ" @@ -5200,7 +5200,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHA" + Var NameLang[0][0] = "Hot MATCHA TEA" Var NameLang[0][1] = "ชาเขียวญี่ปุ่นร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -5210,7 +5210,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Matcha, Air" - Var NameLang[1][0] = "Iced MATCHA" + Var NameLang[1][0] = "Iced MATCHA TEA" Var NameLang[1][1] = "ชาเขียวญี่ปุ่นเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -5277,9 +5277,9 @@ KanitMediumTTF 0x322B26 - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น ชาเขียวญี่ปุ่น @@ -5456,7 +5456,7 @@ Var PD_CODE2 = "51-02-02-0025" Var PD_CODE3 = "51-02-03-0025" ; begin lang - Var aliasName[0] = "TAIWANESE TEA" + Var aliasName[0] = "MILK TEA" Var aliasDesc[0] = "Taiwanese Tea, Sugar, Milk" Var aliasName[1] = "ชานมไต้หวัน" Var aliasDesc[1] = "ชาไต้หวัน และ นมอุ่น" @@ -5466,7 +5466,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEA" + Var NameLang[0][0] = "Hot MILK TEA" Var NameLang[0][1] = "ชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -5476,7 +5476,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Gula, Susu" - Var NameLang[1][0] = "Iced TAIWANESE TEA" + Var NameLang[1][0] = "Iced MILK TEA" Var NameLang[1][1] = "ชานมไต้หวัน" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -5486,7 +5486,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Teh Taiwan, Susu, Gula, Ais" - Var NameLang[2][0] = "TAIWANESE TEA SMOOTHIE" + Var NameLang[2][0] = "MILK TEA SMOOTHIE" Var NameLang[2][1] = "ชานมไต้หวันปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -5543,9 +5543,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA + MILK TEA ชานมไต้หวัน - TAIWANESE TEA + MILK TEA ชานมไต้หวัน ชานมไต้หวัน @@ -6254,7 +6254,7 @@ Var PD_CODE2 = "51-02-02-0050" Var PD_CODE3 = "51-02-03-0050" ; begin lang - Var aliasName[0] = "MATCHA LATTE MINT" + Var aliasName[0] = "MINT MATCHA LATTE" Var aliasDesc[0] = "Matcha, Mint Syrup &Milk" Var aliasName[1] = "" Var aliasDesc[1] = "" @@ -6274,7 +6274,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" - Var NameLang[1][0] = " MATCHA LATTE MINT" + Var NameLang[1][0] = "MINT MATCHA LATTE" Var NameLang[1][1] = "มัทฉะลาเต้มินต์" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" @@ -6284,7 +6284,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" - Var NameLang[2][0] = " MATCHA LATTE MINT" + Var NameLang[2][0] = "MINT MATCHA LATTE" Var NameLang[2][1] = "มัทฉะลาเต้มินต์" Var NameLang[2][2] = "-" Var NameLang[2][3] = "-" @@ -6341,9 +6341,9 @@ KanitMediumTTF 0x322B26 - MATCHA LATTE MINT + MINT MATCHA LATTE - MATCHA LATTE MINT + MINT MATCHA LATTE @@ -6516,7 +6516,7 @@ Var PD_CODE2 = "51-02-02-0003" Var PD_CODE3 = "51-02-03-0003" ; begin lang - Var aliasName[0] = "TAIWANESE TEA" + Var aliasName[0] = "BLACK TEA" Var aliasDesc[0] = "Taiwan Tea, Milk, Sugar" Var aliasName[1] = "ชานมไต้หวัน" Var aliasDesc[1] = "ชาไต้หวัน นม" @@ -6526,7 +6526,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEA" + Var NameLang[0][0] = "Hot BLACK TEA" Var NameLang[0][1] = "ชานมไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -6536,7 +6536,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Susu, Gula" - Var NameLang[1][0] = "Iced TAIWANESE TEA" + Var NameLang[1][0] = "Iced BLACK TEA" Var NameLang[1][1] = "ชานมไต้หวัน" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -6546,7 +6546,7 @@ Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "Teh Taiwan, Susu, Gula, Ais" - Var NameLang[2][0] = "TAIWANESE TEA SMOOTHIE" + Var NameLang[2][0] = "BLACK TEA SMOOTHIE" Var NameLang[2][1] = "ชานมไต้ปั่น" Var NameLang[2][2] = "" Var NameLang[2][3] = "" @@ -6603,9 +6603,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE TEA + BLACK TEA ชานมไต้หวัน - TAIWANESE TEA + BLACK TEA ชานมไต้หวัน ชานมไต้หวัน @@ -7846,7 +7846,7 @@ Var PD_CODE2 = "51-02-02-0011" Var PD_CODE3 = "51-02-03-0011" ; begin lang - Var aliasName[0] = "MATCHA" + Var aliasName[0] = "MATCHA TEA" Var aliasDesc[0] = "Matcha & Water" Var aliasName[1] = "ชาเขียวญี่ปุ่น" Var aliasDesc[1] = "ชาเชียว และน้ำ" @@ -7856,7 +7856,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot MATCHA" + Var NameLang[0][0] = "Hot MATCHA TEA" Var NameLang[0][1] = "ชาเขียวญี่ปุ่นร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -7866,7 +7866,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Matcha, Air" - Var NameLang[1][0] = "Iced MATCHA" + Var NameLang[1][0] = "Iced MATCHA TEA" Var NameLang[1][1] = "ชาเขียวญี่ปุ่นเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -7933,9 +7933,9 @@ KanitMediumTTF 0x322B26 - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น - MATCHA + MATCHA TEA ชาเขียวญี่ปุ่น ชาเขียวญี่ปุ่น @@ -10506,7 +10506,7 @@ Var PD_CODE2 = "51-02-02-0031" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "TAIWANESE \n BLACK TEA" + Var aliasName[0] = "BLACK TEA" Var aliasDesc[0] = "Taiwanese tea, Water" Var aliasName[1] = "ชาดำไต้หวัน" Var aliasDesc[1] = "ชาไต้หวัน น้ำ" @@ -10516,7 +10516,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE TEA" + Var NameLang[0][0] = "Hot BLACK TEA" Var NameLang[0][1] = "ชาดำไต้หวันร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -10526,7 +10526,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Air, Ais" - Var NameLang[1][0] = "Iced TAIWANESE TEA" + Var NameLang[1][0] = "Iced BLACK TEA" Var NameLang[1][1] = "ชาดำไต้หวันเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -10593,9 +10593,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE \n BLACK TEA + BLACK TEA ชาดำไต้หวัน - TAIWANESE \n BLACK TEA + BLACK TEA ชาดำไต้หวัน ชาดำไต้หวัน @@ -10772,7 +10772,7 @@ Var PD_CODE2 = "51-02-02-0032" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "TAIWANESE \nLIME TEA" + Var aliasName[0] = "LIME BLACK TEA" Var aliasDesc[0] = "Taiwanese tea, Limenade, \nWater" Var aliasName[1] = "ชาดำไต้หวันมะนาว" Var aliasDesc[1] = "ชาไต้หวัน น้ำ มะนาว" @@ -10782,7 +10782,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot TAIWANESE LBLACK TEA" + Var NameLang[0][0] = "Hot LIME BLACK TEA" Var NameLang[0][1] = "ชาดำไต้หวันมะนาวร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -10792,7 +10792,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Teh Taiwan, Limau, Air, Ais" - Var NameLang[1][0] = "Iced TAIWANESE LIME TEA" + Var NameLang[1][0] = "Iced LIME BLACK TEA" Var NameLang[1][1] = "ชาดำไต้หวันมะนาวเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -10859,9 +10859,9 @@ KanitMediumTTF 0x322B26 - TAIWANESE \nLIME TEA + LIME BLACK TEA ชาดำไต้หวันมะนาว - TAIWANESE \nLIME TEA + LIME BLACK TEA ชาดำไต้หวันมะนาว ชาดำไต้หวันมะนาว @@ -11038,7 +11038,7 @@ Var PD_CODE2 = "51-02-02-0038" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "YUZU TEA" + Var aliasName[0] = "YUZU BLACK TEA" Var aliasDesc[0] = "Yuzu, Taiwanese tea, Water" Var aliasName[1] = "ชายูซุ" Var aliasDesc[1] = "ชาไต้หวัน น้ำเชื่อมยูซุ" @@ -11048,7 +11048,7 @@ Var aliasDesc[3] = "-" Var aliasName[4] = "" Var aliasDesc[4] = "" - Var NameLang[0][0] = "Hot Yuzu Tea" + Var NameLang[0][0] = "Hot Yuzu Black Tea" Var NameLang[0][1] = "ชายูซุร้อน" Var NameLang[0][2] = "" Var NameLang[0][3] = "" @@ -11058,7 +11058,7 @@ Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "Sirap Yuzu, Teh Taiwan" - Var NameLang[1][0] = "Iced Yuzu Tea" + Var NameLang[1][0] = "Iced Yuzu Black Tea" Var NameLang[1][1] = "ชายูซุเย็น" Var NameLang[1][2] = "" Var NameLang[1][3] = "" @@ -11125,9 +11125,9 @@ KanitMediumTTF 0x322B26 - YUZU TEA + YUZU BLACK TEA ชายูซุ - YUZU TEA + YUZU BLACK TEA ชายูซุ ชายูซุ diff --git a/xml/event/promotion_onclick1.inc b/xml/event/promotion_onclick1.inc index 023bd5fd..7b87917e 100644 --- a/xml/event/promotion_onclick1.inc +++ b/xml/event/promotion_onclick1.inc @@ -1 +1 @@ -Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml" + Var BigButtonEnable = "Invisible" diff --git a/xml/event/promotion_peach.xml b/xml/event/promotion_peach.xml index fb105507..523b21b5 100644 --- a/xml/event/promotion_peach.xml +++ b/xml/event/promotion_peach.xml @@ -11314,8 +11314,9 @@ LIMENADE SODA" diff --git a/xml/event/promotion_template1.inc b/xml/event/promotion_template1.inc index c2627e50..f6c28194 100644 --- a/xml/event/promotion_template1.inc +++ b/xml/event/promotion_template1.inc @@ -2,8 +2,9 @@