diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | epan/enterprise-numbers | 92 | ||||
| -rw-r--r-- | epan/sminmpec.c | 22 | ||||
| -rw-r--r-- | manuf | 74 | ||||
| -rw-r--r-- | services | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_en.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.ts | 112 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 112 |
12 files changed, 610 insertions, 368 deletions
@@ -3997,6 +3997,7 @@ Cathy Yang <cathy.y.yang[AT]ericsson.com> Cedric Izoard <cedric.izoard[AT]ceva-dsp.com> Cedric Izoard <cedric.izoard[AT]rivierawaves.com> Cenk Gündoğan <cnkgndgn[AT]gmail.com> +Chaitanya T K <chaitanya.mgit[AT]gmail.com> Charles Nepveu <charles.nepveu[AT]verint.com> Chris Brandson <chris.brandson[AT]gmail.com> Chris Dunlop <chris.dunlop3[AT]gmail.com> @@ -4100,6 +4101,7 @@ Johan Wahl <johan.wahl[AT]ericsson.com> John A. Thacker <johnthacker[AT]gmail.com> John Miner <optommp[AT]gmail.com> Jonas Falkevik <jonas.falkevik[AT]gmail.com> +Jonathan Brucker <jonathan.brucke[AT]gmail.com> Jonathan Muñoz <jonathan.munoz[AT]inria.fr> Jorge Power <jpower[AT]rsscorp.org> Jose Rubio <joserubiovidales[AT]gmail.com> @@ -4117,7 +4119,6 @@ Kary Rogers <kary.rogers[AT]gmail.com> Kenny Root <kenny[AT]the-b.org> Kevin Bracey <kevin.bracey[AT]arm.com> Kevin Grigorenko <kevin.grigorenko[AT]us.ibm.com> -Krishna Chaitanya <chaitanya.mgit[AT]gmail.com> Lars Sundström <lars.x.sundstrom[AT]ericsson.com> Lasse Luttermann Poulsen <lasse.luttermann[AT]gmail.com> Laurenz Kamp <laurenz.kamp[AT]gmx.de> @@ -4266,6 +4267,7 @@ Tom <tom916[AT]qq.com> Tom Haynes <loghyr[AT]primarydata.com> Trond Myklebust <trond.myklebust[AT]primarydata.com> Umberto Corponi <umberto.corponi[AT]athonet.com> +Uri Simchoni <urisimchoni[AT]gmail.com> Vasil Velichckov <vvvelichkov[AT]gmail.com> Victor Barratault <victor.barratault[AT]gmail.com> Victor Dodon <dodonvictor[AT]gmail.com> diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index 7f4249c94c..61a73be951 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2016-08-28) +(last updated 2016-09-02) SMI Network Management Private Enterprise Codes: @@ -15987,7 +15987,7 @@ Decimal jci&vasco.com 3996 Open Systems AG - Dominik Langenegger + Raphael Thoma iana&open.ch 3997 ImproWare AG @@ -193319,6 +193319,94 @@ Decentralization / Helenic Public Administra praclear Christian Brenner chr.bre&outlook.com +48435 + Wuxi Neihua Network Technology Co.,(NHN) + Alan Song + songrr&leihua.com +48436 + Siemens AG - Transmission Solutions + Jochen Schaefer + jochen.schaefer&siemens.com +48437 + Ikano Bank + Henrik Klinkvort + hkl&ikano.dk +48438 + Trätransporter i Norrbotten AB + Mattias Markström + mattias.markstrom&bdx.se +48439 + Schönfelder Papierfabrik GmbH + Frank Liebig + frank.liebig&schoenfelder-papierfabrik.de +48440 + 2mt Software GmbH + Michael Wallner + mw00&2mt-software.de +48441 + Gridco Systems + Guruprasad Kulkarni + gkulkarni&gridcosystems.com +48442 + Frankonia Handels GmbH & Co. KG + Simon Gottschlich + sgottschlich&frankonia.de +48443 + Verticali LLC + Andrey Zhelezin + a.zhelezin&verticali.ru +48444 + Stefano Canepa + Stefano Canepa + stefano&canepa.ge.it +48445 + Digital Security + Stéphane Jourdois + stephane.jourdois&digitalsecurity.fr +48446 + Slottstornet AB + Victoria Eriksson + victoria.eriksson&slottstornet.se +48447 + Verizon Labs + Vlabs + jayaraj.wilson&intl.verizon.com +48448 + Bricata, LLC + Paul Casto + pcasto&bricata.com +48449 + Harvard Computer Society + Frederick Widjaja + fwidjaja&hcs.harvard.edu +48450 + Timmerkörarna i Norrland AB + Stefan Nordström + stefan.nordstrom&timmerkorarna.se +48451 + Fuzhou In&Pro Information Technology Co., Ltd + inpro sysop + inpro.sysop&gmail.com +48452 + ANF Certification Authority USA, Corp. + Florencio Diaz + fdiaz&anf.es +48453 + Riddarhusförvaltningen Fr Emilie Pipers Donationsfond + Victoria Eriksson + victoria.eriksson&skogstjanst.se +48454 + Riddarhuset O G Paulis Donationsfond + Victoria Eriksson + victoria.eriksson&skogstjanst.se +48455 + Linköpings Skogstjänst AB + Victoria Eriksson + victoria.eriksson&skogstjanst.se +48456 + Wasatornet AB + Victoria Eriksson + victoria.eriksson&skogstjanst.se End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 6ffe8ef595..dd11cfbc5d 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -48455,6 +48455,28 @@ const value_string sminmpec_values[] = { { 48432, "\0345\0271\0277\0345\0267\0236\0347\0250\0213\0346\0230\0237\0351\0200\0232\0344\0277\0241\0347\0247\0221\0346\0212\0200\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270\0357\0274\0210Guangzhou Starway Communication Technology Co., LTD\0357\0274\0211" }, { 48433, "Wuxi Broadlan Telecommunication Technology Co.,Ltd" }, { 48434, "praclear" }, + { 48435, "Wuxi Neihua Network Technology Co.,(NHN) " }, + { 48436, "Siemens AG - Transmission Solutions" }, + { 48437, "Ikano Bank" }, + { 48438, "Tr\0303\0244transporter i Norrbotten AB" }, + { 48439, "Sch\0303\0266nfelder Papierfabrik GmbH" }, + { 48440, "2mt Software GmbH" }, + { 48441, "Gridco Systems" }, + { 48442, "Frankonia Handels GmbH & Co. KG" }, + { 48443, "Verticali LLC" }, + { 48444, "Stefano Canepa" }, + { 48445, "Digital Security" }, + { 48446, "Slottstornet AB" }, + { 48447, "Verizon Labs" }, + { 48448, "Bricata, LLC" }, + { 48449, "Harvard Computer Society" }, + { 48450, "Timmerk\0303\0266rarna i Norrland AB" }, + { 48451, "Fuzhou In&Pro Information Technology Co., Ltd" }, + { 48452, "ANF Certification Authority USA, Corp." }, + { 48453, "Riddarhusf\0303\0266rvaltningen Fr Emilie Pipers Donationsfond" }, + { 48454, "Riddarhuset O G Paulis Donationsfond" }, + { 48455, "Link\0303\0266pings Skogstj\0303\0244nst AB" }, + { 48456, "Wasatornet AB" }, { 0, NULL} }; @@ -10118,7 +10118,7 @@ 00:26:A8 DaehapHy # DAEHAP HYPER-TECH 00:26:A9 StrongTe # Strong Technologies Pty Ltd 00:26:AA KenmecMe # Kenmec Mechanical Engineering Co., Ltd. -00:26:AB SeikoEps # SEIKO EPSON CORPORATION +00:26:AB SeikoEps # Seiko Epson Corporation 00:26:AC Shanghai # Shanghai LUSTER Teraband photonic Co., Ltd. 00:26:AD Arada # Arada Systems, Inc. 00:26:AE Wireless # Wireless Measurement Ltd @@ -11938,7 +11938,7 @@ 00:50:C2:3B:D0:00/36 BigbangL # Bigbang L.T.D. 00:50:C2:3B:E0:00/36 PaulySte # Pauly Steuer- und Regelanlagen GmbH & Co. KG 00:50:C2:3B:F0:00/36 AudioPro # Audio Processing Technology Ltd -00:50:C2:3C:00:00/36 EdaIndus # EDA Industries Srl +00:50:C2:3C:00:00/36 EdaIndus # EDA Industries Pte. Ltd 00:50:C2:3C:10:00/36 Microtek # MicroTek Electronics, Inc. 00:50:C2:3C:20:00/36 Casabyte # Casabyte Inc. 00:50:C2:3C:30:00/36 4gTechno # 4g Technologies, L.P. @@ -13291,7 +13291,7 @@ 00:50:C2:90:60:00/36 Gidel # Gidel 00:50:C2:90:70:00/36 CristalC # Cristal Controles Ltee 00:50:C2:90:80:00/36 CodexDig # Codex Digital Ltd -00:50:C2:90:90:00/36 ElisraEl # Elisra Electronic Systems +00:50:C2:90:90:00/36 Elisra # Elisra 00:50:C2:90:A0:00/36 BoardLev # Board Level Limited 00:50:C2:90:B0:00/36 EOnEsSve # E.ON ES Sverige AB 00:50:C2:90:C0:00/36 Lss # LSS GmbH @@ -17186,6 +17186,7 @@ 04:20:9A Panasoni # Panasonic AVC Networks Company 04:21:4C InsightE # Insight Energy Ventures LLC 04:22:34 Wireless # Wireless Standard Extensions +04:25:C5 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:26:05 GfrGesel # GFR Gesellschaft für Regelungstechnik und Energieeinsparung mbH 04:26:65 Apple # Apple, Inc. 04:27:58 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -17265,6 +17266,7 @@ 04:A3:16 TexasIns # Texas Instruments 04:A3:F3 Emicon 04:A8:2A Nokia # Nokia Corporation +04:B0:E7 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:B3:B6 SeamapUk # Seamap (UK) Ltd 04:B4:66 Bsp # BSP Co., Ltd. 04:BA:36 LiSengTe # Li Seng Technology Ltd @@ -18049,6 +18051,7 @@ 14:AE:DB VtechTel # VTech Telecommunications Ltd. 14:B1:26 Industri # Industrial Software Co 14:B1:C8 Infiniwi # InfiniWing, Inc. +14:B3:1F Dell # Dell Inc. 14:B3:70 GigasetD # Gigaset Digital Technology (Shenzhen) Co., Ltd. 14:B4:84 SamsungE # Samsung Electronics Co.,Ltd 14:B7:3D ArcheanT # ARCHEAN Technologies @@ -18161,6 +18164,7 @@ 18:68:82 BewardR& # Beward R&D Co., Ltd. 18:6D:99 Adanis # Adanis Inc. 18:71:17 EtaPlusE # eta plus electronic gmbh +18:75:32 SichuanT # SICHUAN TIANYI COMHEART TELECOMCO., LTD 18:79:A2 GmjElect # GMJ ELECTRIC LIMITED 18:7A:93 AmiccomE # AMICCOM Electronics Corporation 18:7C:81 ValeoVis # Valeo Vision Systems @@ -18452,7 +18456,7 @@ 1C:C0:E1:10:00:00/28 Hangzhou # Hangzhou Kaierda Electric Welding Machine Co.,Ltd 1C:C0:E1:20:00:00/28 AbbottMe # Abbott Medical Optics Inc. 1C:C0:E1:30:00:00/28 Hangzhou # HANGZHOU SOFTEL OPTIC CO., LTD -1C:C0:E1:40:00:00/28 Alfareal # AlfaReal (Beijing) Technology Co., Ltd. +1C:C0:E1:40:00:00/28 Videri # Videri Inc. 1C:C0:E1:50:00:00/28 KidsWire # Kids Wireless Inc 1C:C0:E1:60:00:00/28 Monument # Monument Labs, Inc. 1C:C0:E1:70:00:00/28 Shenzhen # SHENZHEN KINSTONE D&T DEVELOP CO.,LTD @@ -19365,6 +19369,7 @@ 34:17:EB Dell # Dell Inc. 34:1A:4C Shenzhen # SHENZHEN WEIBU ELECTRONICS CO.,LTD. 34:1B:22 Grandbei # Grandbeing Technology Co., Ltd +34:1E:6B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 34:1F:E4 ArrisGro # ARRIS Group, Inc. 34:21:09 JensenSc # Jensen Scandinavia AS 34:23:87 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -19643,6 +19648,7 @@ 38:B8:EB:E0:00:00/28 WyresSas # Wyres SAS 38:BB:23 Ozvision # OzVision America LLC 38:BB:3C Avaya # Avaya Inc +38:BC:01 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 38:BC:1A MeizuTec # MEIZU Technology Co., Ltd. 38:BF:2F Espec # Espec Corp. 38:BF:33 NecCasio # NEC CASIO Mobile Communications @@ -20012,6 +20018,7 @@ 40:B7:F3 ArrisGro # ARRIS Group, Inc. 40:B8:37 SonyMobi # Sony Mobile Communications AB 40:B8:9A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +40:B9:3C HewlettP # Hewlett Packard Enterprise 40:BA:61 ArimaCom # ARIMA Communications Corp. 40:BC:73 Cronopla # Cronoplast S.L. 40:BC:8B Itelio # itelio GmbH @@ -20599,6 +20606,7 @@ 44:66:6E Ip-Line 44:67:55 OrbitIrr # Orbit Irrigation 44:68:AB Juin # JUIN COMPANY, LIMITED +44:6A:2E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 44:6A:B7 ArrisGro # ARRIS Group, Inc. 44:6C:24 ReallinE # Reallin Electronic Co.,Ltd 44:6D:57 LiteonTe # Liteon Technology Corporation @@ -20688,6 +20696,7 @@ 44:FD:A3 Everysig # Everysight LTD. 47:54:43 GtcNotRe # GTC (Not registered!) (This number is a multicast!) 48:00:31 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +48:00:33 Technico # Technicolor CH USA Inc. 48:02:2A B-LinkEl # B-Link Electronic Limited 48:03:62 DesayEle # DESAY ELECTRONICS(HUIZHOU)CO.,LTD 48:06:6A Tempered # Tempered Networks, Inc. @@ -20833,6 +20842,7 @@ 48:F8:B3 Cisco-Li # Cisco-Linksys, LLC 48:F8:E1 Nokia 48:F9:25 Maestron # Maestronic +48:F9:7C Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD 48:FC:B6 LavaInte # LAVA INTERNATIONAL(H.K) LIMITED 48:FC:B8 Woodstre # Woodstream Corporation 48:FD:8E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -20870,6 +20880,7 @@ 4C:32:D9 MRuttyHo # M Rutty Holdings Pty. Ltd. 4C:33:4E Hightech 4C:34:88 IntelCor # Intel Corporate +4C:38:D5 MitacCom # MITAC COMPUTING TECHNOLOGY CORPORATION 4C:39:09 HplElect # HPL Electric & Power Private Limited 4C:39:10 NewtekEl # Newtek Electronics co., Ltd. 4C:3B:74 VogtecHK # VOGTEC(H.K.) Co., Ltd @@ -20898,6 +20909,7 @@ 4C:73:67 GeniusBy # Genius Bytes Software Solutions GmbH 4C:73:A5 Kove 4C:74:03 Bq +4C:74:87 LeaderPh # Leader Phone Communication Technology Co., Ltd. 4C:76:25 Dell # Dell Inc. 4C:77:4F Embedded # Embedded Wireless Labs 4C:78:97 Arrowhea # Arrowhead Alarm Products Ltd @@ -20999,8 +21011,21 @@ 50:09:59 Technico # Technicolor CH USA Inc. 50:0B:32 FoxdaTec # Foxda Technology Industrial(ShenZhen)Co.,LTD 50:0B:91 IeeeRegi # IEEE Registration Authority +50:0B:91:00:00:00/28 Igor # Igor, Inc. +50:0B:91:10:00:00/28 SpdDevel # SPD Development Company Ltd +50:0B:91:20:00:00/28 Annapurn # annapurnalabs +50:0B:91:30:00:00/28 EwinTech # EWIN TECHNOLOGY LIMITED +50:0B:91:40:00:00/28 SinopeTe # Sinope technologies Inc +50:0B:91:50:00:00/28 JiangsuZ # jiangsu zhongling high-tech CO.,LTD. +50:0B:91:60:00:00/28 Security # Security Alarms & Co. S.A. 50:0B:91:70:00:00/28 Shenzhen # Shenzhen Xinfa Electronic Co.,ltd +50:0B:91:80:00:00/28 Panasoni # Panasonic Enterprise Solutions Company +50:0B:91:90:00:00/28 Machfu # Machfu, Inc. +50:0B:91:A0:00:00/28 NewAudio # New Audio LLC +50:0B:91:B0:00:00/28 Thumbzup # thumbzup UK Limited +50:0B:91:C0:00:00/28 DiamondT # Diamond Traffic Products, Inc 50:0B:91:D0:00:00/28 Shenzhen # Shenzhen Lucky Sonics Co .,Ltd +50:0B:91:E0:00:00/28 Shenzhen # Shenzhen zhong ju Fiber optical Co.Ltd 50:0E:6D Trafficc # TrafficCast International 50:11:EB Silverne # SilverNet Ltd 50:14:B5 RichfitI # Richfit Information Technology Co., Ltd @@ -21035,6 +21060,7 @@ 50:48:EB BeijingH # BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD. 50:4A:5E Masimo # Masimo Corporation 50:4A:6E Netgear +50:4B:5B Controlt # CONTROLtronic GmbH 50:4F:94 LoxoneEl # Loxone Electronics GmbH 50:50:2A Egardia 50:50:65 Takt # TAKT Corporation @@ -21276,6 +21302,7 @@ 54:A9:D4 Minibar # Minibar Systems 54:AB:3A QuantaCo # QUANTA COMPUTER INC. 54:AE:27 Apple # Apple, Inc. +54:B5:6C XiAnNova # Xi'an NovaStar Tech Co., Ltd 54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd. 54:B7:53 HunanFen # Hunan Fenghui Yinjia Science And Technology Co.,Ltd 54:B8:0A D-LinkIn # D-Link International @@ -22727,6 +22754,7 @@ 70:B3:D5:36:A0:00/36 BectonDi # Becton Dickinson 70:B3:D5:36:C0:00/36 SiconSrl # Sicon srl 70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o +70:B3:D5:37:60:00/36 Private 70:B3:D5:37:70:00/36 Monnit # Monnit Corporation 70:B3:D5:37:B0:00/36 Power # Power Ltd. 70:B3:D5:37:D0:00/36 DxShop # The DX Shop Limited @@ -22784,6 +22812,7 @@ 70:B3:D5:3F:F0:00/36 HydraCon # Hydra Controls 70:B3:D5:40:00:00/36 VtronPty # Vtron Pty Ltd 70:B3:D5:40:40:00/36 Ranix # RANIX,Inc. +70:B3:D5:40:50:00/36 MgSRL # MG s.r.l. 70:B3:D5:40:70:00/36 Idosens 70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc. 70:B3:D5:41:20:00/36 TattileS # TATTILE SRL @@ -22882,6 +22911,7 @@ 70:B3:D5:52:40:00/36 WuxiNewO # Wuxi New Optical Communication Co.,Ltd. 70:B3:D5:52:80:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:52:B0:00/36 GeAviati # GE Aviation Cheltenham +70:B3:D5:52:C0:00/36 Centurya # Centuryarks Ltd., 70:B3:D5:52:D0:00/36 TanakaEl # Tanaka Electric Industry Co., Ltd. 70:B3:D5:52:E0:00/36 Swisspon # Swissponic Sagl 70:B3:D5:53:00:00/36 Isis-Ex # iSiS-Ex Limited @@ -22934,6 +22964,7 @@ 70:B3:D5:5C:40:00/36 TattileS # TATTILE SRL 70:B3:D5:5C:50:00/36 Haag-Str # Haag-Streit AG 70:B3:D5:5C:80:00/36 YuyamaMf # YUYAMA MFG Co.,Ltd +70:B3:D5:5C:C0:00/36 AkseSrl # Akse srl 70:B3:D5:5C:D0:00/36 MvtVideo # MVT Video Technologies R + H Maedler GbR 70:B3:D5:5D:10:00/36 Software # Software Motor Corp 70:B3:D5:5E:40:00/36 DspDesig # DSP DESIGN @@ -23173,6 +23204,7 @@ 70:B3:D5:87:50:00/36 PeekTraf # Peek Traffic 70:B3:D5:87:90:00/36 Zigpos # ZIGPOS GmbH 70:B3:D5:87:B0:00/36 LiquidIn # Liquid Instruments Pty Ltd +70:B3:D5:87:E0:00/36 Septentr # Septentrio NV 70:B3:D5:88:10:00/36 TattileS # TATTILE SRL 70:B3:D5:88:20:00/36 SimonTec # SIMON TECH, S.L. 70:B3:D5:88:50:00/36 Quirklog # QuirkLogic @@ -23198,6 +23230,7 @@ 70:B3:D5:8B:90:00/36 Toptech # Toptech Systems, Inc. 70:B3:D5:8B:E0:00/36 Connoise # Connoiseur Electronics Private Limited 70:B3:D5:8C:50:00/36 Hmicro # HMicro Inc +70:B3:D5:8C:B0:00/36 Welt # WELT Corporation 70:B3:D5:8C:E0:00/36 Cores # CORES Corporation 70:B3:D5:8C:F0:00/36 Dainichi # Dainichi Denshi Co.,LTD 70:B3:D5:8D:30:00/36 Performa # PERFORMANCE CONTROLS, INC. @@ -23372,6 +23405,7 @@ 70:B3:D5:AC:60:00/36 Smtc # SMTC Corporation 70:B3:D5:AC:80:00/36 Heartlan # Heartland.Data Inc. 70:B3:D5:AC:90:00/36 TrinityS # Trinity Solutions LLC +70:B3:D5:AC:D0:00/36 Crde 70:B3:D5:AD:50:00/36 Birdland # Birdland Audio 70:B3:D5:AD:60:00/36 Lemonade # Lemonade Lab Inc 70:B3:D5:AD:A0:00/36 Private @@ -23429,6 +23463,7 @@ 70:B3:D5:B6:70:00/36 RedwaveL # RedWave Labs Ltd 70:B3:D5:B6:D0:00/36 Movis 70:B3:D5:B7:20:00/36 Ub330Net # UB330.net d.o.o. +70:B3:D5:B7:70:00/36 MotecPty # Motec Pty Ltd 70:B3:D5:B7:80:00/36 Hoermann # HOERMANN GmbH 70:B3:D5:B7:A0:00/36 Mahle 70:B3:D5:B7:C0:00/36 Electron # Electronic Navigation Ltd @@ -23460,6 +23495,7 @@ 70:B3:D5:BB:80:00/36 AlKamelS # Al Kamel Systems S.L. 70:B3:D5:BB:D0:00/36 Providiu # Providius Corp 70:B3:D5:BB:E0:00/36 SunriseE # Sunrise Systems Electronics Co. Inc. +70:B3:D5:BC:20:00/36 Dwewoong # DWEWOONG ELECTRIC Co., Ltd. 70:B3:D5:BC:60:00/36 Hattelan # Hatteland Display AS 70:B3:D5:BC:A0:00/36 DeymedDi # Deymed Diagnostic 70:B3:D5:BD:20:00/36 BurkTech # Burk Technology @@ -23619,6 +23655,7 @@ 70:B3:D5:D9:00:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:D9:10:00/36 Foodalyt # FoodALYT GmbH 70:B3:D5:D9:40:00/36 Dewetron # Dewetron GmbH +70:B3:D5:D9:50:00/36 SanoServ # SANO SERVICE Co.,Ltd 70:B3:D5:D9:70:00/36 BrsSiste # BRS Sistemas Eletronicos 70:B3:D5:D9:B0:00/36 RussianT # Russian Telecom Equipment Company 70:B3:D5:D9:C0:00/36 Subiniti # Subinitial LLC @@ -23634,6 +23671,7 @@ 70:B3:D5:DC:A0:00/36 Dsan # DSan Corporation 70:B3:D5:DC:F0:00/36 KlsNethe # KLS Netherlands B.V. 70:B3:D5:DD:70:00/36 DetectAu # DETECT Australia +70:B3:D5:DD:80:00/36 Emscan # EMSCAN Corp. 70:B3:D5:DD:C0:00/36 SyscomIn # Syscom Instruments SA 70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES 70:B3:D5:DD:F0:00/36 Aerovisi # AeroVision Avionics, Inc. @@ -23649,6 +23687,7 @@ 70:B3:D5:DF:60:00/36 Tiab # Tiab Limited 70:B3:D5:DF:70:00/36 RefecorO # Refecor Oy 70:B3:D5:DF:90:00/36 KoreaPla # Korea Plant Maintenance +70:B3:D5:DF:C0:00/36 Electron # ELECTRONIC SYSTEMS DESIGN SPRL 70:B3:D5:DF:F0:00/36 Spanawav # Spanawave Corporation 70:B3:D5:E0:20:00/36 YehlJord # YEHL & JORDAN LLC 70:B3:D5:E0:70:00/36 BaaderPl # Baader Planetarium GmbH @@ -23924,6 +23963,7 @@ 74:32:56 Nt-WareS # NT-ware Systemprg GmbH 74:37:2F Tongfang # Tongfang Shenzhen Cloudcomputing Technology Co.,Ltd 74:38:89 AnnaxAnz # ANNAX Anzeigesysteme GmbH +74:3A:65 Nec # NEC Corporation 74:3E:2B RuckusWi # Ruckus Wireless 74:3E:CB Gentrice # Gentrice tech 74:44:01 Netgear @@ -24657,6 +24697,7 @@ 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd 80:D2:1D Azurewav # AzureWave Technology Inc. 80:D4:33 Lzlabs # LzLabs GmbH +80:D4:A5 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 80:D6:05 Apple # Apple, Inc. 80:D7:33 QsrAutom # QSR Automations, Inc. 80:DB:31 PowerQuo # Power Quotient International Co., Ltd. @@ -24961,6 +25002,7 @@ 88:5D:90:F0:00:00/28 Private 88:61:5A SianoMob # Siano Mobile Silicon Ltd. 88:63:DF Apple # Apple, Inc. +88:66:39 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6A:B1 VivoMobi # vivo Mobile Communication Co., Ltd. 88:6B:0F Bluegiga # Bluegiga Technologies OY @@ -25899,6 +25941,7 @@ A0:39:F7 LgElectr # LG Electronics (Mobile Communications) A0:3A:75 PssBelgi # PSS Belgium N.V. A0:3B:1B InspireT # Inspire Tech A0:3B:E3 Apple # Apple, Inc. +A0:3D:6F Cisco # Cisco Systems, Inc A0:3E:6B IeeeRegi # IEEE Registration Authority A0:3E:6B:00:00:00/28 S&TEmbed # s&t embedded GmbH A0:3E:6B:10:00:00/28 Business # Business Support Consultant Co.,Ltd @@ -25946,6 +25989,7 @@ A0:6A:00 Verilink # Verilink Corporation A0:6C:EC Rim A0:6D:09 Intelcan # Intelcan Technosystems Inc. A0:6E:50 NanotekE # Nanotek Elektronik Sistemler Ltd. Sti. +A0:6F:AA LgInnote # LG Innotek A0:71:A9 Nokia # Nokia Corporation A0:72:2C Humax # HUMAX Co., Ltd. A0:73:32 Cashmast # Cashmaster International Limited @@ -25965,6 +26009,7 @@ A0:89:E4 Skyworth # Skyworth Digital Technology(Shenzhen) Co.,Ltd A0:8A:87 HuizhouK # HuiZhou KaiYue Electronic Co.,Ltd A0:8C:15 GerhardD # Gerhard D. Wempe KG A0:8C:9B XtremeTe # Xtreme Technologies Corp +A0:8C:F8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD A0:8C:FD HewlettP # Hewlett Packard A0:8D:16 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD A0:90:DE VeedimsL # VEEDIMS,LLC @@ -26034,6 +26079,7 @@ A0:DC:04 Becker-A # Becker-Antriebe GmbH A0:DD:97 Polarlin # PolarLink Technologies, Ltd A0:DD:E5 Sharp # SHARP Corporation A0:DE:05 JscIrbis # JSC Irbis-T +A0:E0:AF Cisco # Cisco Systems, Inc A0:E2:01 AvtraceC # AVTrace Ltd.(China) A0:E2:5A AmicusSk # Amicus SK, s.r.o. A0:E2:95 DatSyste # DAT System Co.,Ltd @@ -26145,6 +26191,10 @@ A4:53:85 WeifangG # Weifang GoerTek Electronics Co., Ltd. A4:56:02 Fenglian # fenglian Technology Co.,Ltd. A4:56:1B Mcot # MCOT Corporation A4:56:30 Cisco # Cisco Systems, Inc +A4:58:0F IeeeRegi # IEEE Registration Authority +A4:58:0F:50:00:00/28 CoasiaMi # CoAsia Microelectronics Corp. +A4:58:0F:90:00:00/28 KseniaSe # Ksenia Security srl +A4:58:0F:C0:00:00/28 Homebeav # Homebeaver A4:5A:1C Smart-El # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:5D:36 HewlettP # Hewlett Packard @@ -26249,7 +26299,7 @@ A4:E9:91 Sistemas # SISTEMAS AUDIOVISUALES ITELSIS S.L. A4:E9:A3 HonestTe # Honest Technology Co., Ltd A4:EB:D3 SamsungE # Samsung Electronics Co.,Ltd A4:ED:4E ArrisGro # ARRIS Group, Inc. -A4:EE:57 SeikoEps # SEIKO EPSON CORPORATION +A4:EE:57 SeikoEps # Seiko Epson Corporation A4:EF:52 Telewave # Telewave Co., Ltd. A4:F1:E8 Apple # Apple, Inc. A4:F3:C1 OpenSour # Open Source Robotics Foundation, Inc. @@ -26404,7 +26454,7 @@ AC:14:61 Ataw # ATAW Co., Ltd. AC:14:D2 Wi-Daq # wi-daq, inc. AC:16:2D HewlettP # Hewlett Packard AC:17:02 FibarGro # Fibar Group sp. z o.o. -AC:18:26 SeikoEps # SEIKO EPSON CORPORATION +AC:18:26 SeikoEps # Seiko Epson Corporation AC:19:9F SungrowP # SUNGROW POWER SUPPLY CO.,LTD. AC:1F:6B SuperMic # Super Micro Computer, Inc. AC:1F:D7 RealVisi # Real Vision Technology Co.,Ltd. @@ -26523,6 +26573,7 @@ AC:BC:32 Apple # Apple, Inc. AC:BD:0B Imac # IMAC CO.,LTD AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualed # Visualedge Technology Co., Ltd. +AC:C1:EE XiaomiCo # Xiaomi Communications Co Ltd AC:C2:EC CltIntLI # CLT INT'L IND. CORP. AC:C3:3A SamsungE # Samsung Electronics Co.,Ltd AC:C5:1B ZhuhaiPa # Zhuhai Pantum Electronics Co., Ltd. @@ -26732,7 +26783,7 @@ B0:E2:E5 Fiberhom # Fiberhome Telecommunication Technologies Co.,L B0:E3:9D CatSyste # CAT SYSTEM CO.,LTD. B0:E5:0E Nrg # NRG SYSTEMS INC B0:E7:54 2wire # 2Wire Inc -B0:E8:92 SeikoEps # SEIKO EPSON CORPORATION +B0:E8:92 SeikoEps # Seiko Epson Corporation B0:E9:7E Advanced # Advanced Micro Peripherals B0:EC:71 SamsungE # Samsung Electronics Co.,Ltd B0:EC:8F GmxSas # GMX SAS @@ -26821,6 +26872,7 @@ B4:6D:35 DalianSe # Dalian Seasky Automation Co;Ltd B4:6D:83 IntelCor # Intel Corporate B4:73:56 Hangzhou # Hangzhou Treebear Networking Co., Ltd. B4:74:43 SamsungE # Samsung Electronics Co.,Ltd +B4:74:47 Coreos B4:74:9F AskeyCom # ASKEY COMPUTER CORP B4:75:0E BelkinIn # Belkin International Inc. B4:79:A7 SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND) @@ -27193,6 +27245,7 @@ BC:79:AD SamsungE # Samsung Electronics Co.,Ltd BC:7D:D1 RadioDat # Radio Data Comms BC:81:1F Ingate # Ingate Systems BC:81:99 Basic # BASIC Co.,Ltd. +BC:83:85 Microsof # Microsoft Corporation BC:83:A7 Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD BC:85:1F SamsungE # Samsung Electronics Co.,Ltd BC:85:56 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -27356,6 +27409,7 @@ C0:B8:B1 Bitbox # BitBox Ltd C0:BA:E6 Applicat # Application Solutions (Electronics and Vision) Ltd C0:BD:42 ZpaSmart # ZPA Smart Energy a.s. C0:BD:D1 SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND) +C0:BF:C0 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD C0:C1:C0 Cisco-Li # Cisco-Linksys, LLC C0:C3:B6 Automati # Automatic Systems C0:C5:20 RuckusWi # Ruckus Wireless @@ -27581,6 +27635,7 @@ C8:02:A6 BeijingN # Beijing Newmine Technology C8:07:18 Tdsi C8:08:E9 LgElectr # LG Electronics C8:0A:A9 QuantaCo # QUANTA COMPUTER INC. +C8:0C:C8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD C8:0E:14 AvmAudio # AVM Audiovisuelles Marketing und Computersysteme GmbH C8:0E:77 LeShiZhi # Le Shi Zhi Xin Electronic Technology (Tianjin) Limited C8:0E:95 Omnilync # OmniLync Inc. @@ -28313,6 +28368,7 @@ D8:15:0D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. D8:16:0A NipponEl # Nippon Electro-Sensory Devices D8:16:C1 DewavHkE # DEWAV (HK) ELECTRONICS LIMITED D8:18:2B ContiTem # Conti Temic Microelectronic GmbH +D8:19:7A Nuheara # Nuheara Ltd D8:19:CE Telesqua # Telesquare D8:1B:FE Twinlinx # TWINLINX CORPORATION D8:1C:14 Compacta # Compacta International, Ltd. @@ -28775,7 +28831,7 @@ E0:DA:DC JvcKenwo # JVC KENWOOD Corporation E0:DB:10 SamsungE # Samsung Electronics Co.,Ltd E0:DB:55 Dell # Dell Inc. E0:DB:88 OpenStan # Open Standard Digital-IF Interface for SATCOM Systems -E0:DC:A0 SiemensE # Siemens Electrical Apparatus Ltd., Suzhou Chengdu Branch +E0:DC:A0 SiemensI # Siemens Industrial Automation Products Ltd Chengdu E0:DD:C0 VivoMobi # vivo Mobile Communication Co., Ltd. E0:E5:CF TexasIns # Texas Instruments E0:E6:31 SnbTechn # SNB TECHNOLOGIES LIMITED @@ -29518,6 +29574,7 @@ F4:83:CD Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. F4:85:C6 FdtTechn # FDT Technologies F4:87:71 Infoblox F4:8B:32 XiaomiCo # Xiaomi Communications Co Ltd +F4:8C:50 IntelCor # Intel Corporate F4:8E:09 Nokia # Nokia Corporation F4:8E:38 Dell # Dell Inc. F4:8E:92 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -29735,6 +29792,7 @@ F8:C6:78 Carefusi # Carefusion F8:C9:6C Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD F8:CA:B8 Dell # Dell Inc. F8:CF:C5 Motorola # Motorola Mobility LLC, a Lenovo Company +F8:D0:27 SeikoEps # Seiko Epson Corporation F8:D0:AC SonyInte # Sony Interactive Entertainment Inc. F8:D0:BD SamsungE # Samsung Electronics Co.,Ltd F8:D1:11 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. @@ -11460,6 +11460,8 @@ rs-status 45002/tcp # Redspeed Status Monitor [Redspeed_International_Ltd] synctest 45045/tcp # Remote application control protocol [Eleks_Ltd] [Andriy_Skop] 2013-04-08 invision-ag 45054/tcp # InVision AG [Matthias_Schroer] [Matthias_Schroer] invision-ag 45054/udp # InVision AG [Matthias_Schroer] [Matthias_Schroer] +cloudcheck 45514/tcp # ASSIA CloudCheck WiFi Management System [ASSIA_Inc] [Leonardo_Dagum] 2016-08-29 +cloudcheck-ping 45514/udp # ASSIA CloudCheck WiFi Management keepalive [ASSIA_Inc] [Leonardo_Dagum] 2016-08-29 eba 45678/tcp # EBA PRISE [Patrick_Kara] [Patrick_Kara] eba 45678/udp # EBA PRISE [Patrick_Kara] [Patrick_Kara] dai-shell 45824/tcp # Server for the DAI family of client-server products [Data_Access_Inc] [Adam_Robinson] 2012-04-30 diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 6937d968e6..b3c72beb00 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation>[schließe]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation>[geschlossen]</translation> </message> @@ -1904,24 +1904,24 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>Folge Stream</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>TCP oder UDP Stream folgen.</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>Graph</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>TCP Verbindung als Graph anzeigen.</translation> </message> @@ -6888,12 +6888,12 @@ text-decoration: underline; <translation>Automatische Aktualisierung ist deaktiviert.</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>nicht gefunden</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>Dateipfad kopieren</translation> </message> @@ -9109,33 +9109,33 @@ text-decoration: underline; <translation>Einzelne Protokolle aktivieren/deaktivieren</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>Nach Aktualisierungen suchen</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation> vor dem Schließen</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>Pakete vor dem Zusammenführen speichern?</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>Eine temporäre Mitschnittdatei kann nicht zusammengeführt werden.</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>Vor der Zusammenführung Änderungen in "%1" speichern?</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>Änderungen müssen vor dem Zusammenführen gespeichert werden.</translation> </message> @@ -9145,117 +9145,117 @@ text-decoration: underline; <translation>Ungültiger Anzeigefilter</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>Ungültiger Lesefilter</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>Der Filterausdruck %1 ist kein gültiger Lesefilter. (%2).</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation> vor dem Importieren einer Aufzeichnung</translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>Kann nicht nach "%1" exportieren.</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden.</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation>Wollen Sie die durchgeführten Änderungen speichern%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>Die aufgezeichneten Pakete gehen verloren wenn sie nicht gespeichert werden.</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>Sollen die Änderungen an der Mitschnittdatei "%1"%2 gespeichert werden?</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn sie nicht gesichert werden.</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation>Wollen Sie die Aufzeichnung stoppen und die aufgezeichneten Pakete speichern%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation>Wollen Sie die aufgezeichneten Pakete speichern%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation>Vor dem Fortsetzen speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>Stoppen und speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation>Stoppen und beenden &ohne zu speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>&Ohne speichern beenden</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Fortsetzen &ohne zu Speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation>Stoppen und Fortsetzen &ohne zu Speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Dateiname kann nicht auf UTF-8 angewendet werden)</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>Die Wireshark Netzwerk Analysesoftware</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>Aufzeichnen von %1</translation> </message> @@ -10724,11 +10724,16 @@ text-decoration: underline; <translation>Neue Einfärbungsregel</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>Verbindungen</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">Entfällt</translation> </message> @@ -10810,7 +10815,7 @@ text-decoration: underline; <translation>Alle</translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>Diese Mitteilung nicht mehr anzeigen.</translation> </message> @@ -11136,12 +11141,12 @@ text-decoration: underline; <translation>Priorität</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>Im Finder anzeigen</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>Im Ordner anzeigen</translation> </message> @@ -15158,42 +15163,47 @@ text-decoration: underline; <translation>Auf Anzeigenfilter einschränken</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>Verbindungstypen hinzufügen oder entfernen.</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>%1 Typen</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>als CSV</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>Alle Werte dieser Seite im CSV-Format (Comma Separated Values) in die Zwischenablage kopieren.</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>als YAML</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>Alle Werte dieser Seite im YAML-Format in die Zwischenablage kopieren.</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 7343e3b4fe..7b404c6e00 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -716,12 +716,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation type="unfinished"></translation> </message> @@ -1896,24 +1896,24 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation type="unfinished"></translation> </message> @@ -6764,12 +6764,12 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation type="unfinished"></translation> </message> @@ -8985,33 +8985,33 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation type="unfinished"></translation> </message> @@ -9021,117 +9021,117 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation type="unfinished"></translation> </message> @@ -10586,11 +10586,16 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="endpoint_dialog.cpp" line="47"/> <source>Endpoint</source> <translation type="unfinished"></translation> @@ -10664,7 +10669,7 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation type="unfinished"></translation> </message> @@ -10990,12 +10995,12 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation type="unfinished"></translation> </message> @@ -14907,42 +14912,47 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index c9115a9843..b225daca3f 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation>[Fermeture]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation>[Fermer]</translation> </message> @@ -1905,24 +1905,24 @@ si vous voulez utiliser des fichiers multiples.</translation> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>Suivre flux</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>Afficher un flux TCP ou UDP.</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>Graphique</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>Décrire graphiquement une conversation TCP</translation> </message> @@ -6860,12 +6860,12 @@ a:hover { <translation>Vous avez désactivé les mises à jour automatiques.</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>Non trouvé</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>Copier le chemin du fichier</translation> </message> @@ -9081,33 +9081,33 @@ a:hover { <translation>Active et désactive des protocoles spécifiques</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>Vérifier Mises à Jour</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation>avant de quitter</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>Sauvegarder les paquets avant la fusion?</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>une capture temporaire ne peut pas etre fusionner.</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>Sauvegarder les changements dans "%1" avant la fusion?</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>Les changements doivent etre sauvegarder avant la fusion de fichier.</translation> </message> @@ -9117,117 +9117,117 @@ a:hover { <translation>Filtre d'affichage invalide</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>Filtre de Lecture Invalide</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>L'expression de filtre %1 n'est pas un filtre de lecture valide. (%2).</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>Impossible d'exporter dans "%1".</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>Vous ne pouvez pas exporter les paquets de la capture en cours.</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>Votre capture de paquet sera perdu si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>Voulez-vous enregistrer les modifications que vous avez apportées au fichier de capture "%1"%2?</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>Vos changements seront perdus si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>Arreter et Sauvegarder</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Nom du fichier ne peut pas être mappé à l'UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>L'analyseur de réseau Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>Capture en cours de %1</translation> </message> @@ -10698,11 +10698,16 @@ a:hover { <translation>Nouvelle règle de coloration</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>Conversation</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">N/A</translation> </message> @@ -10784,7 +10789,7 @@ a:hover { <translation>Tout</translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>Ne plus afficher ce message.</translation> </message> @@ -11110,12 +11115,12 @@ a:hover { <translation>Priorité</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>Voir dans Finder</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>Voir dans le Dossier</translation> </message> @@ -15104,42 +15109,47 @@ Changer la direction de la connexion (voir le flux inverse).</p></body& <translation>Limiter au Filtre d'Affichage</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>Ajoute et supprime des types de conversation.</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>%1 Types</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>Copier</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>en CSV</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>Copier au format CSV (Comma Separated Values) toutes les valeurs de cette page dans le presse-papier.</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>en YAML</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>Copier au format de sérialisation de données YAML toutes les valeurs de cette page dans le presse-papier.</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>Inconnu</translation> </message> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 648f12d466..179f7da5ce 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation> [chiusura in corso]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation> [chiuso]</translation> </message> @@ -1904,24 +1904,24 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>Segui il flusso</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>Segui un flusso TCP o UDP.</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>Grafico</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>Crea il grafico di una connessione TCP.</translation> </message> @@ -6886,12 +6886,12 @@ a:hover { <translation>Hai disabilitato gli aggiornamenti automatici.</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>non trovato</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>Copia percorso del file</translation> </message> @@ -9107,33 +9107,33 @@ a:hover { <translation>Abilita e disabilita protocolli specifici</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>Verifica aggiornamenti</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation>prima di uscire</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>Salvare i pacchetti prima di unire?</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>Un file di cattura temporaneo non può essere unito.</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>Salvare le modifiche a "%1" prima di unire?</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>Le modifiche devono essere salvate prima di unire.</translation> </message> @@ -9143,117 +9143,117 @@ a:hover { <translation>Filtro di visualizzazione non valido</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>Filtro di lettura non valido</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>L'espressione %1 non è un filtro di lettura valido. (%2).</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation>prima di importare una cattura</translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>Impossibile esportare su "%1".</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>Non puoi esportare pacchetti sul file di cattura attuale.</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation>Vuoi salvare le modifiche che hai apportato%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>I pacchetti catturati saranno persi se non li salvi.</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>Vuoi salvare le modifiche che hai apportato al file di cattura "%1"%2?</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>Le modifiche saranno perse se non le salvi.</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation>Vuoi interrompere la cattura e salvare i pacchetti catturati%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation>Vuoi salvare i pacchetti catturati%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation>Salva prima di continuare</translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>Ferma e salva</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation>Ferma ed esci senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>Esci senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Continua senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation>Ferma e continua senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Il nome del file non può essere associato in UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark l'analizzatore di rete</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>Cattura da %1</translation> </message> @@ -10722,11 +10722,16 @@ a:hover { <translation>Nuova regola di colorazione</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>Conversazione</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">N/D</translation> </message> @@ -10808,7 +10813,7 @@ a:hover { <translation>Tutti </translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>Non mostrare più questo messaggio.</translation> </message> @@ -11134,12 +11139,12 @@ a:hover { <translation>Priorità</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>Mostra in Finder</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>Mostra nella cartella</translation> </message> @@ -15151,42 +15156,47 @@ a:hover { <translation>Limita al filtro di visualizzazione</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>Aggiungi e rimuovi i tipi di conversazione.</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>Tipi di %1</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>come CSV</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>Copia tutti i valori di questa pagina negli appunti nel formato CSV (valori separati da virgole).</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>come YAML</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>Copia tutti i valori di questa pagina negli appunti nel formato di serializzazione dati YAML.</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index d9d9b29458..41918cf3e7 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation> [閉じています]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation> [閉じました]</translation> </message> @@ -1901,24 +1901,24 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>ストリームを追跡</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>TCPかUDPストリームを追跡</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>グラフ</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>TCP対話をグラフ化します</translation> </message> @@ -6843,12 +6843,12 @@ a:hover { <translation>自動アップデートを無効にしました</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>見つかりません</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>ファイルパスをコピー</translation> </message> @@ -9064,33 +9064,33 @@ a:hover { <translation>指定プロトコルを有効および無効化します</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>更新を確認…</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation>終了前</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>結合する前にパケットを保存しますか？</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>一時的なキャプチャファイルは結合することができません</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>結合する前に "%1" に変更を保存しますか？</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>ファイルを結合する前に変更を保存する必要があります</translation> </message> @@ -9100,117 +9100,117 @@ a:hover { <translation>無効な表示フィルタ</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>無効な読込フィルタ</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>フィルタ式 %1 は有効な読込みフィルタではありません(%2)</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation>新しいキャプチャファイルをインポートする前に</translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>"%1" をエクスポートすることができません</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>現在のキャプチャファイルへパケットをエクスポートすることはできません</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation>%1 に作成した変更を保存したいですか？</translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>保存しない場合キャプチャしたパケットは失われます</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>キャプチャスタイルに行った変更を保存しますか</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>保存しない場合変更は失われます</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation>キャプチャを停止してキャプチャしたパケットを保存しますか？%1</translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation>キャプチャしたパケットを保存しますか？%1</translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>停止して保存</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>ファイル名をUTF-8形式に割り当てできません</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>ワイヤーシャークネットワークアナライザ</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>%1 からキャプチャ中</translation> </message> @@ -10678,11 +10678,16 @@ a:hover { <translation>新規色付けルール</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>対話</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">未指定</translation> </message> @@ -10764,7 +10769,7 @@ a:hover { <translation>すべて </translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>このメッセージは再度表示されません</translation> </message> @@ -11090,12 +11095,12 @@ a:hover { <translation>優先度</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>ファインダーで表示</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>フォルダで表示</translation> </message> @@ -15085,42 +15090,47 @@ a:hover { <translation>表示フィルタに制限</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>対話タイプを追加または削除します</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>%1 タイプ</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>コピー</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>CSV形式として</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>このページのすべての値をクリップボードにCSV(カンマ区切りテキスト)形式でコピー</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>YAML形式として</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>このページのすべての値をクリップボードにYAMLデータシリアル化形式でコピーします</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>不明</translation> </message> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 96aa93bc75..1b71f08bfb 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation>[zamykanie]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation>[zamknięty]</translation> </message> @@ -1903,24 +1903,24 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>Podążaj za strumieniem</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>Podążaj za strumieniem TCP lub UDP.</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>Wykres</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>Wykres konwersacji TCP.</translation> </message> @@ -6887,12 +6887,12 @@ text-decoration: underline; <translation>Automatyczne aktualizacje są wyłączone.</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>nie znaleziono</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>Kopiuj ścieżkę</translation> </message> @@ -9108,33 +9108,33 @@ text-decoration: underline; <translation>Włącz lub wyłącz wybrane protokoły</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>Sprawdź aktualizacje</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation>przed wyjściem</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>Zapisać pakiety przed scaleniem?</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>Tymczasowy plik przechwytywania nie może zostać scalony.</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>Zapisać zmiany w "%1" przed scaleniem?</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>Zmiany muszą być zapisane przed próbą scalenia plików.</translation> </message> @@ -9144,117 +9144,117 @@ text-decoration: underline; <translation>Niepoprawny filtr</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>Niepoprawny filtr wczytywania</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>Postać filtru wczytywania %1 nie jest poprawna. (%2).</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation>przed zaimportowaniem nowego pliku przechwytywania</translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>Nie można wyeksportować do "%1".</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>Nie można wyeksportować pakietów do aktualnego pliku.</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation>Czy chcesz zapisać zrobione zmiany %1?</translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>Twoje przechwycone pakiety zostaną utracone jeśli nie zapiszesz ich.</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>Czy chcesz zapisać zmiany, które zrobiłeś do pliku przechytywania "%1"%2?</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>Twoje zmiany zostaną utracone jeśli nie zapiszesz ich.</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation>Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation>Czy chcesz zapisać przechwycone pakiety%1?</translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation>Zapisz przed kontynuowaniem</translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>Zatrzymaj i zapisz</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation>Zatrzymaj i wyjdź bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>Wyjdź bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Kontynuuj bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation>Zatrzymaj i kontynuuj bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>(Nazwa pliku nie może być przekonwertowana do formatu UTF-8)</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>Analizator Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>Przechwytywanie z %1</translation> </message> @@ -10723,11 +10723,16 @@ text-decoration: underline; <translation>Nowa reguła kolorowania</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>Konwersacja</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">N/A</translation> </message> @@ -10809,7 +10814,7 @@ text-decoration: underline; <translation>Każdy</translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>Nie pokazuj więcej tego komunikatu.</translation> </message> @@ -11135,12 +11140,12 @@ text-decoration: underline; <translation>Priorytet</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>Otwórz w wyszukiwajce</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>Otwórz w folderze</translation> </message> @@ -15156,42 +15161,47 @@ text-decoration: underline; <translation>Ogranicz do filtru</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>Dodaj lub usuń typ konwersacji.</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>%1 Typy</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>Kopiuj</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>jako CSV</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>Kopiuj wszystkie wartości z tej strony w CSV do schowka.</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>jako YAML</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>Kopiuj wszystkie wartości z tej strony w formacie serializacji YAML do schowka.</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>Nieznany</translation> </message> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 9aaa17a646..1570adc173 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -720,12 +720,12 @@ <context> <name>CaptureFile</name> <message> - <location filename="capture_file.cpp" line="171"/> + <location filename="capture_file.cpp" line="179"/> <source> [closing]</source> <translation> [关闭中]</translation> </message> <message> - <location filename="capture_file.cpp" line="176"/> + <location filename="capture_file.cpp" line="184"/> <source> [closed]</source> <translation> [已关闭]</translation> </message> @@ -1903,24 +1903,24 @@ PLEASE NOTE: One option MUST be selected.</source> <context> <name>ConversationDialog</name> <message> - <location filename="conversation_dialog.cpp" line="65"/> + <location filename="conversation_dialog.cpp" line="70"/> <source>Follow Stream</source> <oldsource>Follow Stream...</oldsource> <translation>追踪流</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="66"/> + <location filename="conversation_dialog.cpp" line="71"/> <source>Follow a TCP or UDP stream.</source> <translation>追踪 TCP 或 UDP 流。</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="69"/> + <location filename="conversation_dialog.cpp" line="74"/> <source>Graph</source> <oldsource>Graph...</oldsource> <translation>图表</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="70"/> + <location filename="conversation_dialog.cpp" line="75"/> <source>Graph a TCP conversation.</source> <translation>绘制 TCP 对话图形。</translation> </message> @@ -6876,12 +6876,12 @@ text-decoration: underline; <translation>禁止自动更新。</translation> </message> <message> - <location filename="main_welcome.cpp" line="383"/> + <location filename="main_welcome.cpp" line="390"/> <source>not found</source> <translation>未找到</translation> </message> <message> - <location filename="main_welcome.cpp" line="465"/> + <location filename="main_welcome.cpp" line="472"/> <source>Copy file path</source> <translation>复制文件路径</translation> </message> @@ -9097,33 +9097,33 @@ text-decoration: underline; <translation>启用和禁用特定的协议</translation> </message> <message> - <location filename="main_window.cpp" line="436"/> + <location filename="main_window.cpp" line="437"/> <source>Check for Updates</source> <oldsource>Check for Updates...</oldsource> <translation>检查更新</translation> </message> <message> - <location filename="main_window.cpp" line="818"/> + <location filename="main_window.cpp" line="819"/> <source> before quitting</source> <translation>在退出前</translation> </message> <message> - <location filename="main_window.cpp" line="1003"/> + <location filename="main_window.cpp" line="1004"/> <source>Save packets before merging?</source> <translation>是否在合并之前保存分组？</translation> </message> <message> - <location filename="main_window.cpp" line="1004"/> + <location filename="main_window.cpp" line="1005"/> <source>A temporary capture file can't be merged.</source> <translation>无法合并临时捕获文件。</translation> </message> <message> - <location filename="main_window.cpp" line="1010"/> + <location filename="main_window.cpp" line="1011"/> <source>Save changes in "%1" before merging?</source> <translation>是否在合并前保存对“%1”的更改？</translation> </message> <message> - <location filename="main_window.cpp" line="1012"/> + <location filename="main_window.cpp" line="1013"/> <source>Changes must be saved before the files can be merged.</source> <translation>在文件合并之前，其更改必须先保存。</translation> </message> @@ -9133,117 +9133,117 @@ text-decoration: underline; <translation>无效显示过滤器</translation> </message> <message> - <location filename="main_window.cpp" line="1049"/> + <location filename="main_window.cpp" line="1050"/> <source>Invalid Read Filter</source> <translation>无效读取过滤器</translation> </message> <message> - <location filename="main_window.cpp" line="1050"/> + <location filename="main_window.cpp" line="1051"/> <source>The filter expression %1 isn't a valid read filter. (%2).</source> <translation>过滤器表达式 %1 不是有效的读取过滤器 (%2)。</translation> </message> <message> - <location filename="main_window.cpp" line="1140"/> + <location filename="main_window.cpp" line="1141"/> <source> before importing a capture</source> <oldsource> before importing a new capture</oldsource> <translation> 导入新捕获前</translation> </message> <message> - <location filename="main_window.cpp" line="1414"/> + <location filename="main_window.cpp" line="1417"/> <source>Unable to export to "%1".</source> <translation>无法导出“%1”。</translation> </message> <message> - <location filename="main_window.cpp" line="1415"/> + <location filename="main_window.cpp" line="1418"/> <source>You cannot export packets to the current capture file.</source> <translation>您不能将分组导出到当前捕获文件。</translation> </message> <message> - <location filename="main_window.cpp" line="1502"/> - <location filename="main_window.cpp" line="1527"/> + <location filename="main_window.cpp" line="1505"/> + <location filename="main_window.cpp" line="1530"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1574"/> + <location filename="main_window.cpp" line="1577"/> <source>Do you want to save the changes you've made%1?</source> <oldsource>Do you want to save the captured packets</oldsource> <translation>您是否要保存已做出的更改%1？</translation> </message> <message> - <location filename="main_window.cpp" line="1570"/> - <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1573"/> + <location filename="main_window.cpp" line="1581"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>若不保存，您已经捕获的分组将会丢失。</translation> </message> <message> - <location filename="main_window.cpp" line="1583"/> + <location filename="main_window.cpp" line="1586"/> <source>Do you want to save the changes you've made to the capture file "%1"%2?</source> <translation>是否希望保存对捕获文件“%1”%2 的更改？</translation> </message> <message> - <location filename="main_window.cpp" line="1575"/> - <location filename="main_window.cpp" line="1584"/> + <location filename="main_window.cpp" line="1578"/> + <location filename="main_window.cpp" line="1587"/> <source>Your changes will be lost if you don't save them.</source> <translation>若不保存，您的更改将会丢失。</translation> </message> <message> - <location filename="main_window.cpp" line="1569"/> + <location filename="main_window.cpp" line="1572"/> <source>Do you want to stop the capture and save the captured packets%1?</source> <translation>您是否要停止捕获，并保存已捕获的分组%1？</translation> </message> <message> - <location filename="main_window.cpp" line="1577"/> + <location filename="main_window.cpp" line="1580"/> <source>Do you want to save the captured packets%1?</source> <translation>您是否要保存已捕获的分组%1？</translation> </message> <message> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1604"/> <source>Save before Continue</source> <translation>继续前保存</translation> </message> <message> - <location filename="main_window.cpp" line="1603"/> + <location filename="main_window.cpp" line="1606"/> <source>Stop and Save</source> <translation>停止并保存</translation> </message> <message> - <location filename="main_window.cpp" line="1615"/> + <location filename="main_window.cpp" line="1618"/> <source>Stop and Quit &without Saving</source> <oldsource>Stop and Quit without Saving</oldsource> <translation>停止并退出，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1627"/> + <location filename="main_window.cpp" line="1630"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>直接退出，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> - <location filename="main_window.cpp" line="1631"/> + <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1634"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>继续，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1621"/> + <location filename="main_window.cpp" line="1624"/> <source>Stop and Continue &without Saving</source> <oldsource>Stop and Continue without Saving</oldsource> <translation>停止并继续，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1953"/> + <location filename="main_window.cpp" line="1956"/> <source>(File name can't be mapped to UTF-8)</source> <translation>文件名不能映射到UTF-8</translation> </message> <message> - <location filename="main_window.cpp" line="1974"/> + <location filename="main_window.cpp" line="1977"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark 网络分析器</translation> </message> <message> - <location filename="main_window.cpp" line="1999"/> + <location filename="main_window.cpp" line="2002"/> <source>Capturing from %1</source> <translation>正在捕获 %1</translation> </message> @@ -10710,11 +10710,16 @@ text-decoration: underline; <translation>新着色规则</translation> </message> <message> - <location filename="conversation_dialog.cpp" line="61"/> + <location filename="conversation_dialog.cpp" line="66"/> <source>Conversation</source> <translation>对话</translation> </message> <message> + <location filename="conversation_dialog.cpp" line="342"/> + <source>Bars show the relative timeline for each conversation.</source> + <translation type="unfinished"></translation> + </message> + <message> <source>N/A</source> <translation type="vanished">N/A</translation> </message> @@ -10796,7 +10801,7 @@ text-decoration: underline; <translation>任何</translation> </message> <message> - <location filename="main_window.cpp" line="231"/> + <location filename="main_window.cpp" line="232"/> <source>Don't show this message again.</source> <translation>不再显示此消息。</translation> </message> @@ -11122,12 +11127,12 @@ text-decoration: underline; <translation>优先级</translation> </message> <message> - <location filename="main_welcome.cpp" line="448"/> + <location filename="main_welcome.cpp" line="455"/> <source>Show in Finder</source> <translation>在 Finder 中显示</translation> </message> <message> - <location filename="main_welcome.cpp" line="450"/> + <location filename="main_welcome.cpp" line="457"/> <source>Show in Folder</source> <translation>在 Finder 中显示</translation> </message> @@ -15113,42 +15118,47 @@ text-decoration: underline; <translation>显示过滤器的限制</translation> </message> <message> - <location filename="traffic_table_dialog.ui" line="68"/> + <location filename="traffic_table_dialog.ui" line="71"/> + <source>Absolute start time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="traffic_table_dialog.ui" line="91"/> <source><html><head/><body><p>Add and remove conversation types.</p></body></html></source> <translation><html><head/><body><p>添加、删除对话类型。</p></body></html></translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="64"/> + <location filename="traffic_table_dialog.cpp" line="65"/> <source>%1 Types</source> <translation>%1 类型</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="69"/> + <location filename="traffic_table_dialog.cpp" line="71"/> <source>Copy</source> <translation>复制</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="70"/> + <location filename="traffic_table_dialog.cpp" line="72"/> <source>as CSV</source> <translation>作为 CSV</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="71"/> + <location filename="traffic_table_dialog.cpp" line="73"/> <source>Copy all values of this page to the clipboard in CSV (Comma Separated Values) format.</source> <translation>复制此页的所有值到剪贴板，使用 CSV（逗号分隔值）格式。</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="73"/> + <location filename="traffic_table_dialog.cpp" line="75"/> <source>as YAML</source> <translation>作为YAML</translation> </message> <message> - <location filename="traffic_table_dialog.cpp" line="74"/> + <location filename="traffic_table_dialog.cpp" line="76"/> <source>Copy all values of this page to the clipboard in the YAML data serialization format.</source> <translation>复制此页的所有值到剪贴板，使用 YAML 数据串行格式。</translation> </message> <message> - <location filename="traffic_table_dialog.h" line="115"/> + <location filename="traffic_table_dialog.h" line="117"/> <source>Unknown</source> <translation>未知</translation> </message> |