Update CedPane

README.md

@@ -48,3 +48,84 @@ Of course it goes without saying that, despite my best efforts, mistakes are pos
 I also have a separate collection of Chinese words that _are_ in typical dictionaries, with short English definitions that have either been confirmed by multiple independent sources to the extent that it is reasonable to believe they are public domain, or that I’ve written myself.  This separate collection is _not_ likely to help with software that already has a good normal dictionary, but it might be useful for developers to prototype interlinear annotators etc.  It is in the repository as [PD-English-Definitions.txt](PD-English-Definitions.txt) but has not been included in the main CedPane file.
 
 CedPane is public-domain but this Readme file is © Silas S. Brown and may be reproduced as-is.
+Accenture is a trademark of Accenture Global Services Ltd.
+Adobe is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+Android is a trademark of Google LLC.
+Apache is a registered trademark of The Apache Software Foundation.
+Apple is a trademark of Apple Inc.
+Aquabeads is a trademark of EPOCH Company Ltd.
+AstraZeneca is a trademark of the AstraZeneca group of companies.
+Auchan is a trademark of Groupe Auchan.
+Baidu is a trademark of Baidu Online Network Technology (Beijing) Co. Ltd.
+Bing is a registered trademark of Microsoft Corp.
+BitBucket is a trademark of Atlassian Pty Ltd.
+Bluetooth is a registered trademark held by the Bluetooth Special Interest Group.
+Bosch is a trademark of Robert Bosch GMBH.
+Bvlgari is a trademark of Bulgari SpA.
+Cadillac is a trademark and/or registered trademark of General Motors LLC.
+Carrefour is a trademark of Carrefour of Boulogne-Billancourt, France.
+CNN is a trademark of Cable News Network Inc.
+Cognac is a trademark which is held by France.
+Colgate is a trademark of the Colgate-Palmolive Company.
+Comcast is a trademark of Comcast Corporation.
+Dettol was a trademark of Reckitt & Colman (Overseas) Limited but I was unable to confirm its current status.
+Dyson is a trademark of Dyson Technology Ltd.
+Electrolux is a trademark of Aktiebolaget Electrolux.
+Ericsson is a trademark or registered trademark of Telefonaktiebolaget LM Ericsson.
+Facebook is a trademark of Facebook, Inc.
+Funai is a trademark of Funai Electric Co., Ltd.
+GameStop is a trademark of GameStop, Inc.
+Git is a trademark of the Software Freedom Conservancy.
+GitHub is a trademark of GitHub Inc.
+Google is a trademark of Google LLC.
+Google Maps is a trademark of Google LLC.
+Gucci is a trademark of Gucci America, Inc.
+Heinz is a trademark of H. J. Heinz Company.
+Hermès is a trademark of H51.
+HTC and Touch are trademarks of HTC Corporation.
+Huawei is a trademark of Huawei Technologies Co., Ltd registered in China and other countries.
+Indesit is a trademark of Indesit Company S.P.A.
+Intel is a trademark of Intel Corporation or its subsidiaries.
+Java is a registered trademark of Oracle Corporation in the US and possibly other countries.
+Javascript is a trademark of Oracle Corporation in the US.
+LinkedIn is a registered trademark or trademark of LinkedIn Corporation and its affiliates in the United States and/or other countries.
+Mac is a trademark of Apple Inc.
+Maglite is a registered trademark of Mag Instrument, Inc.
+Microsoft is a registered trademark of Microsoft Corp.
+Nike is a trademark of Nike Inc.
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates.
+Oreo is a registered trademark of Intercontinental Great Brands LLC.
+Palmolive is a trademark of the Colgate-Palmolive Company.
+Picture Exchange Communication System is a registered trademark of Pyramid Educational Consultants, Inc.
+Pimsleur is a registered trademark of Beverly Pimsleur exclusively licensed to Simon & Schuster.
+Pizza Hut is a trademark of Pizza Hut Inc.
+Porsche is a trademark of Dr. Ing. h.c.F. Porsche AG.
+Prada is a trademark of Prada.
+Python is a trademark of the Python Software Foundation.
+QR Code is the UK registered trademark of Denso Corporation.
+Quaker is a trademark of The Quaker Oats Company.
+Raspberry Pi is a trademark of the Raspberry Pi Foundation.
+Segway is a trademark of Segway Inc.
+Sibelius is a registered trademark of Avid Technology, Inc. or its subsidiaries.
+Star Trek is a trademark of CBS Studios Inc. / Paramount.
+TeX is a trademark of the American Mathematical Society.
+Thermos is a trademark of Thermos LLC.
+Toshiba is a trademark of Tokyo Shibaura Denki Kabushiki Kaisha, also called Kabushiki Kaisha Toshiba.
+Twitter and Tweet are trademarks of Twitter Inc.
+Uber is a trademark of Uber Technologies, Inc.
+UltraCane is a trademark owned by Sound Foresight Ltd.
+Unilever is a trademark either owned or used under license by Unilever PLC/Unilever NV and affiliates.
+Velcro is a registered trademark of Velcro Industries B.V.
+Walmart is a trademark and brand of Walmart Apollo, LLC.
+WeChat is a trademark of Tencent Holdings Limited.
+Weibo is a trademark of Sina.Com Technology (China) Co. Ltd.
+Wenlin is a trademark of Wenlin Institute, Inc. SPC.
+WhatsApp is a trademark of WhatsApp Inc., registered in the U.S. and other countries.
+Whirlpool is a trademark of Whirlpool Properties, Inc.
+Wi-Fi is a trademark of the Wi-Fi Alliance.
+Wikipedia is a registered trademark of the Wikimedia Foundation Inc.
+Windows is a registered trademark of Microsoft Corp.
+Wyeth is a trademark of Wyeth LLC.
+YouTube is a trademark of Google Inc.
+Zoom is a trademark of Zoom Video Communications, Inc.
+Any other trademarks I mentioned without realising are trademarks of their respective holders.

