diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php index a3440b0316..6ee5459773 100644 --- a/Parser/Client/Browser.php +++ b/Parser/Client/Browser.php @@ -124,7 +124,7 @@ class Browser extends AbstractClientParser 'AS' => 'Avast Secure Browser', 'VG' => 'AVG Secure Browser', 'AC' => 'Avira Secure Browser', - 'A1' => 'AwoX', + 'A1' => 'Awox', '7A' => 'Awesomium', '5B' => 'Basic Web Browser', 'BA' => 'Beaker Browser', diff --git a/Parser/Device/AbstractDeviceParser.php b/Parser/Device/AbstractDeviceParser.php index ce4f820d41..0a3ceaf133 100644 --- a/Parser/Device/AbstractDeviceParser.php +++ b/Parser/Device/AbstractDeviceParser.php @@ -167,7 +167,7 @@ abstract class AbstractDeviceParser extends AbstractParser '60' => 'Andowl', 'ANX' => 'ANXONIT', 'ANL' => 'ANCEL', - 'ANC' => 'ANBERNIC', + 'ANC' => 'Anbernic', 'AND' => 'andersson', '6J' => 'Angelcare', 'ANG' => 'AngelTech', @@ -186,7 +186,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'ARC' => 'Arçelik', 'AR' => 'Archos', 'AB' => 'Arian Space', - 'ARI' => 'Arival', + 'ARI' => 'A-rival', 'A6' => 'Ark', '5A' => 'ArmPhone', 'AN' => 'Arnova', @@ -237,12 +237,12 @@ abstract class AbstractDeviceParser extends AbstractParser 'AZU' => 'Azupik', 'AZO' => 'AZOM', 'WW' => 'Awow', - 'AWO' => 'AWOX', + 'AWO' => 'Awox', 'XU' => 'AUX', - 'BAC' => 'Backcell', + 'BAC' => 'Bakcell', 'BFF' => 'BAFF', 'BNC' => 'BNCF', - 'BO' => 'BangOlufsen', + 'BO' => 'Bang & Olufsen', 'BN' => 'Barnes & Noble', 'BAR' => 'BARTEC', 'BAU' => 'BAUHN', @@ -293,11 +293,11 @@ abstract class AbstractDeviceParser extends AbstractParser '2Y' => 'b2m', 'BP' => 'Blaupunkt', 'BU' => 'Blu', - 'BUS' => 'BluSlate', + 'BUS' => 'Bluslate', 'BUZ' => 'BuzzTV', 'B3' => 'Bluboo', '2B' => 'Bluedot', - 'BD' => 'Bluegood', + 'BD' => 'BlueGood', 'LB' => 'Bluewave', 'J8' => 'Bluebird', 'BSS' => 'BlueSky', @@ -333,7 +333,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'BYY' => 'BYYBUO', 'BYD' => 'BYD', 'C9' => 'CAGI', - 'CAD' => 'CADENA', + 'CAD' => 'Cadena', 'CAL' => 'CALME', 'CAI' => 'Caixun', 'CT' => 'Capitel', @@ -356,7 +356,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CNG' => 'Canguro', 'CNT' => 'CCIT', 'CEC' => 'Cecotec', - 'CEP' => 'CEPTER', + 'CEP' => 'Cepter', 'CEI' => 'Ceibal', '02' => 'Cell-C', 'CEL' => 'Cellacom', @@ -395,7 +395,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CL' => 'Compal', 'CQ' => 'Compaq', 'C7' => 'ComTrade Tesla', - '7Z' => 'COMPUMAX', + '7Z' => 'Compumax', 'C8' => 'Concord', 'CC' => 'ConCorde', 'C5' => 'Condor', @@ -423,7 +423,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'CKK' => 'CKK Mobile', 'YW' => 'ClearPHONE', '33' => 'Clementoni', - 'CR' => 'CreNova', + 'CR' => 'Crenova', 'CX' => 'Crescent', 'CRE' => 'Crestron', 'CK' => 'Cricket', @@ -455,7 +455,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'DAS' => 'DASS', 'DAW' => 'Dawlance', 'DB' => 'Dbtel', - 'DBP' => 'DbPhone', + 'DBP' => 'dbPhone', 'DCO' => 'Dcode', 'DEC' => 'DEC', 'DL' => 'Dell', @@ -478,7 +478,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'DI' => 'Dicam', 'D4' => 'Digi', 'D3' => 'Digicel', - 'DDG' => 'Digidragon', + 'DDG' => 'DigiDragon', 'DH' => 'Digihome', 'DD' => 'Digiland', 'DIJ' => 'DIJITSU', @@ -525,7 +525,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'DTA' => 'Dtac', 'DUA' => 'Dual', 'DU' => 'Dune HD', - 'DUO' => 'DuoTV', + 'DUO' => 'duoTV', 'UD' => 'DUNNS Mobile', 'DUU' => 'Duubee', 'DRB' => 'Durabase', @@ -599,7 +599,7 @@ abstract class AbstractDeviceParser extends AbstractParser '8E' => 'Epik One', 'EPK' => 'Epic', 'XP' => 'Epson', - 'EPH' => 'Ephone', + 'EPH' => 'E phone', 'EPL' => 'Eplutus', 'E7' => 'Ergo', 'EC' => 'Ericsson', @@ -629,9 +629,9 @@ abstract class AbstractDeviceParser extends AbstractParser '0Q' => 'Evoo', '5U' => 'EVPAD', 'EVV' => 'evvoli', - 'E0' => 'EvroMedia', + 'E0' => 'Evromedia', 'EXR' => 'Exertis', - 'XE' => 'ExMobile', + 'XE' => 'EXMobile', '4Z' => 'Exmart', 'EH' => 'EXO', 'EX' => 'Explay', @@ -714,14 +714,14 @@ abstract class AbstractDeviceParser extends AbstractParser 'FFF' => 'FFF SmartLife', 'FW' => 'FNF', 'FXT' => 'Fxtec', + 'GTB' => 'G-Tab', 'GT' => 'G-TiDE', 'G9' => 'G-Touch', - 'GTB' => 'G-Tab', - 'GFO' => 'Gfone', + 'GFO' => 'G-Fone', 'GTM' => 'GTMEDIA', 'GTX' => 'GTX', 'GDL' => 'GDL', - '0G' => 'GFive', + '0G' => 'G\'Five', 'GM' => 'Garmin-Asus', 'GA' => 'Gateway', '99' => 'Galaxy Innovations', @@ -760,10 +760,10 @@ abstract class AbstractDeviceParser extends AbstractParser '38' => 'GLONYX', 'U6' => 'Glofiish', 'GLO' => 'Glory Star', - 'GNE' => 'GN Electronics', + 'GNE' => 'G N Electronics', 'G7' => 'GoGEN', 'GC' => 'GOCLEVER', - '5G' => 'Gocomma', + '5G' => 'Go,Comma', 'GB' => 'Gol Mobile', 'GL' => 'Goly', 'GOL' => 'GoldMaster', @@ -779,14 +779,14 @@ abstract class AbstractDeviceParser extends AbstractParser 'GOO' => 'GOODTEL', 'GO1' => 'GOtv', 'GPL' => 'G-PLUS', - '8G' => 'Gplus', + '8G' => 'GPLUS', 'GR' => 'Gradiente', 'GRE' => 'Graetz', 'GRN' => 'Grandin', 'GP' => 'Grape', 'G6' => 'Gree', 'GRA' => 'Great Asia', - '3G' => 'Greentel', + '3G' => 'Greentel Mobile', 'GRO' => 'Green Orange', 'GRL' => 'Green Lion', 'GR1' => 'GroBerwert', @@ -809,7 +809,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'XH' => 'Haipai', 'XHU' => 'Haixu', 'HAN' => 'Handheld', - 'HE' => 'HannSpree', + 'HE' => 'HANNspree', 'HNS' => 'Hanseatic', 'HA2' => 'Hanson', 'HK' => 'Hardkernel', @@ -825,9 +825,9 @@ abstract class AbstractDeviceParser extends AbstractParser 'HQ' => 'HERO', 'ZH' => 'Hezire', 'HEX' => 'HexaByte', - 'HEW' => 'HeadWolf', + 'HEW' => 'Headwolf', 'HDR' => 'Heider', - 'HEI' => 'Heimat', + 'HEI' => 'Heimät', 'HL' => 'Hi-Level', '3H' => 'Hi', 'HIB' => 'Hiberg', @@ -942,7 +942,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'IPR' => 'InfinityPro', 'I0' => 'InFocus', 'IN1' => 'InFone', - 'II' => 'Inkti', + 'II' => 'Intki', 'MIR' => 'Infomir', '81' => 'InfoKit', 'I5' => 'InnJoo', @@ -973,7 +973,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'IRE' => 'iReplace', 'IR' => 'iRola', 'IU' => 'iRulu', - 'IRO' => 'iRobot', + 'IRO' => 'I.Robot', '9I' => 'iSWAG', '9J' => 'iSafe Mobile', 'IST' => 'iStar', @@ -987,16 +987,16 @@ abstract class AbstractDeviceParser extends AbstractParser 'QW' => 'iWaylink', 'I9' => 'iZotron', 'IXI' => 'IXI', - 'IXT' => 'iXTech', + 'IXT' => 'i-Xtech', 'IOT' => 'IOTWE', 'JA' => 'JAY-Tech', 'JAM' => 'Jambo', 'JCK' => 'Jckkcfug', 'KJ' => 'Jiake', - 'JD' => 'Jide', + 'JD' => 'Jide Technology', 'JEE' => 'Jeep', 'J6' => 'Jeka', - 'JF' => 'JFone', + 'JF' => 'jFone', 'JI' => 'Jiayu', 'JG' => 'Jinga', 'JIN' => 'Jin Tu', @@ -1075,7 +1075,7 @@ abstract class AbstractDeviceParser extends AbstractParser '5K' => 'KREZ', 'WK' => 'KRIP', 'KRA' => 'Kraft', - 'KH' => 'KT-Tech', + 'KH' => 'KT Tech', 'KTC' => 'KTC', 'Z6' => 'KUBO', 'KUG' => 'KuGou', @@ -1270,7 +1270,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'MM' => 'Mpman', 'MZ' => 'MSI', '3R' => 'MStar', - 'M9' => 'MTC', + 'M9' => 'MTS', 'N4' => 'MTN', '72' => 'M-Tech', '9H' => 'M-Horse', @@ -1305,17 +1305,17 @@ abstract class AbstractDeviceParser extends AbstractParser '7R' => 'NavRoad', 'NAB' => 'NABO', 'NAS' => 'NASCO', - 'NP' => 'Naomi Phone', + 'NP' => 'NaomiPhone', 'NAN' => 'Nanho', 'NE' => 'NEC', 'NDP' => 'Nedaphone', - '8N' => 'Necnot', + '8N' => 'Necnon', 'NF' => 'Neffos', 'NEI' => 'NEI', '9X' => 'NEO', 'NEK' => 'NEKO', '1N' => 'Neomi', - '7Q' => 'Neon IQ', + '7Q' => 'Neoniq', '8F' => 'Neolix', 'NES' => 'Nesons', 'NET' => 'NetBox', @@ -1328,7 +1328,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'NW' => 'Newgen', 'N9' => 'Newland', '0N' => 'Newman', - 'NS' => 'NewsMy', + 'NS' => 'Newsmy', 'ND' => 'Newsday', 'HB' => 'New Balance', 'BRI' => 'New Bridge', @@ -1594,7 +1594,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'RDX' => 'RED-X', 'REW' => 'Redway', '6F' => 'Redfox', - 'RE2' => 'RedLine', + 'RE2' => 'Redline', 'RD' => 'Reeder', 'Z9' => 'REGAL', 'RH' => 'Remdun', @@ -1611,17 +1611,17 @@ abstract class AbstractDeviceParser extends AbstractParser 'RN' => 'Rinno', 'RNB' => 'Ringing Bells', 'RX' => 'Ritmix', - 'R7' => 'Ritzviva', + 'R7' => 'RitzViva', 'RV' => 'Riviera', - '6R' => 'Rivo', + '6R' => 'Rivo Mobile', 'RIZ' => 'Rizzen', - 'RR' => 'Roadrover', + 'RR' => 'RoadRover', 'RDS' => 'Roadstar', 'QR' => 'ROADMAX', 'ROH' => 'ROCH', 'ROC' => 'Roam Cat', 'ROT' => 'Rocket', - 'R1' => 'Rokit', + 'R1' => 'ROKiT', 'RKI' => 'Rokid', 'RK' => 'Roku', 'R3' => 'Rombica', @@ -1755,7 +1755,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'SO' => 'Sony', 'SE' => 'Sony Ericsson', 'X2' => 'Soundmax', - 'SUL' => 'SoulLink', + 'SUL' => 'SOULLINK', '8S' => 'Soyes', '77' => 'SONOS', '68' => 'Soho Style', @@ -1832,7 +1832,7 @@ abstract class AbstractDeviceParser extends AbstractParser '9N' => 'Tanix', 'U5' => 'Taiga System', 'TAL' => 'Talius', - '7G' => 'TAG Tech', + '7G' => 'TAGTech', 'TLB' => 'TALBERG', 'TAU' => 'TAUBE', 'T5' => 'TB Touch', @@ -1848,7 +1848,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TT' => 'TechnoTrend', 'TTS' => 'TECHNOSAT', 'TM1' => 'Temigereev', - 'TP' => 'TechPad', + 'TP' => 'Tech Pad', '9E' => 'Techwood', '7F' => 'Technopc', 'TCH' => 'Techstorm', @@ -1867,7 +1867,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TLY' => 'Telly', 'TEL' => 'Telma', 'PW' => 'Telpo', - 'TLS' => 'TeloSystems', + 'TLS' => 'Telo Systems', 'TER' => 'Teracube', 'WR' => 'Terra', 'TD' => 'Tesco', @@ -1900,7 +1900,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TY' => 'Tooky', 'TYD' => 'TYD', 'TOO' => 'TOOGO', - 'TPT' => 'Top-Tech', + 'TPT' => 'TopTech', 'T9' => 'Top House', 'DK' => 'Topelotek', '42' => 'Topway', @@ -1915,7 +1915,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'TO1' => 'Topsion', 'TS' => 'Toshiba', 'T8' => 'Touchmate', - 'TOU' => 'Touch Plus', + 'TOU' => 'Touch+', '5R' => 'Transpeed', 'T6' => 'TrekStor', 'TRP' => 'Trecfone', @@ -1962,11 +1962,11 @@ abstract class AbstractDeviceParser extends AbstractParser 'UM2' => 'Umiio', 'UNT' => 'Unitech', 'UZ' => 'Unihertz', - '3Z' => 'UZ Mobile', + '3Z' => 'Uzmobile', 'UX' => 'Unimax', 'UNQ' => 'Uniqcell', 'US' => 'Uniscope', - 'UNI' => 'Unistrong', + 'UNI' => 'UniStrong', 'U2' => 'UNIWA', 'UND' => 'Uniden', 'BAS' => 'Unikalne Smartphones', @@ -2087,7 +2087,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'VU' => 'Vulcan', '3V' => 'VVETIME', 'ZC' => 'VUCATIMES', - 'VO2' => 'VOLKANO', + 'VO2' => 'Volkano', 'VUE' => 'Vue Micro', 'WAK' => 'Walker', 'WA' => 'Walton', @@ -2098,7 +2098,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'WAI' => 'Wainyok', 'WAT' => 'waipu.tv', 'WHO' => 'Whoop', - 'WBL' => 'We. by Loewe.', + 'WBL' => 'We. by Loewe', 'WCP' => 'WeChip', 'WM' => 'Weimei', 'WM1' => 'Weiimi', @@ -2127,12 +2127,12 @@ abstract class AbstractDeviceParser extends AbstractParser 'W0' => 'Wiseasy', '2W' => 'Wizz', 'W4' => 'WIWA', - 'WIZ' => 'WizarPos', + 'WIZ' => 'WizarPOS', 'WL' => 'Wolder', 'WG' => 'Wolfgang', 'WQ' => 'Wolki', 'WON' => 'WONDER', - 'WO' => 'Wonu', + 'WO' => 'Wonu Telecom', 'W1' => 'Woo', 'WX' => 'Woxter', 'WOZ' => 'WOZIFAN', @@ -2143,7 +2143,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'XMO' => 'X-Mobile', 'XT' => 'X-TIGI', 'XV' => 'X-View', - 'X4' => 'X.Vision', + 'X4' => 'XVISION', 'X88' => 'X88', 'X96' => 'X96', '96Q' => 'X96Q', @@ -2192,7 +2192,7 @@ abstract class AbstractDeviceParser extends AbstractParser 'YUT' => 'Yutmart', 'YU' => 'Yuandao', 'YS' => 'Yusun', - 'YJ' => 'YASIN', + 'YJ' => 'Yasin', 'YX' => 'Yxtel', '0Z' => 'Zatec', '2Z' => 'Zaith', @@ -2264,6 +2264,118 @@ abstract class AbstractDeviceParser extends AbstractParser 'LPX' => 'LPX-G', // Is now 'Newman' 'UE1' => 'UE', + // Is now 'Anbernic' + 'ANC' => 'ANBERNIC', + // Is now 'A-rival' + 'ARI' => 'Arival', + // Is now 'Awox' + 'AWO' => 'AWOX', + // Is now 'Bakcell' + 'BAC' => 'Backcell', + // Is now 'Bang & Olufsen' + 'BO' => 'BangOlufsen', + // Is now 'Bluslate' + 'BUS' => 'BluSlate', + // Is now 'BlueGood' + 'BD' => 'Bluegood', + // Is now 'Cadena' + 'CAD' => 'CADENA', + // Is now 'Cepter' + 'CEP' => 'CEPTER', + // Is now 'Compumax' + '7Z' => 'COMPUMAX', + // Is now 'Crenova' + 'CR' => 'CreNova', + // Is now 'dbPhone' + 'DBP' => 'DbPhone', + // Is now 'DigiDragon' + 'DDG' => 'Digidragon', + // Is now 'duoTV' + 'DUO' => 'DuoTV', + // Is now 'E phone' + 'EPH' => 'Ephone', + // Is now 'Evromedia' + 'E0' => 'EvroMedia', + // Is now 'EXMobile' + 'XE' => 'ExMobile', + // Is now 'G-Fone' + 'GFO' => 'Gfone', + // Is now 'G N Electronics' + 'GNE' => 'GN Electronics', + // Is now 'Go,Comma' + '5G' => 'Gocomma', + // Is now 'GPLUS' + '8G' => 'Gplus', + // Is now 'Greentel Mobile' + '3G' => 'Greentel', + // Is now 'HANNspree' + 'HE' => 'HannSpree', + // Is now 'Headwolf' + 'HEW' => 'HeadWolf', + // Is now 'Heimät' + 'HEI' => 'Heimat', + // Is now 'Intki' + 'II' => 'Inkti', + // Is now 'I.Robot' + 'IRO' => 'iRobot', + // Is now 'i-Xtech' + 'IXT' => 'iXTech', + // Is now 'Jide Technology' + 'JD' => 'Jedi', + // Is now 'jFone' + 'JF' => 'JFone', + // Is now 'KT Tech' + 'KH' => 'KT-Tech', + // Is now 'MTS' + 'M9' => 'MTC', + // Is now 'NaomiPhone' + 'NP' => 'Naomi Phone', + // Is now 'Necnon' + '8N' => 'Necnot', + // Is now 'Neoniq' + '7Q' => 'Neon IQ', + // Is now 'Newsmy' + 'NS' => 'NewsMy', + // Is now 'Redline' + 'RE2' => 'RedLine', + // Is now 'RitzViva' + 'R7' => 'Ritzviva', + // Is now 'Rivo Mobile' + '6R' => 'Rivo', + // Is now 'RoadRover' + 'RR' => 'Roadrover', + // Is now 'ROKiT' + 'R1' => 'Rokit', + // Is now 'SOULLINK' + 'SUL' => 'SoulLink', + // Is now 'TAGTech' + '7G' => 'TAG Tech', + // Is now 'Tech Pad' + 'TP' => 'TechPad', + // Is now 'Telo Systems' + 'TLS' => 'TeloSystems', + // Is now 'TopTech' + 'TPT' => 'Top-Tech', + // Is now 'Touch+' + 'TOU' => 'Touch Plus', + // Is now 'Uzmobile' + '3Z' => 'UZ Mobile', + // Is now 'UniStrong' + 'UNI' => 'Unistrong', + // Is now 'Volkano' + 'VO2' => 'VOLKANO', + // Is now 'We. by Loewe' + 'WBL' => 'We. by Loewe.', + // Is now 'WizarPOS' + 'WIZ' => 'WizarPos', + // Is now 'Wonu Telecom' + 'WO' => 'Wonu', + // Is now 'XVISION' + 'X4' => 'X.Vision', + // Is now 'Yasin' + 'YJ' => 'YASIN', + // Is now 'G\'Five' + '0G' => 'GFive', ]; /** diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml index cdfe6c0a0c..b36bb7cc37 100644 --- a/Tests/Parser/Client/fixtures/browser.yml +++ b/Tests/Parser/Client/fixtures/browser.yml @@ -3252,7 +3252,7 @@ user_agent: Mozilla/5.0 (Windows; N; Windows NT 6.1; xx) AppleWebKit/533.3 (KHTML, like Gecko) AwoX Browser CE-HTML/1.0 ()/AwoX-Software:W37-2011 Safari/533.3 client: type: browser - name: AwoX + name: Awox version: "" engine: WebKit engine_version: "533.3" @@ -3261,7 +3261,7 @@ user_agent: 'Mozilla/5.0 (N; Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) AwoX/1.0 Browser CE-HTML (HD_UIPROF MP3 MPEG_TS_SD_NA_T) - FLA Safari/534.34' client: type: browser - name: AwoX + name: Awox version: "1.0" engine: WebKit engine_version: "534.34" diff --git a/Tests/fixtures/car_browser.yml b/Tests/fixtures/car_browser.yml index 0276913838..984bbaec41 100644 --- a/Tests/fixtures/car_browser.yml +++ b/Tests/fixtures/car_browser.yml @@ -13,7 +13,7 @@ engine_version: 30.0.0.0 device: type: car browser - brand: NewsMy + brand: Newsmy model: CarPad-II-P os_family: Android browser_family: Chrome @@ -31,7 +31,7 @@ engine_version: 77.0.3865.116 device: type: car browser - brand: NewsMy + brand: Newsmy model: CarPad-III-P os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/console.yml b/Tests/fixtures/console.yml index 6ab227a148..660fec39b0 100644 --- a/Tests/fixtures/console.yml +++ b/Tests/fixtures/console.yml @@ -626,7 +626,7 @@ engine_version: 78.0.3904.96 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG405V os_family: Android browser_family: Chrome @@ -644,7 +644,7 @@ engine_version: 78.0.3904.96 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG505 os_family: Android browser_family: Chrome @@ -698,7 +698,7 @@ engine_version: 132.0.0.0 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG556 os_family: Android browser_family: Chrome @@ -716,7 +716,7 @@ engine_version: 132.0.0.0 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG406V os_family: Android browser_family: Chrome @@ -734,7 +734,7 @@ engine_version: 131.0.0.0 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG Cube os_family: Android browser_family: Chrome @@ -770,7 +770,7 @@ engine_version: 132.0.6834.33 device: type: console - brand: ANBERNIC + brand: Anbernic model: RG405M os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/desktop.yml b/Tests/fixtures/desktop.yml index 0edea2882b..6af77f84a4 100644 --- a/Tests/fixtures/desktop.yml +++ b/Tests/fixtures/desktop.yml @@ -8448,7 +8448,7 @@ engine_version: 89.0.4389.105 device: type: desktop - brand: Jide + brand: Jide Technology model: Remix Mini os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/feature_phone.yml b/Tests/fixtures/feature_phone.yml index 1e1dac8235..f42ab7d159 100644 --- a/Tests/fixtures/feature_phone.yml +++ b/Tests/fixtures/feature_phone.yml @@ -1619,7 +1619,7 @@ engine_version: "48.0" device: type: feature phone - brand: TechPad + brand: Tech Pad model: Kaios One 3G os_family: Firefox OS browser_family: Firefox @@ -1647,7 +1647,7 @@ client: null device: type: feature phone - brand: Gfone + brand: G-Fone model: "777" os_family: Real-time OS browser_family: Unknown diff --git a/Tests/fixtures/peripheral.yml b/Tests/fixtures/peripheral.yml index b04636f83f..efe3436876 100644 --- a/Tests/fixtures/peripheral.yml +++ b/Tests/fixtures/peripheral.yml @@ -782,7 +782,7 @@ engine_version: "534.30" device: type: peripheral - brand: WizarPos + brand: WizarPOS model: Q2 os_family: Android browser_family: Android Browser @@ -1160,7 +1160,7 @@ engine_version: 51.0.2704.91 device: type: peripheral - brand: TeloSystems + brand: Telo Systems model: M5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml index 1ed01288d0..0a49b23755 100644 --- a/Tests/fixtures/smartphone-11.yml +++ b/Tests/fixtures/smartphone-11.yml @@ -6234,7 +6234,7 @@ engine_version: 73.0.3683.90 device: type: smartphone - brand: Rokit + brand: ROKiT model: IO Pro os_family: Android browser_family: Chrome @@ -6792,7 +6792,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Ritzviva + brand: RitzViva model: S500C os_family: Android browser_family: Chrome @@ -9292,7 +9292,7 @@ engine_version: 101.0.0.0 device: type: smartphone - brand: MTC + brand: MTS model: Osmartphona os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-15.yml b/Tests/fixtures/smartphone-15.yml index b8d88265e5..859346a4b8 100644 --- a/Tests/fixtures/smartphone-15.yml +++ b/Tests/fixtures/smartphone-15.yml @@ -2386,7 +2386,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: TechPad + brand: Tech Pad model: +Q545 os_family: Android browser_family: Chrome @@ -2404,7 +2404,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: TechPad + brand: Tech Pad model: X5 os_family: Android browser_family: Chrome @@ -9659,7 +9659,7 @@ engine_version: 101.0.4951.61 device: type: smartphone - brand: Digidragon + brand: DigiDragon model: DS502 os_family: Android browser_family: Chrome @@ -9677,7 +9677,7 @@ engine_version: 102.0.0.0 device: type: smartphone - brand: Digidragon + brand: DigiDragon model: DS6018 os_family: Android browser_family: Chrome @@ -9695,7 +9695,7 @@ engine_version: 104.0.0.0 device: type: smartphone - brand: Digidragon + brand: DigiDragon model: DS6261 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-17.yml b/Tests/fixtures/smartphone-17.yml index 871e056dd0..65a8e904fe 100644 --- a/Tests/fixtures/smartphone-17.yml +++ b/Tests/fixtures/smartphone-17.yml @@ -7969,7 +7969,7 @@ engine_version: 85.0.4183.81 device: type: smartphone - brand: MTC + brand: MTS model: Smart Line os_family: Android browser_family: Chrome @@ -8221,7 +8221,7 @@ engine_version: 85.0.4183.127 device: type: smartphone - brand: MTC + brand: MTS model: Smart Light os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml index ab3f5079c7..a41acfe50b 100644 --- a/Tests/fixtures/smartphone-18.yml +++ b/Tests/fixtures/smartphone-18.yml @@ -1741,7 +1741,7 @@ engine_version: 74.0.3729.136 device: type: smartphone - brand: ExMobile + brand: EXMobile model: EX 29i os_family: Android browser_family: Chrome @@ -1759,7 +1759,7 @@ engine_version: "" device: type: smartphone - brand: ExMobile + brand: EXMobile model: EX 45i os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-19.yml b/Tests/fixtures/smartphone-19.yml index 2caeb31d27..3b1be0dfb9 100644 --- a/Tests/fixtures/smartphone-19.yml +++ b/Tests/fixtures/smartphone-19.yml @@ -1057,7 +1057,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: TechPad + brand: Tech Pad model: X5 os_family: Android browser_family: Chrome @@ -1075,7 +1075,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: TechPad + brand: Tech Pad model: M5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-2.yml b/Tests/fixtures/smartphone-2.yml index 504719920c..fb335f7f79 100644 --- a/Tests/fixtures/smartphone-2.yml +++ b/Tests/fixtures/smartphone-2.yml @@ -4764,7 +4764,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: Bluegood + brand: BlueGood model: V6 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-21.yml b/Tests/fixtures/smartphone-21.yml index 1256b5e8e7..0786b1ef14 100644 --- a/Tests/fixtures/smartphone-21.yml +++ b/Tests/fixtures/smartphone-21.yml @@ -5789,7 +5789,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Naomi Phone + brand: NaomiPhone model: Ambar os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-22.yml b/Tests/fixtures/smartphone-22.yml index 85ede81ed1..5c5bb6baf8 100644 --- a/Tests/fixtures/smartphone-22.yml +++ b/Tests/fixtures/smartphone-22.yml @@ -4955,7 +4955,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Greentel + brand: Greentel Mobile model: X1 Light LTE os_family: Android browser_family: Chrome @@ -5747,7 +5747,7 @@ engine_version: 86.0.4240.185 device: type: smartphone - brand: GFive + brand: G'Five model: President Gold 9 os_family: Android browser_family: Chrome @@ -5765,7 +5765,7 @@ engine_version: 86.0.4240.198 device: type: smartphone - brand: GFive + brand: G'Five model: President Gold 10 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-23.yml b/Tests/fixtures/smartphone-23.yml index 909c059eed..f901d18293 100644 --- a/Tests/fixtures/smartphone-23.yml +++ b/Tests/fixtures/smartphone-23.yml @@ -1003,7 +1003,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: GFive + brand: G'Five model: President GPower 1 os_family: Android browser_family: Chrome @@ -1273,7 +1273,7 @@ engine_version: 78.0.3904.62 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ20 os_family: Android browser_family: Chrome @@ -1291,7 +1291,7 @@ engine_version: 72.0.3626.105 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ25 os_family: Android browser_family: Chrome @@ -1309,7 +1309,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ35 os_family: Android browser_family: Chrome @@ -1327,7 +1327,7 @@ engine_version: 43.0.2357.121 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ4 os_family: Android browser_family: Chrome @@ -1345,7 +1345,7 @@ engine_version: 43.0.2357.121 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom RX298 os_family: Android browser_family: Chrome @@ -1363,7 +1363,7 @@ engine_version: 81.0.4044.138 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX50 os_family: Android browser_family: Chrome @@ -1381,7 +1381,7 @@ engine_version: "" device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX10 os_family: Android browser_family: Android Browser @@ -1399,7 +1399,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX180 os_family: Android browser_family: Chrome @@ -1417,7 +1417,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX280 os_family: Android browser_family: Chrome @@ -1435,7 +1435,7 @@ engine_version: 72.0.3626.121 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX400 os_family: Android browser_family: Chrome @@ -1453,7 +1453,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX90 os_family: Android browser_family: Chrome @@ -1471,7 +1471,7 @@ engine_version: 40.0.2214.109 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX45 os_family: Android browser_family: Chrome @@ -1489,7 +1489,7 @@ engine_version: "" device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX100 os_family: Android browser_family: Android Browser @@ -1507,7 +1507,7 @@ engine_version: "" device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX150 os_family: Android browser_family: Android Browser @@ -1525,7 +1525,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX65 os_family: Android browser_family: Chrome @@ -1543,7 +1543,7 @@ engine_version: 79.0.3945.93 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX60 os_family: Android browser_family: Chrome @@ -1561,7 +1561,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX70 os_family: Android browser_family: Chrome @@ -1579,7 +1579,7 @@ engine_version: 80.0.3987.119 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX75 os_family: Android browser_family: Chrome @@ -1597,7 +1597,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX80 os_family: Android browser_family: Chrome @@ -1615,7 +1615,7 @@ engine_version: 43.0.2357.121 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom RX387 os_family: Android browser_family: Chrome @@ -1633,7 +1633,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ15 os_family: Android browser_family: Chrome @@ -1651,7 +1651,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Phantom PZ18 os_family: Android browser_family: Chrome @@ -2173,7 +2173,7 @@ engine_version: 90.0.4430.91 device: type: smartphone - brand: UZ Mobile + brand: Uzmobile model: Uzbekistan os_family: Android browser_family: Chrome @@ -3433,7 +3433,7 @@ engine_version: 84.0.4147.89 device: type: smartphone - brand: TechPad + brand: Tech Pad model: Note 4 Cam os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-26.yml b/Tests/fixtures/smartphone-26.yml index 65a9f01298..318a28a729 100644 --- a/Tests/fixtures/smartphone-26.yml +++ b/Tests/fixtures/smartphone-26.yml @@ -1381,7 +1381,7 @@ engine_version: 91.0.4472.88 device: type: smartphone - brand: MTC + brand: MTS model: Smart Bit os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-27.yml b/Tests/fixtures/smartphone-27.yml index abd8cbbb1d..4f51429511 100644 --- a/Tests/fixtures/smartphone-27.yml +++ b/Tests/fixtures/smartphone-27.yml @@ -3539,7 +3539,7 @@ engine_version: 92.0.4515.131 device: type: smartphone - brand: Rokit + brand: ROKiT model: IO Light os_family: Android browser_family: Chrome @@ -3557,7 +3557,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: Rokit + brand: ROKiT model: IO 3D os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-28.yml b/Tests/fixtures/smartphone-28.yml index 53d60c8bb9..304ef853da 100644 --- a/Tests/fixtures/smartphone-28.yml +++ b/Tests/fixtures/smartphone-28.yml @@ -607,7 +607,7 @@ engine_version: 94.0.4606.71 device: type: smartphone - brand: TechPad + brand: Tech Pad model: M5 Go os_family: Android browser_family: Chrome @@ -3287,7 +3287,7 @@ engine_version: "528.5" device: type: smartphone - brand: MTC + brand: MTS model: Smart Start 3 os_family: Android browser_family: Unknown @@ -5317,7 +5317,7 @@ engine_version: 96.0.4664.45 device: type: smartphone - brand: TechPad + brand: Tech Pad model: Note 4 Cam os_family: Android browser_family: Chrome @@ -8877,7 +8877,7 @@ engine_version: 95.0.4638.74 device: type: smartphone - brand: Gplus + brand: GPLUS model: X10 os_family: Android browser_family: Chrome @@ -8895,7 +8895,7 @@ engine_version: "534.30" device: type: smartphone - brand: Gplus + brand: GPLUS model: N809 os_family: Android browser_family: Android Browser @@ -8913,7 +8913,7 @@ engine_version: 96.0.4664.104 device: type: smartphone - brand: Gplus + brand: GPLUS model: Z10 os_family: Android browser_family: Chrome @@ -9669,7 +9669,7 @@ engine_version: 97.0.4692.98 device: type: smartphone - brand: Gplus + brand: GPLUS model: P10 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-29.yml b/Tests/fixtures/smartphone-29.yml index e00945b184..e4b4194ebb 100644 --- a/Tests/fixtures/smartphone-29.yml +++ b/Tests/fixtures/smartphone-29.yml @@ -3713,7 +3713,7 @@ engine_version: 91.0.4472.120 device: type: smartphone - brand: MTC + brand: MTS model: Smart Turbo 4G os_family: Android browser_family: Chrome @@ -4659,7 +4659,7 @@ engine_version: 84.0.4147.125 device: type: smartphone - brand: TechPad + brand: Tech Pad model: M6 Plus os_family: Android browser_family: Chrome @@ -6289,7 +6289,7 @@ engine_version: 97.0.4692.87 device: type: smartphone - brand: Greentel + brand: Greentel Mobile model: X1 Light LTE os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-3.yml b/Tests/fixtures/smartphone-3.yml index ddb820bb33..7190658707 100644 --- a/Tests/fixtures/smartphone-3.yml +++ b/Tests/fixtures/smartphone-3.yml @@ -12490,7 +12490,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: Naomi Phone + brand: NaomiPhone model: Dammar os_family: Android browser_family: Chrome @@ -13352,7 +13352,7 @@ engine_version: 74.0.3729.157 device: type: smartphone - brand: TechPad + brand: Tech Pad model: M5 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-30.yml b/Tests/fixtures/smartphone-30.yml index 29eac9f2ad..9ad19bd179 100644 --- a/Tests/fixtures/smartphone-30.yml +++ b/Tests/fixtures/smartphone-30.yml @@ -729,7 +729,7 @@ engine_version: 90.0.4430.85 device: type: smartphone - brand: MTC + brand: MTS model: Smart Start 3 os_family: Android browser_family: Chrome @@ -10360,7 +10360,7 @@ engine_version: "" device: type: smartphone - brand: Backcell + brand: Bakcell model: BK2021 os_family: Android browser_family: Unknown @@ -10378,7 +10378,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: DbPhone + brand: dbPhone model: DB8 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-31.yml b/Tests/fixtures/smartphone-31.yml index 2aef8db01c..956893f37d 100644 --- a/Tests/fixtures/smartphone-31.yml +++ b/Tests/fixtures/smartphone-31.yml @@ -787,7 +787,7 @@ engine_version: 84.0.4147.111 device: type: smartphone - brand: Gplus + brand: GPLUS model: F53 os_family: Android browser_family: Chrome @@ -805,7 +805,7 @@ engine_version: 78.0.3904.62 device: type: smartphone - brand: Gplus + brand: GPLUS model: S9701 os_family: Android browser_family: Chrome @@ -823,7 +823,7 @@ engine_version: 78.0.3904.90 device: type: smartphone - brand: Gplus + brand: GPLUS model: FW6950 os_family: Android browser_family: Chrome @@ -841,7 +841,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: Gplus + brand: GPLUS model: A2 Plus os_family: Android browser_family: Chrome @@ -2837,7 +2837,7 @@ engine_version: 80.0.3987.149 device: type: smartphone - brand: Unistrong + brand: UniStrong model: UT10 os_family: Android browser_family: Chrome @@ -7763,7 +7763,7 @@ engine_version: "" device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Rhythm RX75 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/smartphone-33.yml b/Tests/fixtures/smartphone-33.yml index 0137b99946..c3d00d8a2d 100644 --- a/Tests/fixtures/smartphone-33.yml +++ b/Tests/fixtures/smartphone-33.yml @@ -1075,7 +1075,7 @@ engine_version: 104.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: P10+ os_family: Android browser_family: Chrome @@ -1093,7 +1093,7 @@ engine_version: 102.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: P10 os_family: Android browser_family: Chrome @@ -1291,7 +1291,7 @@ engine_version: 100.0.4896.127 device: type: smartphone - brand: TechPad + brand: Tech Pad model: X10 os_family: Android browser_family: Opera @@ -1939,7 +1939,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: ExMobile + brand: EXMobile model: Chat 5 Plus os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-34.yml b/Tests/fixtures/smartphone-34.yml index 21bcf22283..ebd2a9676a 100644 --- a/Tests/fixtures/smartphone-34.yml +++ b/Tests/fixtures/smartphone-34.yml @@ -3859,7 +3859,7 @@ engine_version: 102.0.0.0 device: type: smartphone - brand: GFive + brand: G'Five model: Stark os_family: Android browser_family: Chrome @@ -7225,7 +7225,7 @@ engine_version: 76.0.3809.132 device: type: smartphone - brand: TeloSystems + brand: Telo Systems model: TE6 os_family: Android browser_family: Chrome @@ -8089,7 +8089,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: Ephone + brand: E phone model: EP19 Star os_family: Android browser_family: Chrome @@ -8107,7 +8107,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: Ephone + brand: E phone model: EP19 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-35.yml b/Tests/fixtures/smartphone-35.yml index 3626ab6c6f..3bb56fe2ef 100644 --- a/Tests/fixtures/smartphone-35.yml +++ b/Tests/fixtures/smartphone-35.yml @@ -6845,7 +6845,7 @@ engine_version: 80.0.3987.132 device: type: smartphone - brand: GFive + brand: G'Five model: President A97 os_family: Android browser_family: Chrome @@ -6863,7 +6863,7 @@ engine_version: 75.0.3770.101 device: type: smartphone - brand: GFive + brand: G'Five model: President XHero 5 os_family: Android browser_family: Chrome @@ -6881,7 +6881,7 @@ engine_version: 80.0.3987.162 device: type: smartphone - brand: GFive + brand: G'Five model: President XHero 7 os_family: Android browser_family: Chrome @@ -6899,7 +6899,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: GFive + brand: G'Five model: President XHero 1 os_family: Android browser_family: Chrome @@ -6917,7 +6917,7 @@ engine_version: 80.0.3987.117 device: type: smartphone - brand: GFive + brand: G'Five model: President Smart A98 os_family: Android browser_family: Chrome @@ -6935,7 +6935,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: GFive + brand: G'Five model: President Classic 1 os_family: Android browser_family: Chrome @@ -6953,7 +6953,7 @@ engine_version: 30.0.0.0 device: type: smartphone - brand: GFive + brand: G'Five model: President Classic 7 os_family: Android browser_family: Chrome @@ -6971,7 +6971,7 @@ engine_version: 79.0.3945.136 device: type: smartphone - brand: GFive + brand: G'Five model: President Smart 2 os_family: Android browser_family: Chrome @@ -6989,7 +6989,7 @@ engine_version: 78.0.3904.90 device: type: smartphone - brand: GFive + brand: G'Five model: President Smart 5 os_family: Android browser_family: Chrome @@ -7007,7 +7007,7 @@ engine_version: 75.0.3770.143 device: type: smartphone - brand: GFive + brand: G'Five model: President G6 Plus os_family: Android browser_family: Chrome @@ -7025,7 +7025,7 @@ engine_version: 80.0.3987.119 device: type: smartphone - brand: GFive + brand: G'Five model: President G10 Fashion os_family: Android browser_family: Chrome @@ -7043,7 +7043,7 @@ engine_version: 78.0.3904.90 device: type: smartphone - brand: GFive + brand: G'Five model: President Tango 3 os_family: Android browser_family: Chrome @@ -7061,7 +7061,7 @@ engine_version: 67.0.3396.87 device: type: smartphone - brand: GFive + brand: G'Five model: President G6 os_family: Android browser_family: Chrome @@ -7079,7 +7079,7 @@ engine_version: 68.0.3440.91 device: type: smartphone - brand: GFive + brand: G'Five model: President G9 os_family: Android browser_family: Chrome @@ -7097,7 +7097,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: GFive + brand: G'Five model: President G1 os_family: Android browser_family: Chrome @@ -8211,7 +8211,7 @@ engine_version: 111.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: S10 os_family: Android browser_family: Chrome @@ -8931,7 +8931,7 @@ engine_version: 80.0.3987.99 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Storm S8 Plus os_family: Android browser_family: Chrome @@ -8949,7 +8949,7 @@ engine_version: 83.0.4103.106 device: type: smartphone - brand: Rivo + brand: Rivo Mobile model: Storm S8 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-36.yml b/Tests/fixtures/smartphone-36.yml index ea6e20eaca..28000b3936 100644 --- a/Tests/fixtures/smartphone-36.yml +++ b/Tests/fixtures/smartphone-36.yml @@ -4639,7 +4639,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: TeloSystems + brand: Telo Systems model: TE580 CO os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-37.yml b/Tests/fixtures/smartphone-37.yml index 2979220ec9..6f8f8af0dd 100644 --- a/Tests/fixtures/smartphone-37.yml +++ b/Tests/fixtures/smartphone-37.yml @@ -8387,7 +8387,7 @@ engine_version: 103.0.0.0 device: type: smartphone - brand: TAG Tech + brand: TAGTech model: Phone os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-38.yml b/Tests/fixtures/smartphone-38.yml index 1cb450b35e..a4b875e08b 100644 --- a/Tests/fixtures/smartphone-38.yml +++ b/Tests/fixtures/smartphone-38.yml @@ -3711,7 +3711,7 @@ engine_version: 122.0.6261.119 device: type: smartphone - brand: Gplus + brand: GPLUS model: X20 os_family: Android browser_family: Opera @@ -3729,7 +3729,7 @@ engine_version: 105.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: Q20S os_family: Android browser_family: Chrome @@ -3747,7 +3747,7 @@ engine_version: 115.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: Q20 os_family: Android browser_family: Chrome @@ -4897,7 +4897,7 @@ engine_version: 83.0.4103.101 device: type: smartphone - brand: TAG Tech + brand: TAGTech model: Phone Advanced os_family: Android browser_family: Chrome @@ -5149,7 +5149,7 @@ engine_version: 78.0.3904.96 device: type: smartphone - brand: GFive + brand: G'Five model: Speedo 1 os_family: Android browser_family: Chrome @@ -8392,7 +8392,7 @@ engine_version: 123.0.0.0 device: type: smartphone - brand: Gplus + brand: GPLUS model: X10+ os_family: Android browser_family: Chrome @@ -8536,7 +8536,7 @@ engine_version: 123.0.0.0 device: type: smartphone - brand: Rokit + brand: ROKiT model: Orb S os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-42.yml b/Tests/fixtures/smartphone-42.yml index 6eff77bb70..13131f56af 100644 --- a/Tests/fixtures/smartphone-42.yml +++ b/Tests/fixtures/smartphone-42.yml @@ -3929,7 +3929,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: GFive + brand: G'Five model: 4G Ultra Pro os_family: Android browser_family: Opera @@ -3947,7 +3947,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: GFive + brand: G'Five model: 4G Style os_family: Android browser_family: Chrome @@ -4001,7 +4001,7 @@ engine_version: 70.0.3538.110 device: type: smartphone - brand: GFive + brand: G'Five model: 4G 6700 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/smartphone-7.yml b/Tests/fixtures/smartphone-7.yml index 8f0dae4d35..c7e9d63b63 100644 --- a/Tests/fixtures/smartphone-7.yml +++ b/Tests/fixtures/smartphone-7.yml @@ -2979,7 +2979,7 @@ engine_version: "534.30" device: type: smartphone - brand: Inkti + brand: Intki model: E86 os_family: Android browser_family: Baidu @@ -4761,7 +4761,7 @@ engine_version: "534.30" device: type: smartphone - brand: JFone + brand: jFone model: JS501 os_family: Android browser_family: Android Browser @@ -6899,7 +6899,7 @@ engine_version: "534.30" device: type: smartphone - brand: KT-Tech + brand: KT Tech model: KM-E100 os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/smartphone-9.yml b/Tests/fixtures/smartphone-9.yml index 0ecffaeb05..7b2b711f51 100644 --- a/Tests/fixtures/smartphone-9.yml +++ b/Tests/fixtures/smartphone-9.yml @@ -2359,7 +2359,7 @@ engine_version: 42.0.2311.111 device: type: smartphone - brand: MTC + brand: MTS model: "968" os_family: Android browser_family: Chrome @@ -2377,7 +2377,7 @@ engine_version: "537.31" device: type: smartphone - brand: MTC + brand: MTS model: "970" os_family: Android browser_family: Chrome @@ -2395,7 +2395,7 @@ engine_version: 42.0.2311.111 device: type: smartphone - brand: MTC + brand: MTS model: 970H os_family: Android browser_family: Chrome @@ -2413,7 +2413,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: MTC + brand: MTS model: "972" os_family: Android browser_family: Chrome @@ -2431,7 +2431,7 @@ engine_version: 42.0.2311.111 device: type: smartphone - brand: MTC + brand: MTS model: "975" os_family: Android browser_family: Chrome @@ -2449,7 +2449,7 @@ engine_version: 64.0.3282.137 device: type: smartphone - brand: MTC + brand: MTS model: "978" os_family: Android browser_family: Chrome @@ -2467,7 +2467,7 @@ engine_version: 33.0.1750.136 device: type: smartphone - brand: MTC + brand: MTS model: "982" os_family: Android browser_family: Chrome @@ -2485,7 +2485,7 @@ engine_version: 59.0.3071.125 device: type: smartphone - brand: MTC + brand: MTS model: 982O os_family: Android browser_family: Chrome @@ -2503,7 +2503,7 @@ engine_version: 51.0.2704.81 device: type: smartphone - brand: MTC + brand: MTS model: 982T os_family: Android browser_family: Chrome @@ -2521,7 +2521,7 @@ engine_version: 71.0.3578.99 device: type: smartphone - brand: MTC + brand: MTS model: Smart Race 2 4G os_family: Android browser_family: Unknown @@ -2539,7 +2539,7 @@ engine_version: 62.0.3202.84 device: type: smartphone - brand: MTC + brand: MTS model: Smart Race 4G os_family: Android browser_family: Unknown @@ -2557,7 +2557,7 @@ engine_version: 60.0.3435.52 device: type: smartphone - brand: MTC + brand: MTS model: Smart Run 4G os_family: Android browser_family: Chrome @@ -2575,7 +2575,7 @@ engine_version: 78.0.3904.108 device: type: smartphone - brand: MTC + brand: MTS model: Smart Run 4G os_family: Android browser_family: Chrome @@ -2593,7 +2593,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: MTC + brand: MTS model: Smart Run 4G os_family: Android browser_family: Chrome @@ -2611,7 +2611,7 @@ engine_version: 57.0.2987.108 device: type: smartphone - brand: MTC + brand: MTS model: Smart Sprint 4G os_family: Android browser_family: Unknown @@ -2629,7 +2629,7 @@ engine_version: 39.0.0.0 device: type: smartphone - brand: MTC + brand: MTS model: Smart Sprint 4G os_family: Android browser_family: Chrome @@ -2647,7 +2647,7 @@ engine_version: 79.0.3945.116 device: type: smartphone - brand: MTC + brand: MTS model: Smart Start 2 os_family: Android browser_family: Chrome @@ -2665,7 +2665,7 @@ engine_version: 64.0.3282.186 device: type: smartphone - brand: MTC + brand: MTS model: Smart Surf 2 4G os_family: Android browser_family: Unknown @@ -2683,7 +2683,7 @@ engine_version: 63.0.3239.111 device: type: smartphone - brand: MTC + brand: MTS model: Smart Surf 4G os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-1.yml b/Tests/fixtures/tablet-1.yml index d5deb1092b..f5cfc94753 100644 --- a/Tests/fixtures/tablet-1.yml +++ b/Tests/fixtures/tablet-1.yml @@ -5879,7 +5879,7 @@ engine_version: 71.0.3578.99 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad 3G Goo os_family: Android browser_family: Chrome @@ -5897,7 +5897,7 @@ engine_version: 39.0.0.0 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad 3G Tab XL os_family: Android browser_family: Chrome @@ -5915,7 +5915,7 @@ engine_version: 39.0.0.0 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad Pro os_family: Android browser_family: Chrome @@ -8129,7 +8129,7 @@ engine_version: 58.0.3029.83 device: type: tablet - brand: HannSpree + brand: HANNspree model: HSG1316 os_family: Android browser_family: Chrome @@ -8147,7 +8147,7 @@ engine_version: 32.0.1700.99 device: type: tablet - brand: HannSpree + brand: HANNspree model: SN1AT71W(B) os_family: Android browser_family: Chrome @@ -8165,7 +8165,7 @@ engine_version: "534.30" device: type: tablet - brand: HannSpree + brand: HANNspree model: SN70T3 os_family: Android browser_family: Android Browser @@ -8183,7 +8183,7 @@ engine_version: "534.30" device: type: tablet - brand: HannSpree + brand: HANNspree model: SN70T31 os_family: Android browser_family: Android Browser @@ -8201,7 +8201,7 @@ engine_version: "534.30" device: type: tablet - brand: HannSpree + brand: HANNspree model: SN70T51A os_family: Android browser_family: Android Browser @@ -8219,7 +8219,7 @@ engine_version: 33.0.1750.136 device: type: tablet - brand: HannSpree + brand: HANNspree model: SN97T41W os_family: Android browser_family: Chrome @@ -8237,7 +8237,7 @@ engine_version: "534.30" device: type: tablet - brand: HannSpree + brand: HANNspree model: SNAT71BUE os_family: Android browser_family: Android Browser diff --git a/Tests/fixtures/tablet-10.yml b/Tests/fixtures/tablet-10.yml index f6ca3b465d..8da86be297 100644 --- a/Tests/fixtures/tablet-10.yml +++ b/Tests/fixtures/tablet-10.yml @@ -1001,7 +1001,7 @@ engine_version: 106.0.0.0 device: type: tablet - brand: VOLKANO + brand: Volkano model: VK-740-BL os_family: Android browser_family: Chrome @@ -4283,7 +4283,7 @@ engine_version: 68.0.3440.91 device: type: tablet - brand: TechPad + brand: Tech Pad model: 10QC os_family: Android browser_family: Chrome @@ -4301,7 +4301,7 @@ engine_version: 76.0.3809.89 device: type: tablet - brand: TechPad + brand: Tech Pad model: 10XX os_family: Android browser_family: Chrome @@ -4319,7 +4319,7 @@ engine_version: "534.30" device: type: tablet - brand: TechPad + brand: Tech Pad model: "703" os_family: Android browser_family: Android Browser @@ -4337,7 +4337,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: TechPad + brand: Tech Pad model: 3Gx os_family: Android browser_family: Chrome @@ -6461,7 +6461,7 @@ engine_version: 85.0.4183.81 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad Pro XL os_family: Android browser_family: Chrome @@ -8585,7 +8585,7 @@ engine_version: 80.0.3987.132 device: type: tablet - brand: Necnot + brand: Necnon model: M002D-2 os_family: Android browser_family: Chrome @@ -8603,7 +8603,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: Necnot + brand: Necnon model: M002K-2 os_family: Android browser_family: Chrome @@ -8621,7 +8621,7 @@ engine_version: 79.0.3945.116 device: type: tablet - brand: Necnot + brand: Necnon model: M002N os_family: Android browser_family: Chrome @@ -8639,7 +8639,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: Necnot + brand: Necnon model: M002N-3T os_family: Android browser_family: Chrome @@ -8657,7 +8657,7 @@ engine_version: 84.0.4147.89 device: type: tablet - brand: Necnot + brand: Necnon model: M002Q-2 os_family: Android browser_family: Chrome @@ -8675,7 +8675,7 @@ engine_version: 85.0.4183.127 device: type: tablet - brand: Necnot + brand: Necnon model: M002W-2T os_family: Android browser_family: Chrome @@ -8693,7 +8693,7 @@ engine_version: 80.0.3987.132 device: type: tablet - brand: Necnot + brand: Necnon model: M002G-2 os_family: Android browser_family: Chrome @@ -8711,7 +8711,7 @@ engine_version: 76.0.3809.111 device: type: tablet - brand: Necnot + brand: Necnon model: 6M-3T os_family: Android browser_family: Chrome @@ -10835,7 +10835,7 @@ engine_version: 85.0.4183.81 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad 3G 2Goo os_family: Android browser_family: Chrome @@ -11195,7 +11195,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: TechPad + brand: Tech Pad model: 10Y os_family: Android browser_family: Chrome @@ -11213,7 +11213,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: TechPad + brand: Tech Pad model: 9x os_family: Android browser_family: Chrome @@ -11231,7 +11231,7 @@ engine_version: 81.0.4044.117 device: type: tablet - brand: TechPad + brand: Tech Pad model: i700 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-11.yml b/Tests/fixtures/tablet-11.yml index 03dfd02cb9..1403e08511 100644 --- a/Tests/fixtures/tablet-11.yml +++ b/Tests/fixtures/tablet-11.yml @@ -4535,8 +4535,8 @@ engine_version: 124.0.0.0 device: type: tablet - brand: CEPTER - model: TAB10L + brand: Cepter + model: TAB 10L os_family: Android browser_family: Chrome - @@ -5393,7 +5393,7 @@ engine_version: 122.0.6261.300 device: type: tablet - brand: Arival + brand: A-rival model: Bioniq P116 os_family: Android browser_family: Unknown @@ -5519,7 +5519,7 @@ engine_version: 100.0.4896.58 device: type: tablet - brand: HeadWolf + brand: Headwolf model: WPad3 os_family: Android browser_family: Unknown @@ -6939,7 +6939,7 @@ engine_version: 126.0.0.0 device: type: tablet - brand: HeadWolf + brand: Headwolf model: HPad1 os_family: Android browser_family: Chrome @@ -7461,7 +7461,7 @@ engine_version: 124.0.0.0 device: type: tablet - brand: HeadWolf + brand: Headwolf model: FPad3 os_family: Android browser_family: Chrome @@ -8769,8 +8769,8 @@ engine_version: 126.0.0.0 device: type: tablet - brand: CEPTER - model: TAB101 + brand: Cepter + model: TAB 101 os_family: Android browser_family: Chrome - diff --git a/Tests/fixtures/tablet-12.yml b/Tests/fixtures/tablet-12.yml index d12364b523..4a44d267c7 100644 --- a/Tests/fixtures/tablet-12.yml +++ b/Tests/fixtures/tablet-12.yml @@ -5305,7 +5305,7 @@ engine_version: 138.0.7204.169 device: type: tablet - brand: TechPad + brand: Tech Pad model: "832" os_family: Android browser_family: Chrome @@ -6271,7 +6271,7 @@ engine_version: 142.0.7444.121 device: type: tablet - brand: HeadWolf + brand: Headwolf model: WPad5 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tablet-3.yml b/Tests/fixtures/tablet-3.yml index f6065c0ba9..7feeb1f5cf 100644 --- a/Tests/fixtures/tablet-3.yml +++ b/Tests/fixtures/tablet-3.yml @@ -1165,7 +1165,7 @@ engine_version: 42.0.2311.111 device: type: tablet - brand: MTC + brand: MTS model: "1078" os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-4.yml b/Tests/fixtures/tablet-4.yml index 2209a4d06d..2e330f872e 100644 --- a/Tests/fixtures/tablet-4.yml +++ b/Tests/fixtures/tablet-4.yml @@ -117,7 +117,7 @@ engine_version: "534.30" device: type: tablet - brand: Roadrover + brand: RoadRover model: ChangAn S os_family: Android browser_family: Android Browser @@ -6939,7 +6939,7 @@ engine_version: 60.0.3112.116 device: type: tablet - brand: TechPad + brand: Tech Pad model: S813G os_family: Android browser_family: Chrome @@ -6955,7 +6955,7 @@ version: 42.0.0.27.114 device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB 7 os_family: Android browser_family: Unknown @@ -6973,7 +6973,7 @@ engine_version: "534.30" device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB 70dc os_family: Android browser_family: Android Browser @@ -6991,7 +6991,7 @@ engine_version: 64.0.3282.137 device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB 781+ os_family: Android browser_family: Chrome @@ -7009,7 +7009,7 @@ engine_version: "533.1" device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB 781+ os_family: Android browser_family: Unknown @@ -7027,7 +7027,7 @@ engine_version: 37.0.2062.117 device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB C1081HD os_family: Android browser_family: Opera @@ -7045,7 +7045,7 @@ engine_version: "534.30" device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB Dual C1081+ os_family: Android browser_family: Android Browser @@ -7063,7 +7063,7 @@ engine_version: 48.0.2564.95 device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB i700 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-5.yml b/Tests/fixtures/tablet-5.yml index 8dd5202170..c7492e2359 100644 --- a/Tests/fixtures/tablet-5.yml +++ b/Tests/fixtures/tablet-5.yml @@ -3128,7 +3128,7 @@ device: type: tablet brand: Nabi - model: Dream Tab HD 8.0" + model: Dreamtab HD 8.0" os_family: Android browser_family: Chrome - @@ -3146,7 +3146,7 @@ device: type: tablet brand: Nabi - model: Dream Tab HD 8.0" + model: Dreamtab HD 8.0" os_family: Android browser_family: Chrome - @@ -5663,7 +5663,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: EvroMedia + brand: Evromedia model: Play Pad 3G Note XL os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-6.yml b/Tests/fixtures/tablet-6.yml index 2e5cd32bcc..cf1cd4c1fd 100644 --- a/Tests/fixtures/tablet-6.yml +++ b/Tests/fixtures/tablet-6.yml @@ -4762,7 +4762,7 @@ engine_version: 92.0.4515.115 device: type: tablet - brand: TechPad + brand: Tech Pad model: 3G-16 os_family: Android browser_family: Chrome @@ -5696,7 +5696,7 @@ engine_version: 95.0.4638.50 device: type: tablet - brand: Neon IQ + brand: Neoniq model: Tab 10.1" 4G os_family: Android browser_family: Chrome @@ -5714,7 +5714,7 @@ engine_version: 70.0.3538.110 device: type: tablet - brand: Neon IQ + brand: Neoniq model: Tab 10.1" 3G os_family: Android browser_family: Chrome @@ -5732,7 +5732,7 @@ engine_version: "" device: type: tablet - brand: Neon IQ + brand: Neoniq model: Tab 7" 3G os_family: Android browser_family: Android Browser @@ -5750,7 +5750,7 @@ engine_version: 39.0.0.0 device: type: tablet - brand: Neon IQ + brand: Neoniq model: Tab 7" WiFi os_family: Android browser_family: Chrome @@ -8162,7 +8162,7 @@ engine_version: 88.0.4324.152 device: type: tablet - brand: TAG Tech + brand: TAGTech model: Tab II os_family: Android browser_family: Chrome @@ -8180,7 +8180,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: TAG Tech + brand: TAGTech model: Tab III os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-7.yml b/Tests/fixtures/tablet-7.yml index 6c5d65b5fc..1611f9e27d 100644 --- a/Tests/fixtures/tablet-7.yml +++ b/Tests/fixtures/tablet-7.yml @@ -2207,7 +2207,7 @@ engine_version: 95.0.4638.74 device: type: tablet - brand: COMPUMAX + brand: Compumax model: Blue S10 os_family: Android browser_family: Chrome @@ -3215,7 +3215,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: TechPad + brand: Tech Pad model: i700 os_family: Android browser_family: Chrome @@ -6111,7 +6111,7 @@ engine_version: 84.0.4147.89 device: type: tablet - brand: HannSpree + brand: HANNspree model: HSG1376 os_family: Android browser_family: Chrome @@ -9061,7 +9061,7 @@ engine_version: 107.0.0.0 device: type: tablet - brand: Neon IQ + brand: Neoniq model: NQT-1013GIQ11 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-8.yml b/Tests/fixtures/tablet-8.yml index a9c5ea8cc2..37272e7027 100644 --- a/Tests/fixtures/tablet-8.yml +++ b/Tests/fixtures/tablet-8.yml @@ -175,7 +175,7 @@ engine_version: 84.0.4147.111 device: type: tablet - brand: TechPad + brand: Tech Pad model: 10Z os_family: Android browser_family: Chrome @@ -2225,7 +2225,7 @@ engine_version: 102.0.5005.125 device: type: tablet - brand: iXTech + brand: i-Xtech model: IX701 os_family: Android browser_family: Chrome @@ -2711,7 +2711,7 @@ engine_version: 81.0.4044.138 device: type: tablet - brand: TechPad + brand: Tech Pad model: "816" os_family: Android browser_family: Chrome @@ -2747,7 +2747,7 @@ engine_version: 81.0.4044.96 device: type: tablet - brand: TechPad + brand: Tech Pad model: 816x os_family: Android browser_family: Chrome @@ -2801,7 +2801,7 @@ engine_version: 80.0.3987.99 device: type: tablet - brand: Touch Plus + brand: Touch+ model: 770G os_family: Android browser_family: Chrome @@ -2819,7 +2819,7 @@ engine_version: 80.0.3987.99 device: type: tablet - brand: Touch Plus + brand: Touch+ model: 770N os_family: Android browser_family: Chrome @@ -3629,7 +3629,7 @@ engine_version: 103.0.0.0 device: type: tablet - brand: Touch Plus + brand: Touch+ model: 1100AS os_family: Android browser_family: Chrome @@ -6453,7 +6453,7 @@ engine_version: 83.0.4103.106 device: type: tablet - brand: HannSpree + brand: HANNspree model: HSG1351 os_family: Android browser_family: Chrome @@ -7621,7 +7621,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: TechPad + brand: Tech Pad model: XTAB C981HD os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tablet-9.yml b/Tests/fixtures/tablet-9.yml index 4106b2fac7..e83f605c86 100644 --- a/Tests/fixtures/tablet-9.yml +++ b/Tests/fixtures/tablet-9.yml @@ -3203,7 +3203,7 @@ engine_version: 109.0.0.0 device: type: tablet - brand: HeadWolf + brand: Headwolf model: HPad2 os_family: Android browser_family: Chrome @@ -3725,7 +3725,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: iRobot + brand: I.Robot model: PALADIN EVO os_family: Android browser_family: Chrome @@ -4371,7 +4371,7 @@ engine_version: 79.0.3945.93 device: type: tablet - brand: BluSlate + brand: Bluslate model: Educational Tablet 7 os_family: Android browser_family: Chrome @@ -4389,7 +4389,7 @@ engine_version: 79.0.3945.136 device: type: tablet - brand: BluSlate + brand: Bluslate model: Educational Tablet 6 os_family: Android browser_family: Chrome @@ -6023,7 +6023,7 @@ engine_version: 108.0.0.0 device: type: tablet - brand: RedLine + brand: Redline model: Space M10 os_family: Android browser_family: Chrome @@ -6887,7 +6887,7 @@ engine_version: 30.0.0.0 device: type: tablet - brand: GFive + brand: G'Five model: GPad701 os_family: Android browser_family: Chrome @@ -6995,7 +6995,7 @@ engine_version: 80.0.3987.87 device: type: tablet - brand: GFive + brand: G'Five model: GPad701 os_family: Android browser_family: Chrome @@ -7013,7 +7013,7 @@ engine_version: 84.0.4147.89 device: type: tablet - brand: GFive + brand: G'Five model: GPad702 os_family: Android browser_family: Chrome @@ -8399,7 +8399,7 @@ engine_version: 112.0.0.0 device: type: tablet - brand: HannSpree + brand: HANNspree model: HSG1416 os_family: Android browser_family: Chrome @@ -8561,7 +8561,7 @@ engine_version: 74.0.3729.112 device: type: tablet - brand: TechPad + brand: Tech Pad model: 7QC os_family: Android browser_family: Chrome @@ -8579,7 +8579,7 @@ engine_version: 73.0.3683.90 device: type: tablet - brand: TechPad + brand: Tech Pad model: 10QC os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml index 5ec8c79925..53b73e2028 100644 --- a/Tests/fixtures/tv-1.yml +++ b/Tests/fixtures/tv-1.yml @@ -1893,7 +1893,7 @@ engine_version: 76.0.3809.111 device: type: tv - brand: YASIN + brand: Yasin model: "2K Smart TV" os_family: Android browser_family: Chrome @@ -2249,7 +2249,7 @@ engine_version: 90.0.4430.91 device: type: tv - brand: MTC + brand: MTS model: SB-317 os_family: Android browser_family: Chrome @@ -5395,7 +5395,7 @@ engine_version: 97.0.4692.98 device: type: tv - brand: MTC + brand: MTS model: SuperWave DV8304-C os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-2.yml b/Tests/fixtures/tv-2.yml index 8be68eb605..1943f55ad7 100644 --- a/Tests/fixtures/tv-2.yml +++ b/Tests/fixtures/tv-2.yml @@ -2063,7 +2063,7 @@ engine_version: 111.0.0.0 device: type: tv - brand: MTC + brand: MTS model: SB-303 os_family: Android browser_family: Chrome @@ -2081,7 +2081,7 @@ engine_version: 110.0.5481.65 device: type: tv - brand: MTC + brand: MTS model: DV8235 os_family: Android browser_family: Chrome @@ -2351,7 +2351,7 @@ engine_version: 112.0.5615.135 device: type: tv - brand: YASIN + brand: Yasin model: 2K Smart TV os_family: Android browser_family: Unknown @@ -5338,7 +5338,7 @@ engine_version: 88.0.4324.182 device: type: tv - brand: AWOX + brand: Awox model: 43V35KE os_family: GNU/Linux browser_family: Chrome @@ -7088,7 +7088,7 @@ engine_version: 98.0.4758.87 device: type: tv - brand: Gplus + brand: GPLUS model: 50PU744N os_family: Android browser_family: Chrome @@ -7268,7 +7268,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: AWOX + brand: Awox model: B213200SW os_family: Other Mobile browser_family: Chrome @@ -7340,7 +7340,7 @@ engine_version: 84.0.4147.140 device: type: tv - brand: We. by Loewe. + brand: We. by Loewe model: 43A71FEVS os_family: GNU/Linux browser_family: Opera @@ -8690,7 +8690,7 @@ engine_version: 86.0.4240.198 device: type: tv - brand: MTC + brand: MTS model: Redbox Mini 5 os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml index 1123cb5156..6c35e64f98 100644 --- a/Tests/fixtures/tv-3.yml +++ b/Tests/fixtures/tv-3.yml @@ -495,7 +495,7 @@ engine_version: 84.0.4147.140 device: type: tv - brand: We. by Loewe. + brand: We. by Loewe model: 40A35EEVS os_family: GNU/Linux browser_family: Opera @@ -513,7 +513,7 @@ engine_version: 84.0.4147.140 device: type: tv - brand: We. by Loewe. + brand: We. by Loewe model: 50A683FEVS os_family: GNU/Linux browser_family: Opera @@ -3689,7 +3689,7 @@ engine_version: 83.0.4103.120 device: type: tv - brand: Heimat + brand: Heimät model: H43PU2303SVF os_family: Android browser_family: Unknown @@ -3797,7 +3797,7 @@ engine_version: 122.0.6261.105 device: type: tv - brand: MTC + brand: MTS model: DV9135 os_family: Android browser_family: Chrome @@ -4445,7 +4445,7 @@ engine_version: 123.0.6312.118 device: type: tv - brand: CADENA + brand: Cadena model: Pro A CSB-231 os_family: Android browser_family: Unknown @@ -5489,7 +5489,7 @@ engine_version: 106.0.0.0 device: type: tv - brand: SoulLink + brand: SOULLINK model: S1 os_family: Android browser_family: Chrome @@ -6965,7 +6965,7 @@ engine_version: 124.0.6367.124 device: type: tv - brand: YASIN + brand: Yasin model: 4K G Smart TV os_family: Android browser_family: Unknown @@ -6983,7 +6983,7 @@ engine_version: 124.0.6367.124 device: type: tv - brand: YASIN + brand: Yasin model: 2K G Smart TV os_family: Android browser_family: Unknown @@ -9197,7 +9197,7 @@ engine_version: 83.0.4103.120 device: type: tv - brand: Heimat + brand: Heimät model: H65PU2303SVF os_family: Android browser_family: Unknown @@ -9323,7 +9323,7 @@ engine_version: 126.0.6478.134 device: type: tv - brand: MTC + brand: MTS model: DV9157 os_family: Android browser_family: Unknown diff --git a/Tests/fixtures/tv-4.yml b/Tests/fixtures/tv-4.yml index a1c829fc68..38c1445add 100644 --- a/Tests/fixtures/tv-4.yml +++ b/Tests/fixtures/tv-4.yml @@ -1503,7 +1503,7 @@ engine_version: 126.0.6478.134 device: type: tv - brand: YASIN + brand: Yasin model: 4K Smart TV os_family: Android browser_family: Unknown @@ -1521,7 +1521,7 @@ engine_version: 81.0.4044.111 device: type: tv - brand: YASIN + brand: Yasin model: 2K Smart TV os_family: Android browser_family: Unknown @@ -2357,7 +2357,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: AWOX + brand: Awox model: B213900SW os_family: Other Mobile browser_family: Unknown @@ -3311,7 +3311,7 @@ engine_version: 97.0.4280.88 device: type: tv - brand: Top-Tech + brand: TopTech model: Smart TV (2022) os_family: Other Smart TV browser_family: Chrome @@ -5039,7 +5039,7 @@ engine_version: 53.0.2785.143 device: type: tv - brand: GN Electronics + brand: G N Electronics model: Smart TV (2017) os_family: GNU/Linux browser_family: Opera @@ -5192,7 +5192,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: AWOX + brand: Awox model: B213200SW os_family: Other Mobile browser_family: Unknown @@ -5534,7 +5534,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: RedLine + brand: Redline model: S800 Max os_family: Android browser_family: Chrome @@ -5552,7 +5552,7 @@ engine_version: 122.0.6261.119 device: type: tv - brand: RedLine + brand: Redline model: S700 Max os_family: Android browser_family: Chrome @@ -5570,7 +5570,7 @@ engine_version: 122.0.6261.119 device: type: tv - brand: RedLine + brand: Redline model: S600 Max os_family: Android browser_family: Chrome @@ -5642,7 +5642,7 @@ engine_version: 122.0.6261.119 device: type: tv - brand: RedLine + brand: Redline model: IP-60 Max os_family: Android browser_family: Chrome @@ -5660,7 +5660,7 @@ engine_version: 74.0.3729.186 device: type: tv - brand: RedLine + brand: Redline model: IP-70 Max os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/tv-5.yml b/Tests/fixtures/tv-5.yml index 3678fd31e4..2cac662116 100644 --- a/Tests/fixtures/tv-5.yml +++ b/Tests/fixtures/tv-5.yml @@ -679,7 +679,7 @@ engine_version: 72.0.3626.121 device: type: tv - brand: RedLine + brand: Redline model: IP-80 Max os_family: Android browser_family: Chrome @@ -1357,7 +1357,7 @@ engine_version: 69.0.3497.100 device: type: tv - brand: DuoTV + brand: duoTV model: Smart TV os_family: Android browser_family: Chrome @@ -1535,7 +1535,7 @@ version: 8.1.4 device: type: tv - brand: RedLine + brand: Redline model: RED360 Air 8K os_family: Android browser_family: Unknown @@ -3189,7 +3189,7 @@ engine_version: 141.0.7390.122 device: type: tv - brand: CADENA + brand: Cadena model: Pro A CSB-230 os_family: Android browser_family: Unknown @@ -3207,7 +3207,7 @@ engine_version: 141.0.7390.97 device: type: tv - brand: CADENA + brand: Cadena model: Pro A3 CSB-242 os_family: Android browser_family: Unknown @@ -3773,7 +3773,7 @@ engine_version: 68.0.3440.106 device: type: tv - brand: AWOX + brand: Awox model: 65A6500USWF os_family: Other Mobile browser_family: Chrome @@ -4223,7 +4223,7 @@ engine_version: 88.0.4324.182 device: type: tv - brand: AWOX + brand: Awox model: "" os_family: GNU/Linux browser_family: Chrome @@ -5240,7 +5240,7 @@ engine_version: 87.0.4280.88 device: type: tv - brand: MTC + brand: MTS model: MTC4KD55SWOS os_family: Other Mobile browser_family: Unknown @@ -5258,7 +5258,7 @@ engine_version: 88.0.4324.182 device: type: tv - brand: MTC + brand: MTS model: "" os_family: GNU/Linux browser_family: Chrome @@ -5528,7 +5528,7 @@ engine_version: 88.0.4324.182 device: type: tv - brand: AWOX + brand: Awox model: Smart TV (2022) os_family: GNU/Linux browser_family: Chrome diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml index 9f0a96ccf7..6526747c40 100644 --- a/Tests/fixtures/tv.yml +++ b/Tests/fixtures/tv.yml @@ -1318,7 +1318,7 @@ engine_version: 2.10.287 device: type: tv - brand: BangOlufsen + brand: Bang & Olufsen model: BeoVision os_family: GNU/Linux browser_family: Opera @@ -1336,7 +1336,7 @@ engine_version: 2.10.287 device: type: tv - brand: BangOlufsen + brand: Bang & Olufsen model: BeoVision os_family: GNU/Linux browser_family: Opera @@ -1390,7 +1390,7 @@ engine_version: "" device: type: tv - brand: CreNova + brand: Crenova model: CNV001 os_family: GNU/Linux browser_family: Opera @@ -1408,7 +1408,7 @@ engine_version: 2.9.167 device: type: tv - brand: CreNova + brand: Crenova model: CNV001 os_family: GNU/Linux browser_family: Opera @@ -6868,7 +6868,7 @@ engine_version: 38.0.2125.122 device: type: tv - brand: X.Vision + brand: XVISION model: "" os_family: GNU/Linux browser_family: Opera @@ -9173,7 +9173,7 @@ engine_version: 55.0.2883.91 device: type: tv - brand: MTC + brand: MTS model: 2K Android TV os_family: Android browser_family: Chrome @@ -9191,7 +9191,7 @@ engine_version: 55.0.2883.91 device: type: tv - brand: MTC + brand: MTS model: 4K Android TV os_family: Android browser_family: Chrome diff --git a/Tests/fixtures/wearable.yml b/Tests/fixtures/wearable.yml index dfd3983022..7d442d9824 100644 --- a/Tests/fixtures/wearable.yml +++ b/Tests/fixtures/wearable.yml @@ -1064,7 +1064,7 @@ engine_version: 94.0.4606.71 device: type: wearable - brand: Gocomma + brand: Go,Comma model: W5 os_family: Android browser_family: Chrome diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml index 1076ffc292..0d6ca54a31 100644 --- a/regexes/client/browsers.yml +++ b/regexes/client/browsers.yml @@ -1138,9 +1138,9 @@ name: 'Phantom Browser' version: '$1' -# AwoX (https://www.awox.com.tr/) +# Awox (https://www.awox.com.tr/) - regex: 'AwoX(?:/(\d+[.\d]+))? Browser' - name: 'AwoX' + name: 'Awox' version: '$1' # Zetakey (https://www.zetakey.com/) diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml index 1a5ad88da4..757a3b754e 100644 --- a/regexes/device/mobiles.yml +++ b/regexes/device/mobiles.yml @@ -4395,8 +4395,8 @@ Blu: - regex: 'blu[ _]([^/;]+)( Build|[);])' model: '$1' -# Bluegood -Bluegood: +# BlueGood +BlueGood: regex: 'BLUEGOOD' device: 'smartphone' models: @@ -7717,8 +7717,8 @@ DEXP: - regex: 'DEXP[ _]([^);/]+)(?:[);/ ]|$)' model: '$1' -# DbPhone -DbPhone: +# dbPhone +dbPhone: regex: 'DB8PLUS' device: 'smartphone' model: 'DB8 Plus' @@ -7781,8 +7781,8 @@ Digicel: - regex: 'DIGICEL[ _]([^/);]+)(?: Build|[;)])' model: '$1' -# Digidragon -Digidragon: +# DigiDragon +DigiDragon: regex: '(?:DS502|DS6018|DS6261)(?:[);/ ]|$)' device: 'smartphone' models: @@ -7838,8 +7838,8 @@ Digit: - regex: 'Digit4G[ -](Energy|Pro)' model: 'Digit4G $1' -# Compumax or COMPUMAX COMPUTER S.A.S (www.compumax.com.co) -COMPUMAX: +# Compumax or COMPUMAX COMPUTER S.A.S (www.compumax.com.co) +Compumax: regex: 'BlueS10(?:[);/ ]|$)' device: 'tablet' models: @@ -9575,8 +9575,8 @@ evvoli: - regex: 'EVVOLI,([a-z0-9_ -]+),(?:wired|wireless)' model: '$1' -# EvroMedia -EvroMedia: +# Evromedia (https://www.evromedia.eu/) +Evromedia: regex: 'EVROMEDIA|Playpad[ _]|PLAY_PAD_PRO_XL|3G NOTE XL' device: 'tablet' models: @@ -10744,8 +10744,8 @@ Haier: model: '$1' device: 'feature phone' -# HannSpree (hannspree.eu) -HannSpree: +# HANNspree (https://www.hannspree.eu) +HANNspree: regex: '(HSG[0-9]{4})|SN97T41W|SN1AT71W\(B\)|SN70T51A|SN70T31?|T7-QC' device: 'tablet' models: @@ -10861,8 +10861,8 @@ Toshiba: - regex: 'portalmmm/[12]\.0 (TS[a-z0-9 ]+)' model: '$1' -# AWOX (https://www.awox.com.tr/) -AWOX: +# Awox (https://www.awox.com.tr/) +Awox: regex: 'AWOX(?:_oem)?;|B213[29]00SW(?:[);/ ]|$)' device: 'tv' models: @@ -14090,8 +14090,8 @@ InnJoo: - regex: 'VISION LTE' model: 'Vision LTE' -# Inkti -Inkti: +# Intki +Intki: regex: 'intki[ _]([^/;]*)[ _]Build' device: 'smartphone' model: '$1' @@ -15091,8 +15091,8 @@ Kumai: - regex: '(?:KM-)?Kumai[ _-]?([a-z0-9_-]+)' model: '$1' -# KT-Tech -KT-Tech: +# KT Tech +KT Tech: regex: '(KM-[a-z0-9]{3,}|EV-[a-z0-9]+)(?:[);/ ]|$)' device: 'smartphone' model: '$1' @@ -23028,8 +23028,8 @@ Roku: - regex: '' model: 'Digital Video Player' -# Rokit or ROKiT (rokitphones.com) -Rokit: +# ROKiT (https://rokitphones.com) +ROKiT: regex: '(?:IO (?:Pro|3D|Light)|Orb S)(?:[);/ ]|$)' device: 'smartphone' models: @@ -23066,8 +23066,8 @@ Rover Computers: - regex: 'RoverPad (10\.4|Air S70|9\.7 3G|Sky 9\.7|3W A73|3W7|3WT70|3W9\.4)(?:[);/ ]|$)' model: '$1' -# Roadrover -Roadrover: +# RoadRover (https://www.linkedin.com/company/shenzhen-roadrover-technology-co.-ltd./ or https://www.facebook.com/roadrovercn/) +RoadRover: regex: 'Roadrover ChangAn S' device: 'tablet' model: 'ChangAn S' @@ -27749,8 +27749,8 @@ Techmade: - regex: 'TECHSMART[_ ]([^/;)]+)(?: Build|[);])' model: 'TechSmart $1' -# TechPad (techpad.mx) -TechPad: +# Tech Pad (https://techpad.mx) +Tech Pad: regex: 'Tech[ _]?pad|XTAB[ _-]|(?:3G_16|Dual (?:C1081HD|C981HD)|S813G|NOTE[_ ]4CAM|M5(?:Go|Plus)|M6Plus|Android 8(?:[\d.]*);(?: [\w-]+;)? 816x?)(?:[);/ ]|$)' device: 'tablet' models: @@ -28436,8 +28436,8 @@ Uniscope: - regex: 'Uniscope[ _-]?([^);/ ]+)' model: '$1' -# Unistrong -Unistrong: +# UniStrong (http://en.unistrong.com/About.asp) +UniStrong: regex: '(UT10)(?:[;/) ]|$)' device: 'smartphone' model: '$1' @@ -29721,8 +29721,8 @@ Wolki: - regex: 'WS067' model: 'W6 Pro' -# Wonu -Wonu: +# Wonu Telecom (https://www.mobilephonemuseum.com/phone-detail/wonu-83 | https://bbs.fobshanghai.com/company/167et39daq65389.html) +Wonu Telecom: regex: 'Wonu ([a-z0-9]+)' device: 'feature phone' model: '$1' @@ -32816,8 +32816,8 @@ ZALA: device: 'tv' model: '$1' -# MTC (MTS) -MTC: +# MTS (previously MTC, but proper and official latinization is MTS) +MTS: regex: 'MTC[;,)]|MTC[ _](968|97[82]|970|982[OT]?|1078)|(?:MTC[_ ])?SMART[ _]?(?:Race[2]?|Sprint|Run|Turbo|Surf[2]?)[ _]4G|MTC975|Smart Bit|Smart_(?:LINE|Light)|(?:MTC[ _])?SMART[ _](?:Run|Start[_ ][23])|Redbox Mini 5\(MTS\)|MTS TV|DV8235|DV9135|DV9157-C|DV8304-C|Osmartphona|MTC([a-z0-9-]+)' device: 'smartphone' models: @@ -33789,8 +33789,8 @@ Mystery: device: 'tv' model: '$1' -# Ritzviva -Ritzviva: +# RitzViva +RitzViva: regex: '(RITZVIVA[_ ]S500C)(?:[);/ ]|$)' device: 'smartphone' model: 'S500C' @@ -33815,8 +33815,8 @@ Runbo: device: 'tablet' model: 'P2' -# NewsMy -NewsMy: +# Newsmy +Newsmy: regex: '(CarPad-(?:II|III)-P)(?:[);/ ]|$)' device: 'car browser' model: '$1' @@ -34051,8 +34051,8 @@ Protruly: device: 'smartphone' model: '$1' -# JFone -JFone: +# jFone +jFone: regex: 'JFone[ _](JS501)(?:[);/ ]|$)' device: 'smartphone' model: '$1' @@ -34567,8 +34567,8 @@ Orbic: device: 'tablet' model: 'Tab8 5G' -# RedLine (redline.com.tr) -RedLine: +# Redline (redline.com.tr) +Redline: regex: '(?:Space_M10|S[678]00[ _]MAX|IP-[678]0 MAX|RED360 Air 8K)(?:[);/ ]|$)' device: 'tv' models: @@ -36562,8 +36562,8 @@ Hometech: - regex: 'HT[ _](7RT|8MZ)(?:[);/ ]|$)' model: 'HT $1' -# ExMobile (www.exmobile.my) -ExMobile: +# EXMobile (https://deviceatlas.com/device-data/devices/exmobile) +EXMobile: regex: '(?:EX(?:29|45)i|CHAT_5\+)(?:[);/ ]|$)' device: 'smartphone' models: @@ -37645,8 +37645,8 @@ Ordissimo: device: 'smartphone' model: '$1' -# Necnot (necnontrade.com) -Necnot: +# Necnon (necnontrade.com) +Necnon: regex: '(M002[DGQK]-2|M002N|M002N-3T|M002W-2T|6M-3T)(?:[);/ ]|$)' device: 'tablet' model: '$1' @@ -38365,8 +38365,8 @@ mipo: device: 'smartphone' model: '$1' -# Naomi Phone -Naomi Phone: +# NaomiPhone (https://www.facebook.com/NaomiPhone/) +NaomiPhone: regex: '(?:NAOMIPHONE Ambar|DAMMAR)(?:[);/ ]|$)' device: 'smartphone' models: @@ -38546,7 +38546,7 @@ Nabi: device: 'tablet' models: - regex: 'DMTAB-(?:IN08A|NV08B)' - model: 'Dream Tab HD 8.0"' + model: 'Dreamtab HD 8.0"' - regex: 'DMTAB-NV(2[04])A' model: 'Big Tab HD $1.0"' - regex: 'NBTY07SMKG' @@ -38784,8 +38784,8 @@ BilimLand: device: 'desktop' model: 'BilimBook Mini' -# Greentel (greentelmobile.com) -Greentel: +# Greentel Mobile (greentelmobile.com now defunct, but there is https://www.linkedin.com/company/greentel-mobile) +Greentel Mobile: regex: '(?:X1_Light(?:_Lte)?)(?:[);/ ]|$)' device: 'smartphone' models: @@ -38925,7 +38925,7 @@ AIRON: model: 'Tarzan F1' # GFive or G'Five (www.gfivepakistan.com) -GFive: +G'Five: regex: 'GFIVE[_ ]|(?:PRESIDENT_GOLD_(9|10)|President Gpower 1|Stark(?![_ ]K1)|Gpad70[12]|Speedo_1|4G Ultra Pro|4G 6700|4G Style)(?:[);/ ]|$)' device: 'smartphone' models: @@ -39168,8 +39168,8 @@ SMT Telecom: - regex: 'BLAZE_X500' model: 'Blaze X500' -# Rivo -Rivo: +# Rivo Mobile (https://www.facebook.com/rivomobile/) +Rivo Mobile: regex: 'PHANTOM (?:PZ|RX)|RHYTHM[ _]RX|(?:STORM_S8(?: ?plus)?)(?:[);/ ]|$)' device: 'smartphone' models: @@ -39216,8 +39216,8 @@ Four Mobile: - regex: 'Kamba' model: 'Kamba' -# UZ Mobile or Telecom Device Pro (idevice.uz) -UZ Mobile: +# Uzmobile or UZ Mobile or Telecom Device Pro (idevice.uz (likely dead), sub-brand of https://uztelecom.uz) +Uzmobile: regex: 'Uzbekistan(?:[);/ ]|$)' device: 'smartphone' model: 'Uzbekistan' @@ -39444,8 +39444,8 @@ Elekta: - regex: 'ELED-(32)SMART(?:[);/ ]|$)' model: '$1" HD LED Smart TV' -# YASIN (yasintv.kz) -YASIN: +# Yasin (yasintv.kz | https://yasin.kz) +Yasin: regex: 'YASIN ' device: 'tv' models: @@ -40101,8 +40101,8 @@ Mitsui: device: 'smartphone' model: '$1' -# Gocomma -Gocomma: +# Go,Comma +Go,Comma: regex: 'H1-C-ALADENG' device: 'wearable' model: 'W5' @@ -40126,8 +40126,8 @@ Urovo: device: 'peripheral' model: '$1' -# Neon IQ or NeonIQ -Neon IQ: +# Neoniq (previously "Neon IQ", and technically both are used almost equally, but there is a separate nutrition brand "Neon IQ", so trying to avoid confusion) +Neoniq: regex: '(?:NQT-(?:101|7)[34]GIQ(?:11)?|NQT-7W)(?:[);/ ]|$)' device: 'tablet' models: @@ -40526,8 +40526,8 @@ Orbita: device: 'tv' model: '$1' -# TAG Tech or TAG-Tech or Talal Abu-Ghazaleh Global (www.tagtech.global) -TAG Tech: +# TAGTech or TAG Tech or TAG-Tech or Talal Abu-Ghazaleh Global (www.tagtech.global) +TAGTech: regex: '(?:TAG[ -]TAB[ -]III?|TAGPhone)(?:[);/ ]|$)' device: 'tablet' models: @@ -40671,8 +40671,8 @@ G-PLUS: - regex: 'GNE-N001S' model: 'A3' -# Gplus (gpluselectronics.com) -Gplus: +# GPLUS (gpluselectronics.com, defunct website) +GPLUS: regex: 'GTV-|(?:Gplus[ _](?:[ZXP]10\+?|N809|F53|S9701|FW6950|A2_Plus|S10)|GMC-(?:7127M|668[NM]))(?:[);/ ]|$)' device: 'smartphone' models: @@ -40863,8 +40863,8 @@ iPEGTOP: - regex: 'iPEGTOP[ _](Z26)' model: '$1' -# Jide -Jide: +# Jide Technology +Jide Technology: regex: 'Remix (?:Pro|Mini)' device: 'desktop' models: @@ -41463,8 +41463,8 @@ Infiniton: device: 'tablet' model: 'Earth 10.1" 3G' -# Backcell -Backcell: +# Bakcell (https://www.bakcell.com/en) +Bakcell: regex: '(BK2021)(?:[);/ ]|$)' device: 'smartphone' model: '$1' @@ -41754,8 +41754,8 @@ nJoy: device: 'tablet' model: '$1' -# iXTech -iXTech: +# i-Xtech (https://i-xtech.com.tr/) +i-Xtech: regex: '(IX701)(?:[);/ ]|$)' device: 'tablet' model: '$1' @@ -41784,8 +41784,8 @@ Vue Micro: device: 'tablet' model: '$1' -# Touch Plus or Touch+ -Touch Plus: +# Touch Plus or Touch+ (https://web.archive.org/web/20161204141359/http://www.touch-la.com/about-us/) +Touch+: regex: ' (770[NG]|1100AS)(?:[);/ ]|$)' device: 'tablet' model: '$1' @@ -42193,8 +42193,8 @@ Gazer: device: 'tv' model: 'Smart TV' -# WIZARPOS (www.wizarpos.com) -WizarPos: +# WizarPOS (www.wizarpos.com) +WizarPOS: regex: 'WIZARPOS[ _]([^/;)]+)(?: Build|[);])' device: 'peripheral' model: '$1' @@ -43156,8 +43156,8 @@ RelNAT: device: 'smartphone' model: '$1' -# TeloSystems or TELO or Telox (https://www.telox.com/) -TeloSystems: +# Telo Systems (most commonly used in official materials) or TeloSystems or TELO or Telox (https://www.telox.com/) +Telo Systems: regex: 'TELO[_ ](?:TE6|M5|TE580_CO)(?:[);/ ]|$)' device: 'smartphone' models: @@ -43179,8 +43179,8 @@ MIWANG: device: 'smartphone' model: '$1' -# HeadWolf (headwolf.net) -HeadWolf: +# Headwolf (headwolf.net) +Headwolf: regex: '(?:Hpad[12]|Wpad3| F3A|W5A)(?:[);/ ]|$)' device: 'tablet' models: @@ -43229,8 +43229,8 @@ PC Smart: device: 'tablet' model: 'QuickTab Plus' -# Ephone -Ephone: +# E phone +E phone: regex: '(?:EP19_star|EP19)(?:[);/ ]|$)' device: 'smartphone' models: @@ -43253,8 +43253,8 @@ YunSong: - regex: 'YS([678]) ?pro' model: 'YS$1 Pro' -# iRobot or I.Robot -iRobot: +# I.Robot (previously iRobot, but branding uses a dot, for example https://www.facebook.com/photo.php?fbid=1635573983394236&id=1634404576844510&set=a.1634820616802906) +I.Robot: regex: '(PALADIN EVO)' device: 'tablet' model: '$1' @@ -43321,8 +43321,8 @@ Pano: device: 'smartphone' model: '$1' -# Bluslate or Blu Slate -BluSlate: +# Bluslate or BluSlate or Blue Slate +Bluslate: regex: 'BLUSLATE([67])(?:[);/ ]|$)' device: 'tablet' model: 'Educational Tablet $1' @@ -43777,7 +43777,7 @@ noDROPOUT: model: '$1' # G-Fone or Gfone -Gfone: +G-Fone: regex: 'G-Fone ?(\d{1,3})' device: 'feature phone' model: '$1' @@ -44022,8 +44022,8 @@ DSDevices: device: 'tv' model: '$1' -# VOLKANO -VOLKANO: +# Volkano (https://global.volkano.com) +Volkano: regex: '(VK-740-BL)(?:[);/ ]|$)' device: 'tablet' model: '$1' @@ -44503,8 +44503,8 @@ GlocalMe: device: 'smartphone' model: 'S20i' -# Heimat -Heimat: +# Heimät +Heimät: regex: 'HEIMAT[ _](H43PU2303SVF|H65PU2303SVF)(?:[);/ ]|$)' device: 'tv' model: '$1' @@ -44594,8 +44594,8 @@ Aceline: device: 'tv' model: '$1' -# CADENA -CADENA: +# Cadena (https://smart.cadena.pro/) +Cadena: regex: 'CADENA[_ ]' device: 'tv' models: @@ -44662,14 +44662,14 @@ HOLLEBERG: device: 'tv' model: 'HGTV-LED$1' -# CEPTER (ceptertech.com) -CEPTER: - regex: 'CEPTER(TAB10[1L])' +# Cepter (https://www.ceptertech.com) +Cepter: + regex: 'CEPTERTAB(10[1L])' device: 'tablet' - model: '$1' + model: 'TAB $1' -# SoulLink -SoulLink: +# SOULLINK (https://site221241.nicepage.io/ seems defunct now, though) +SOULLINK: regex: 'Soullink[ _](S1)' device: 'tv' model: '$1' @@ -44750,8 +44750,8 @@ VNPT Technology: device: 'tablet' model: 'VNT-Tab8' -# Arival or A-Rival -Arival: +# Arival or A-Rival (http://www.a-rival.de/, but got defunct since I've found it months ago) +A-rival: regex: 'BioniQP116(?:[);/ ]|$)' device: 'tablet' model: 'Bioniq P116' @@ -44820,8 +44820,8 @@ GoldStar: device: 'tv' model: '$1' -# ANBERNIC (anbernic.com/) portable console via steamdeck -ANBERNIC: +# Anbernic (anbernic.com/) portable console via steamdeck +Anbernic: regex: '(?:RG405[VM]|RG505|RG556|RG406V|RGCUBE)(?:[);/ ]|$)' device: 'console' models: @@ -45581,8 +45581,8 @@ AileTV: device: 'tv' model: 'Smart TV' -# DuoTV -DuoTV: +# duoTV +duoTV: regex: 'duoTV' device: 'tv' model: 'Smart TV' diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 25e1be397f..c127a7b865 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -120,8 +120,8 @@ Atvio: - regex: '55D1620' model: '55D1620' -# AWOX (https://www.awox.com.tr/) -AWOX: +# Awox (https://www.awox.com.tr/) +Awox: regex: '.+AWOX[;,)]' device: 'tv' models: @@ -138,8 +138,8 @@ AYA: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# BangOlufsen -BangOlufsen: +# Bang & Olufsen (https://www.bang-olufsen.com/) +'Bang & Olufsen': regex: 'Bangolufsen' device: 'tv' model: 'BeoVision' @@ -230,8 +230,8 @@ coocaa: - regex: 'coocaa; ([a-z0-9]+);' model: '$1' -# CreNova -CreNova: +# Crenova (https://www.crenova.tv/) +Crenova: regex: 'CreNova' device: 'tv' model: 'CNV001' @@ -422,8 +422,8 @@ Funai: device: 'tv' model: '' -# GN Electronics (https://www.gnelectronics.in/) -GN Electronics: +# G N Electronics (https://www.gnelectronics.in/) +G N Electronics: regex: 'GN_ELECTRONICS[;,)]' device: 'tv' models: @@ -1092,8 +1092,8 @@ MStar: - regex: '([24])KTV18' model: '$1KTV18' -# MTC -MTC: +# MTS (previously MTC, but proper and official latinization is MTS) +MTS: regex: 'MTC[;,)]' device: 'tv' models: @@ -1640,8 +1640,8 @@ Turbo-X: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# Top-Tech -Top-Tech: +# TopTech (previously "Top-Tech", but labels do not have a hyphen, for example https://more4u.gr/shop/tileoraseis/horizonvision-android-tv-32-hd-ready/) +TopTech: regex: 'Toptech690[;,]' device: 'tv' models: @@ -1736,8 +1736,8 @@ Waltham: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# We. by Loewe. (https://we-by-loewe.com/) -We. by Loewe.: +# We. by Loewe (https://we-by-loewe.com/) +We. by Loewe: regex: 'WeByLoewe[;,)]' device: 'tv' models: @@ -1764,8 +1764,8 @@ WONDER: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' -# X.Vision -X.Vision: +# XVISION (http://www.xvisionswiss.ch/en/home/about) +XVISION: regex: 'X-VISION[;,)]' device: 'tv' model: ''