cedpane.txt

@@ -2356,6 +2356,7 @@ Apsey	阿普西	阿普西	Āpǔxī	A-póu-sāi
 Apsley	阿普斯利	阿普斯利	Āpǔsīlì	A-póu-sī-leih	
 Apter	阿普特	阿普特	Āpǔtè	A-póu-dahk	ˈæptɚ
 Apthorp	阿普索普	阿普索普	Āpǔsuǒpǔ	A-póu-sok-póu	
+Aquabeads (toy introduced 2004)	水雾魔珠	水霧魔珠	Shuǐwù Mó Zhū	Séui-mouh Mō Jyū	
 a quarter	四分之一	四分之一	sì fēnzhī yī	sei fahn-jī yāt	
 a quarter (less common translation)	四份一	四份一	sì fèn yī	sei fahn yāt	
 aquifer	蓄水层	蓄水層	xùshuǐcéng	chūk-séui-chàhng	
@@ -18122,6 +18123,7 @@ flat cakes with honey	蜜饼	蜜餅	mìbǐng	maht-béng
 Flaten (name)	弗拉滕	弗拉滕	Fúlāténg	Fāt-lāai-tàhng	
 Flatley	弗拉特利	弗拉特利	Fúlātèlì	Fāt-lāai-dahk-leih	
 flatter someone in power; hug big legs (of Buddha statue)	抱大腿	抱大腿	bào dàtuǐ	póuh daaih-téui	
+<topol.> flaunt; show off	嘚瑟	嘚瑟	dēsè	dāk-sāt	
 Flavell	弗拉维尔	弗拉維爾	Fúlāwéi'ěr	Fāt-lāai-wàih-yíh	
 Flavia	弗拉维娅	弗拉維婭	Fúlāwéiyà	Fāt-lāai-wàih-a	
 Flavia	芙拉维亚	芙拉維亞	Fúlāwéiyà	Fùh-lāai-wàih-nga	
@@ -19801,6 +19803,7 @@ gate of the south	南门楼	南門樓	nánménlóu	nàahm-mùhn-làuh
 gate of Zebulun	西布伦门	西布倫門	Xībùlúnmén	Sāi-bou-lèuhn-mùhn	
 Gater; Guyett	盖特	蓋特	Gàitè	Goi-dahk	
 Gates (Bill)	盖茨	蓋茨	Gàicí	Goi-chìh	
+<elec.> gate voltage	门电压	門電壓	méndiànyā	mùhn-dihn-ngaat	
 <comp.> gateway (hardware?)	网关	網關	wǎngguān	móhng-gwāan	
 <comp.> gateway (hardware)	网间连接器	網間連接器	wǎngjiān liánjiēqì	móhng-gāan lìhn-jip-hei	
 Gatewood	盖特五德	蓋特五德	Gàitèwǔdé	Goi-dahk-ńgh-dāk	
@@ -23274,6 +23277,7 @@ haven't heard (of)	没听说过	沒聽說過	méi tīngshuōguo	muht ting-syut-g
 Havenaar	哈文纳尔	哈文納爾	Hāwénnà'ěr	Hā-màhn-naahp-yíh	
 have nothing to do with (lit. don't take notice of)	不要理会	不要理會	bùyàolǐhuì	bāt-yiu-léih-wuih	
 have opportunity to	有机会	有機會	yǒu jīhuì	yáuh gēi-wuih	
+<netspeak> have or haven't	有木有	有木有	yǒu mù yǒu	yáuh muhk yáuh	
 have or haven't	有没有	有沒有	yǒu méi yǒu	yáuh muht yáuh	
 Haverfordwest	哈弗福德韦斯特	哈弗福德韋斯特	Hāfúfúdéwéisītè	Hā-fāt-fūk-dāk-wáih-sī-dahk	hˌævəfədwˈɛst
 Haverkamp	哈弗坎普	哈弗坎普	Hāfúkǎnpǔ	Hā-fāt-hām-póu	
@@ -59412,6 +59416,7 @@ Woolard; Woollard	五拉德	五拉德	Wǔlādé	Ńgh-lāai-dāk
 Woolcott	五尔科特	五爾科特	Wǔ'ěrkētè	Ńgh-yíh-fō-dahk	
 Woolcott	伍尔科特	伍爾科特	Wǔ'ěrkētè	Ńgh-yíh-fō-dahk	
 Wooley	伍利	伍利	Wǔlì	Ńgh-leih	
+Woolf	伍尔芙	伍爾芙	Wǔ'ěrfú	Ńgh-yíh-fùh	
 Woolfe; Wulf; Wulff	五尔夫	五爾夫	Wǔ'ěrfū	Ńgh-yíh-fū	
 Woolfolk	五尔福克	五爾福克	Wǔ'ěrfúkè	Ńgh-yíh-fūk-hāk	
 Woolfolk	伍尔福克	伍爾福克	Wǔ'ěrfúkè	Ńgh-yíh-fūk-hāk	

other-formats/CedPane-ChinaScribe.txt

@@ -38572,6 +38572,7 @@
 水屯鎮 水屯镇 [Shui3 tun2 zhen4] /Shuitun (town)/
 水灣鎮 水湾镇 [Shui3 wan1 zhen4] /Shuiwan (town)/
 水汶鎮 水汶镇 [Shui3 wen4 zhen4] /Shuiwen (town)/
+水霧魔珠 水雾魔珠 [Shui3 wu4_Mo2_Zhu1] /Aquabeads (toy introduced 2004)/
 水秀鄉 水秀乡 [Shui3 xiu4_Xiang1] /Shuixiu Township/Township, Shuixiu/
 水岩鄉 水岩乡 [Shui3 yan2_Xiang1] /Shuiyan Township/Township, Shuiyan/
 水陽鎮 水阳镇 [Shui3 yang2 zhen4] /Shuiyang (town)/
@@ -43843,6 +43844,7 @@
 伍爾夫 伍尔夫 [Wu3 er3 fu1] /Wulf/
 五爾夫斯坦 五尔夫斯坦 [Wu3 er3 fu1 si1 tan3] /Wulfstan/
 伍爾夫斯坦 伍尔夫斯坦 [Wu3 er3 fu1 si1 tan3] /Wulfstan/
+伍爾芙 伍尔芙 [Wu3 er3 fu2] /Woolf/
 伍爾弗漢普頓 伍尔弗汉普顿 [Wu3 er3 fu2 han4 pu3 dun4] /Wolverhampton/
 五爾福克 五尔福克 [Wu3 er3 fu2 ke4] /Woolfolk/
 伍爾福克 伍尔福克 [Wu3 er3 fu2 ke4] /Woolfolk/
@@ -53114,6 +53116,7 @@
 盜圖 盗图 [dao4 tu2] /copy picture without permission/picture without permission, copy/
 盜用公款 盗用公款 [dao4 yong4_gong1 kuan3] /embezzling public funds/public funds, embezzling/
 嘚嘚 嘚嘚 [de1 de5] /naggingly?/
+嘚瑟 嘚瑟 [de1 se4] /flaunt/show off/<topol.>/
 得安寧 得安宁 [de2_an1 ning2] /get peacefulness/peacefulness, get/
 得安息 得安息 [de2_an1 xi1] /get refreshment/refreshment, get/
 得獎賞 得奖赏 [de2_jiang3 shang3] /be rewarded/rewarded, be/
@@ -57531,6 +57534,7 @@
 悶聲大發財 闷声大发财 [men1 sheng1_da4_fa1 cai2] /keep quiet (in politics etc) and get rich (without disturbance)/quiet and get rich, keep/
 悶聲發大財 闷声发大财 [men1 sheng1_fa1_da4 cai2] /make money without boasting/money without boasting, make/
 門把手 门把手 [men2_ba3 shou5] /doorknob/door handle/
+門電壓 门电压 [men2 dian4 ya1] /gate voltage/voltage, gate/<elec.>/
 門頂 门顶 [men2 ding3] /roof of a (city) gate/gate, roof of a/
 門戶網站 门户网站 [men2 hu4_wang3 zhan4] /Web portal/portal, Web/
 門鉸鏈 门铰链 [men2 jiao3 lian4] /door hinge/hinge, door/
@@ -62616,6 +62620,7 @@
 有理由相信 有理由相信 [you3_li3 you2_xiang1 xin4] /there is reason to believe/reason to believe, there is/
 有沒有 有没有 [you3_mei2_you3] /have or haven't/haven't, have or/
 有沒有人在家 有没有人在家 [you3_mei2_you3_ren2_zai4 jia1] /is anyone at home/anyone at home, is/
+有木有 有木有 [you3_mu4_you3] /have or haven't/haven't, have or/<netspeak>/
 有內味了 有内味了 [you3_nei4_wei4_le5] /there's that kind of feeling (of genuineness etc)/kind of feeling, there's that (of genuineness etc)/<netspeak>/
 有內味兒了 有内味儿了 [you3_nei4_wei4 r5_le5] /there's that kind of feeling (of genuineness etc)/kind of feeling, there's that (of genuineness etc)/<netspeak>/
 有朋自遠方來 有朋自远方来 [you3_peng2_zi4_yuan3 fang1_lai2] /have friends come from afar/friends come from afar, have/

other-formats/cedpane.wenlin

@@ -320620,3 +320620,31 @@ pinyin zuòkōng
 characters 做空
 serial-number CedPane64441
 definition short-selling
+*** 
+pinyin dēsè
+characters 嘚瑟
+serial-number CedPane64442
+environment   topol.
+definition flaunt; show off
+*** 
+pinyin méndiànyā
+characters 门电压[門電壓]
+serial-number CedPane64443
+environment   elec.
+definition gate voltage
+*** 
+pinyin Shuǐwù Mó Zhū
+characters 水雾魔珠[-霧--]
+serial-number CedPane64444
+definition Aquabeads (toy introduced 2004)
+*** 
+pinyin Wǔ'ěrfú
+characters 伍尔芙[-爾-]
+serial-number CedPane64445
+definition Woolf
+*** 
+pinyin yǒu mù yǒu
+characters 有木有
+serial-number CedPane64446
+environment   netspeak
+definition have or haven't