diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | epan/dissectors/usb.c | 82 | ||||
| -rw-r--r-- | epan/enterprise-numbers | 214 | ||||
| -rw-r--r-- | epan/sminmpec.c | 57 | ||||
| -rw-r--r-- | manuf | 38 | ||||
| -rw-r--r-- | services | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_de.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_en.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_fr.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_it.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_pl.ts | 158 | ||||
| -rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 158 |
13 files changed, 995 insertions, 506 deletions
@@ -3967,6 +3967,7 @@ AlexL <loginov.alex.valer[AT]gmail.com> Alexander Gärtner <sphinxs1988[AT]googlemail.com> Alexander Stein <alexanders83[AT]web.de> Alexander Wetzel <alexander.wetzel[AT]web.de> +Alexandr Savca <s.alex08[AT]mail.ru> Ambarish Malpani <ambarish[AT]defend7.com> Amine Kherbouche <amine.kherbouche[AT]6wind.com> Amitoj Setia <asetia[AT]juniper.net> @@ -4342,6 +4343,7 @@ Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp> Yurii Lysyi <yurii.lysyi[AT]ericsson.com> Zdeněk Žamberský <zzdevel[AT]seznam.cz> anonsvn <anonsvn[AT]localhost> +bwhitn <brian.m.whitney[AT]outlook.com> cff339 <cff339[AT]gmail.com> kardam <netkardam[AT]gmail.com> kkoizumi <kkoizumi46[AT]gmail.com> diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index abfa4fe1ce..96008084c0 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -1456,6 +1456,7 @@ static const value_string usb_vendors_vals[] = { { 0x0bf7, "Sunny Giken, Inc." }, { 0x0bf8, "Fujitsu Siemens Computers" }, { 0x0bfd, "Kvaser AB" }, + { 0x0c00, "FireFly Mouse Mat" }, { 0x0c04, "MOTO Development Group, Inc." }, { 0x0c05, "Appian Graphics" }, { 0x0c06, "Hasbro Games, Inc." }, @@ -1573,6 +1574,7 @@ static const value_string usb_vendors_vals[] = { { 0x0ccd, "TerraTec Electronic GmbH" }, { 0x0cd4, "Bang Olufsen" }, { 0x0cd5, "LabJack Corporation" }, + { 0x0cd6, "Scheidt & Bachmann" }, { 0x0cd7, "NewChip S.r.l." }, { 0x0cd8, "JS Digitech, Inc." }, { 0x0cd9, "Hitachi Shin Din Cable, Ltd" }, @@ -2781,6 +2783,7 @@ static const value_string usb_vendors_vals[] = { { 0x1d5b, "Smartronix, Inc." }, { 0x1d6b, "Linux Foundation" }, { 0x1d90, "Citizen" }, + { 0x1d9d, "Sigma Sport" }, { 0x1de1, "Actions Microelectronics Co." }, { 0x1e0e, "Qualcomm / Option" }, { 0x1e10, "Point Grey Research, Inc." }, @@ -3024,6 +3027,7 @@ static const value_string usb_products_vals[] = { { 0x00790011, "Gamepad" }, { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" }, { 0x01270002, "HDM Interface" }, + { 0x01270127, "ibp" }, { 0x01450112, "Card Reader" }, { 0x017c145f, "Trust Deskset" }, { 0x02000201, "MA180 UMTS Modem" }, @@ -3622,6 +3626,7 @@ static const value_string usb_products_vals[] = { { 0x03f08c11, "Deskjet F4500 series" }, { 0x03f09002, "PhotoSmart M437" }, { 0x03f09102, "PhotoSmart M537" }, + { 0x03f09207, "HD-4110 Webcam" }, { 0x03f09302, "PhotoSmart R930 series" }, { 0x03f09402, "PhotoSmart R837" }, { 0x03f09502, "PhotoSmart R840 series" }, @@ -4800,6 +4805,8 @@ static const value_string usb_products_vals[] = { { 0x044e3017, "BCM2046 Bluetooth Device" }, { 0x044effff, "Compaq Bluetooth Multiport Module" }, { 0x044f0400, "HOTAS Cougar" }, + { 0x044f0402, "HOTAS Warthog Joystick" }, + { 0x044f0404, "HOTAS Warthog Throttle" }, { 0x044f044f, "GP XID" }, { 0x044fa003, "Rage 3D Game Pad" }, { 0x044fa01b, "PK-GP301 Driving Wheel" }, @@ -5109,6 +5116,7 @@ static const value_string usb_products_vals[] = { { 0x045e02d1, "Xbox One Controller" }, { 0x045e02d5, "Xbox One Digital TV Tuner" }, { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" }, + { 0x045e02e6, "Wireless XBox Controller Dongle" }, { 0x045e0400, "Windows Powered Pocket PC 2002" }, { 0x045e0401, "Windows Powered Pocket PC 2002" }, { 0x045e0402, "Windows Powered Pocket PC 2002" }, @@ -5260,6 +5268,7 @@ static const value_string usb_products_vals[] = { { 0x045e0750, "Wired Keyboard 600" }, { 0x045e0752, "Wired Keyboard 400" }, { 0x045e075d, "LifeCam Cinema" }, + { 0x045e0761, "LifeCam VX-2000" }, { 0x045e0766, "LifeCam VX-800" }, { 0x045e0768, "Sidewinder X4" }, { 0x045e076c, "Comfort Mouse 4500" }, @@ -5358,6 +5367,8 @@ static const value_string usb_products_vals[] = { { 0x046a0081, "eHealth Keyboard G87 1504" }, { 0x046a0106, "R-300 Wireless Mouse Receiver" }, { 0x046a010d, "MX-Board 3.0 Keyboard" }, + { 0x046ab090, "Keyboard" }, + { 0x046ab091, "Mouse" }, { 0x046b0001, "Keyboard" }, { 0x046b0101, "PS/2 Keyboard, Mouse & Joystick Ports" }, { 0x046b0301, "USB 1.0 Hub" }, @@ -5600,7 +5611,7 @@ static const value_string usb_products_vals[] = { { 0x046dc20c, "WingMan Precision" }, { 0x046dc20d, "WingMan Attack 2" }, { 0x046dc20e, "WingMan Formula GP" }, - { 0x046dc211, "iTouch Cordless Reciever" }, + { 0x046dc211, "iTouch Cordless Receiver" }, { 0x046dc212, "WingMan Extreme Digital 3D" }, { 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" }, { 0x046dc214, "ATK3 (Attack III Joystick)" }, @@ -6016,6 +6027,7 @@ static const value_string usb_products_vals[] = { { 0x0480a202, "Canvio Basics HDD" }, { 0x0480a208, "Canvio Basics 2TB USB 3.0 Portable Hard Drive" }, { 0x0480b001, "Stor.E Partner" }, + { 0x0480b207, "Canvio Ready" }, { 0x0480d000, "External Disk 2TB Model DT01ABA200" }, { 0x0480d010, "External Disk 3TB" }, { 0x0480d011, "Canvio Desk" }, @@ -6076,6 +6088,7 @@ static const value_string usb_products_vals[] = { { 0x0489e042, "Broadcom BCM20702 Bluetooth" }, { 0x0489e04d, "Atheros AR3012 Bluetooth" }, { 0x048d1165, "IT1165 Flash Controller" }, + { 0x048d1172, "Flash Drive" }, { 0x048d1336, "SD/MMC Cardreader" }, { 0x048d1345, "Multi Cardreader" }, { 0x048d9006, "IT9135 BDA Afatech DVB-T HDTV Dongle" }, @@ -6384,9 +6397,11 @@ static const value_string usb_products_vals[] = { { 0x04a910a8, "iP6220D" }, { 0x04a910a9, "iP6600D" }, { 0x04a910b6, "PIXMA iP4300 Printer" }, + { 0x04a910b7, "PIXMA iP5300 Printer" }, { 0x04a910c2, "PIXMA iP1800 Printer" }, { 0x04a910c4, "Pixma iP4500 Printer" }, - { 0x04a910c9, "PIXIMA iP4600 Printer" }, + { 0x04a910c9, "PIXMA iP4600 Printer" }, + { 0x04a910ca, "PIXMA iP3600 Printer" }, { 0x04a910e3, "PIXMA iX6850 Printer" }, { 0x04a91404, "W6400PG" }, { 0x04a91405, "W8400PG" }, @@ -6425,7 +6440,7 @@ static const value_string usb_products_vals[] = { { 0x04a91725, "MP610 ser" }, { 0x04a91726, "MP970 ser" }, { 0x04a91727, "MX300 ser" }, - { 0x04a91728, "MX310 ser" }, + { 0x04a91728, "PIXMA MX310 series" }, { 0x04a91729, "MX700 ser" }, { 0x04a9172b, "MP140 ser" }, { 0x04a91736, "PIXMA MX320 series" }, @@ -6850,6 +6865,7 @@ static const value_string usb_products_vals[] = { { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a93278, "PowerShot S200" }, + { 0x04a9327a, "SELPHY CP910" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, { 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" }, { 0x04a93284, "PowerShot D30" }, @@ -6870,6 +6886,7 @@ static const value_string usb_products_vals[] = { { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" }, { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" }, { 0x04a932ad, "PowerShot SX410 IS" }, + { 0x04a932b1, "SELPHY CP1200" }, { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, @@ -9040,6 +9057,7 @@ static const value_string usb_products_vals[] = { { 0x054c021b, "Net MD" }, { 0x054c021c, "Hi-MD WALKMAN" }, { 0x054c021d, "Net MD" }, + { 0x054c0226, "UP-CR10L" }, { 0x054c0227, "Printing Support" }, { 0x054c022c, "Net MD" }, { 0x054c022d, "Hi-MD AUDIO" }, @@ -9391,6 +9409,12 @@ static const value_string usb_products_vals[] = { { 0x056a0317, "PTH-851 [Intuos pro (L)]" }, { 0x056a0318, "CTH-301 [Bamboo]" }, { 0x056a032f, "DTU-1031X" }, + { 0x056a0347, "Integrated Hub" }, + { 0x056a0348, "Integrated Hub" }, + { 0x056a034a, "DTH-W1320 [MobileStudio Pro 13] touchscreen" }, + { 0x056a034b, "DTH-W1620 [MobileStudio Pro 16] touchscreen" }, + { 0x056a034d, "DTH-W1320 [MobileStudio Pro 13] tablet" }, + { 0x056a034e, "DTH-W1620 [MobileStudio Pro 16] tablet" }, { 0x056a0400, "PenPartner 4x5" }, { 0x056a4001, "TPC4001" }, { 0x056a4004, "TPC4004" }, @@ -11355,7 +11379,12 @@ static const value_string usb_products_vals[] = { { 0x06d30394, "CP9000D/DW Port" }, { 0x06d303a1, "CP9550D/DW Port" }, { 0x06d303a5, "CP9550DW-S" }, + { 0x06d303a9, "CP-9600DW" }, + { 0x06d303aa, "CP3020DA" }, + { 0x06d303ad, "CP-9800DW-S" }, + { 0x06d303ae, "CP-9800DW-S" }, { 0x06d321ba, "FOMA D905i" }, + { 0x06d33b10, "P95D" }, { 0x06d33b30, "CP-D70DW / CP-D707DW" }, { 0x06d33b31, "CP-K60DW-S" }, { 0x06d54000, "Japanese Keyboard" }, @@ -11551,6 +11580,7 @@ static const value_string usb_products_vals[] = { { 0x07180622, "TDK Trans-It 4GB" }, { 0x07180624, "TDK Trans-It 16GB" }, { 0x07181120, "RDX External dock (redbud)" }, + { 0x07184006, "8x Slim DVD Multi-Format Recorder External" }, { 0x0718d000, "Disc Stakka CD/DVD Manager" }, { 0x071b0002, "DTI-56362-USB Digital Interface Unit" }, { 0x071b0101, "Audio4-USB DSP Data Acquisition Unit" }, @@ -11821,10 +11851,12 @@ static const value_string usb_products_vals[] = { { 0x07815571, "Cruzer Fit" }, { 0x07815575, "Cruzer Glide" }, { 0x07815576, "Cruzer Facet" }, + { 0x07815577, "Cruzer Pop (8GB)" }, { 0x0781557d, "Cruzer Force (64GB)" }, { 0x07815580, "SDCZ80 Flash Drive" }, { 0x07815581, "Ultra" }, { 0x07815583, "Ultra Fit" }, + { 0x07815590, "Ultra Dual" }, { 0x07815591, "Ultra Flair" }, { 0x07815e10, "Encrypted" }, { 0x07816100, "Ultra II SD Plus 2GB" }, @@ -12655,14 +12687,21 @@ static const value_string usb_products_vals[] = { { 0x08b0001a, "852 Titrando" }, { 0x08b70001, "Playstation adapter" }, { 0x08b801f4, "USBSIMM1" }, - { 0x08bb2702, "Speakers" }, - { 0x08bb2704, "Audio Codec" }, - { 0x08bb2706, "PCM2706 Audio Codec" }, + { 0x08bb2702, "PCM2702 16-bit stereo audio DAC" }, + { 0x08bb2704, "PCM2704 16-bit stereo audio DAC" }, + { 0x08bb2705, "PCM2705 stereo audio DAC" }, + { 0x08bb2706, "PCM2706 stereo audio DAC" }, + { 0x08bb2707, "PCM2707 stereo audio DAC" }, + { 0x08bb27c4, "PCM2704C stereo audio DAC" }, + { 0x08bb27c5, "PCM2705C stereo audio DAC" }, + { 0x08bb27c6, "PCM2706C stereo audio DAC" }, + { 0x08bb27c7, "PCM2707C stereo audio DAC" }, { 0x08bb2900, "PCM2900 Audio Codec" }, { 0x08bb2901, "PCM2901 Audio Codec" }, { 0x08bb2902, "PCM2902 Audio Codec" }, { 0x08bb2904, "PCM2904 Audio Codec" }, { 0x08bb2910, "PCM2912 Audio Codec" }, + { 0x08bb2912, "PCM2912A Audio Codec" }, { 0x08bb29b0, "PCM2900B Audio CODEC" }, { 0x08bb29b2, "PCM2902 Audio CODEC" }, { 0x08bb29b3, "PCM2903B Audio CODEC" }, @@ -12976,6 +13015,7 @@ static const value_string usb_products_vals[] = { { 0x091e253c, "GPSmap 62sc" }, { 0x091e255b, "Nuvi 2505LM" }, { 0x091e26a1, "Nuvi 55" }, + { 0x091e47fb, "nuviCam" }, { 0x09207500, "Network Interface" }, { 0x09211001, "GoCOM232 Serial" }, { 0x09220007, "LabelWriter 330" }, @@ -12989,6 +13029,7 @@ static const value_string usb_products_vals[] = { { 0x092423dd, "DocuPrint M760 (X760_USB)" }, { 0x09243ce8, "Phaser 3428 Printer" }, { 0x09243cea, "Phaser 3125" }, + { 0x09243cec, "Phaser 3250" }, { 0x09243d5b, "Phaser 6115MFP TWAIN Scanner" }, { 0x09243d6d, "WorkCentre 6015N/NI" }, { 0x0924420f, "WorkCentre PE220 Series" }, @@ -13191,6 +13232,7 @@ static const value_string usb_products_vals[] = { { 0x09511689, "DataTraveler SE9" }, { 0x0951168a, "DataTraveler Micro" }, { 0x0951168c, "DT Elite 3.0" }, + { 0x09557018, "APX" }, { 0x09557030, "Tegra 3 (recovery mode)" }, { 0x095570a9, "nVidia CM9-Adam" }, { 0x09557100, "Tegra Device" }, @@ -13813,9 +13855,15 @@ static const value_string usb_products_vals[] = { { 0x0b054e1f, "Asus TF101 Eeepad Transformer (debug mode)" }, { 0x0b055410, "MeMO Pad HD 7 (MTP mode)" }, { 0x0b055412, "MeMO Pad HD 7 (PTP mode)" }, - { 0x0b05550f, "ASUS fonepad 7" }, + { 0x0b05550f, "Fonepad 7" }, { 0x0b056101, "Cable Modem" }, { 0x0b05620a, "Remote NDIS Device" }, + { 0x0b057772, "ASUS Zenfone GO (ZB500KL) (MTP mode)" }, + { 0x0b057773, "ASUS Zenfone GO (ZB500KL) (Debug, MTP mode)" }, + { 0x0b057774, "ASUS Zenfone GO (ZB500KL) (RNDIS mode)" }, + { 0x0b057775, "ASUS Zenfone GO (ZB500KL) (Debug, RNDIS mode)" }, + { 0x0b057776, "ASUS Zenfone GO (ZB500KL) (PTP mode)" }, + { 0x0b057777, "ASUS Zenfone GO (ZB500KL) (Debug, PTP mode)" }, { 0x0b05b700, "Broadcom Bluetooth 2.1" }, { 0x0b0b106e, "Datamax E-4304" }, { 0x0b0c0009, "Todos Argos Mini II Smart Card Reader" }, @@ -14170,6 +14218,7 @@ static const value_string usb_products_vals[] = { { 0x0bc2231a, "Expansion Portable" }, { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" }, { 0x0bc22321, "Expansion Portable" }, + { 0x0bc22322, "SRD0NF1 Expansion Portable (STEA)" }, { 0x0bc22340, "FreeAgent External Hard Drive" }, { 0x0bc23000, "FreeAgent Desktop" }, { 0x0bc23008, "FreeAgent Desk 1TB" }, @@ -14188,6 +14237,7 @@ static const value_string usb_products_vals[] = { { 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" }, { 0x0bc25121, "FreeAgent GoFlex" }, { 0x0bc25161, "FreeAgent GoFlex dock" }, + { 0x0bc261b7, "Maxtor M3 Portable" }, { 0x0bc2a003, "Backup Plus" }, { 0x0bc2a0a1, "Backup Plus Desktop" }, { 0x0bc2a0a4, "Backup Plus Desktop Drive" }, @@ -14197,6 +14247,7 @@ static const value_string usb_products_vals[] = { { 0x0bc2ab24, "Backup Plus Portable Drive" }, { 0x0bc2ab31, "Backup Plus Desktop Drive (5TB)" }, { 0x0bc2ab34, "Backup Plus" }, + { 0x0bc2ab38, "Backup Plus Hub" }, { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" }, { 0x0bc70001, "ActiveHome (ACPI-compliant)" }, { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" }, @@ -14255,6 +14306,7 @@ static const value_string usb_products_vals[] = { { 0x0bda5401, "RTL 8153 USB 3.0 hub with gigabit ethernet" }, { 0x0bda570c, "Asus laptop camera" }, { 0x0bda5730, "HP 2.0MP High Definition Webcam" }, + { 0x0bda5751, "Integrated Webcam" }, { 0x0bda5775, "HP \"Truevision HD\" laptop camera" }, { 0x0bda57b3, "Acer 640 \\xc3\\x97 480 laptop camera" }, { 0x0bda57da, "Built-In Video Camera" }, @@ -14311,6 +14363,7 @@ static const value_string usb_products_vals[] = { { 0x0bfd0004, "USBcan II" }, { 0x0bfd000b, "Leaf Light HS" }, { 0x0bfd000e, "Leaf SemiPro HS" }, + { 0x0c001607, "Apex M500" }, { 0x0c080378, "Q 16MB Storage Device" }, { 0x0c09a5a5, "Litto Version USB2.0" }, { 0x0c0b27cb, "6-in-1 Flash Reader and Writer" }, @@ -14508,6 +14561,7 @@ static const value_string usb_products_vals[] = { { 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" }, { 0x0c45648b, "Integrated Webcam" }, { 0x0c4564bd, "Sony Visual Communication Camera" }, + { 0x0c4564d0, "Integrated Webcam" }, { 0x0c4564d2, "Integrated Webcam" }, { 0x0c45651b, "HP Webcam" }, { 0x0c456705, "Integrated HD Webcam" }, @@ -14630,7 +14684,9 @@ static const value_string usb_products_vals[] = { { 0x0ca6107e, "Reader Controller" }, { 0x0ca62010, "myPad110 PC/SC Smart Card Reader" }, { 0x0ca63050, "EZ710 Smart Card Reader" }, - { 0x0cad1030, "APX Series Radio" }, + { 0x0cad1007, "APX Series Consolette" }, + { 0x0cad1030, "APX Series Radio (Portable)" }, + { 0x0cad1031, "APX Series Radio (Mobile)" }, { 0x0cad1602, "IMPRES Battery Data Reader" }, { 0x0cad9001, "PowerPad Pocket PC\\xc2\\xa0Device" }, { 0x0caf2507, "Hi-Speed USB-to-IDE Bridge Controller" }, @@ -14686,6 +14742,9 @@ static const value_string usb_products_vals[] = { { 0x0cd40101, "BeolinkPC2" }, { 0x0cd50003, "U3" }, { 0x0cd50009, "UE9" }, + { 0x0cd6000c, "S&B TPU" }, + { 0x0cd6000e, "S&B BKV" }, + { 0x0cd60011, "Money Coin Unit" }, { 0x0cd82007, "Smart Card Reader/JSTU-9700" }, { 0x0cde0001, "XI-750 802.11b Wireless Adapter [Atmel AT76C503A]" }, { 0x0cde0002, "XI-725/726 Prism2.5 802.11b Adapter" }, @@ -14766,6 +14825,7 @@ static const value_string usb_products_vals[] = { { 0x0d160001, "PhotoShuttle" }, { 0x0d160002, "Photo Printer 730 series" }, { 0x0d160004, "Photo Printer 63xPL/PS" }, + { 0x0d16000e, "P910L" }, { 0x0d160100, "Photo Printer 63xPL/PS" }, { 0x0d160102, "Photo Printer 64xPS" }, { 0x0d160103, "Photo Printer 730 series" }, @@ -15101,6 +15161,7 @@ static const value_string usb_products_vals[] = { { 0x0df71800, "Generic Card Reader" }, { 0x0df71802, "Card Reader" }, { 0x0dfc0001, "Touchscreen" }, + { 0x0dfc0101, "5-point Touch Screen" }, { 0x0e0b9031, "802.11n Wireless USB Card" }, { 0x0e0b9041, "802.11n Wireless USB Card" }, { 0x0e0c0101, "LonUSB LonTalk Network Adapter" }, @@ -15386,6 +15447,7 @@ static const value_string usb_products_vals[] = { { 0x0fca8010, "Blackberry Playbook (Connect to Windows mode)" }, { 0x0fca8011, "Blackberry Playbook (Connect to Mac mode)" }, { 0x0fca8020, "Blackberry Playbook (CD-Rom mode)" }, + { 0x0fca8037, "Blackberry PRIV" }, { 0x0fce0075, "SonyEricsson K850i" }, { 0x0fce0076, "SonyEricsson W910" }, { 0x0fce00af, "V640i Phone [PTP Camera]" }, @@ -15622,6 +15684,7 @@ static const value_string usb_products_vals[] = { { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" }, { 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" }, { 0x1004631f, "Optimus Android Phone (Charge Mode)" }, + { 0x1004633a, "Ultimate 2 Android Phone L41C" }, { 0x1004633e, "G2/G3 Android Phone [MTP/PTP/Download mode]" }, { 0x10046344, "G2 Android Phone [tethering mode]" }, { 0x10046356, "Optimus Android Phone [Virtual CD mode]" }, @@ -15790,6 +15853,7 @@ static const value_string usb_products_vals[] = { { 0x10581140, "My Book Essential (WDBACW)" }, { 0x10581230, "My Book (WDBFJK)" }, { 0x10581235, "My Book (WDBFJK0040HBK)" }, + { 0x10582599, "My Passport Ultra (WD40NMZW)" }, { 0x1058259d, "My Passport Ultra (WDBBKD)" }, { 0x1058259f, "My Passport Ultra (WD10JMVW)" }, { 0x1059000b, "StarSign Bio Token 3.0" }, @@ -18287,6 +18351,8 @@ static const value_string usb_products_vals[] = { { 0x1d6b0105, "FunctionFS Gadget" }, { 0x1d6b0200, "Qemu Audio Device" }, { 0x1d90201e, "PPU-700" }, + { 0x1d9d1010, "Docking Station Topline 2009" }, + { 0x1d9d1011, "Docking Station Topline 2012" }, { 0x1de11101, "Generic Display Device (Mass storage mode)" }, { 0x1de1c101, "Generic Display Device" }, { 0x1e0ef000, "iCON 210 UMTS Surfstick" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index b9d1f61946..3597176747 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2016-12-02) +(last updated 2016-12-11) SMI Network Management Private Enterprise Codes: @@ -50174,7 +50174,7 @@ Decimal Josef Horak horak&ath.cz 12655 - exceet Secure Solutions AG (formerly 'AuthentiDate International AG') + exceet Secure Solutions GmbH (formerly 'AuthentiDate International AG') Pierre Kraschinski pierre.kraschinski&exceet.de 12656 @@ -190544,7 +190544,7 @@ Decentralization / Helenic Public Administra Christer Hörnfeldt christer.hornfeldt&holmenskog.com 47741 - Vista Entertainment Solutions + Vista Group Limited (formerly 'Vista Entertainment Solutions') Christoph Berthoud christoph.berthoud&vista.co 47742 @@ -195496,8 +195496,8 @@ Decentralization / Helenic Public Administra Yeoncheon Yi yeoncheon&sawwave.kr 48979 - 帝信科技股份有限公司 (DIXIN Science andTechnology Co., Ltd) - charlie.li + 帝信科技股份有限公司 (DIXIN Technology Co., Ltd) + Charlie Li li.changli&bendis.cc 48980 TCL-IMAX @@ -195615,6 +195615,210 @@ Decentralization / Helenic Public Administra Derome Timber AB Björn Spets bjorn.spets&derome.se +49009 + THE PUBLIC AUTHORITY FOR CIVIL INFORMATION + Tareq Al-Rashed + tareqr&paci.gov.kw +49010 + Rayzon Technologies AG + Marc Danzeisen + marc.danzeisen&rayzon-technologies.com +49011 + Tanium Inc. + Justin Burke + jburke&tanium.com +49012 + Indasys + Dominik Appich + Dominik.appich&indasys.de +49013 + Choice Cancer Care + Joseph P. Gilio, PhD + j.gilio&choicecancercare.com +49014 + Sörmlands Printing Solutions AB + Palle Jacobsen + paja&stibo.com +49015 + HEXBITS TECNOLOGIA LTDA + Carlos Eduardo F. Magnani + carlos.magnani&hexbits.com.br +49016 + Build Informed GmbH + Peter Hirn + peter+iana&bim.ag +49017 + Yukoo Limited + Greg Newton-Ingham + greg&yukoo.co.uk +49018 + Assmann Télécom + Mathieu Van Westerlaak + vanwes_m&assmanntelecom.fr +49019 + ExaScaler Inc. + Yuki Yamaura + yamaura&exascaler.co.jp +49020 + Exaphotons Co., ltd. + Liu Yan + liuyan1001&exaphotons.com +49021 + Saturn Imaging Inc. + Alma Su + almasu&saturnimage.com.tw +49022 + China Moblie(Suzhou) Software Technology Co,Ltd + Jiang Zhaohai + sdlyjzh&126.com +49023 + Universitätsbibliothek Johann Christian Senckenberg + Armin Wenz + a.wenz&ub.uni-frankfurt.de +49024 + Deutsche Gesellschaft zum Bau und Betrieb von Endlagern fuer Abfallstoffe mbH + DBE Technical Support + info&dynexo.de +49025 + ISPAS AS + Anders Rosnes + ar&ispas.no +49026 + DEG - Deutsche Investitions- und Entwicklungsgesellschaft mbH + Pascal Hansmann + nwm°invest.de +49027 + Berner Trading Holding GmbH + Hans-Georg Schweikert + iana_pen&berner-group.com +49028 + Värmevärden AB + Gustaf Molin + gustaf.molin&varmevarden.se +49029 + Seven Solutions S.L + Rafael Rodriguez + sevensols&gmail.com +49030 + GST + Gregor Stever + pen&stever.de +49031 + Walhalla u. Praetoria Verlag GmbH & Co. KG + Hans Schwendner + schwendner.hans&walhalla.de +49032 + Telecom North America Inc. + Roch-Alexandre Nominé + roch&telna.com +49033 + Uptake Technologies, Inc. + Koushik Subramanian + koushik.subramanian&uptake.com +49034 + PROFEN ILETISIM + AHU ATAKAN + ahu.atakan&profen.com +49035 + Seattle Radiologists APC + Casey Allard + it&searad.com +49036 + EM Group + Markus Greiner + markus.greiner&emmos.de +49037 + BrByte + Luiz Fernando Souza Softov + softov&brbyte.com +49038 + Klinikum Dortmund + Jens Leuschner + jens.leuschner&klinikumdo.de +49039 + Teslonix Inc + Alaaedeen Aglan + aaglan&teslonix.com +49040 + Pharm-IT GmbH + Florian Schindler + cert&pharmit.de +49041 + Betc digital + florent Peyron + florent.peyron&ext.betc.com +49042 + Blue Pillar + Mike Rooks + mike.rooks&bluepillar.com +49043 + TeamViewer GmbH + Christoph Kohler + IT&TeamViewer.com +49044 + NewPace Communications Inc + Gavin Murphy + gavin.murphy&newpace.com +49045 + JoyMoe Interactive Entertainment Limited + Chino Chang + chino&joymoe.com +49046 + Faria Education Group Limited + Darrin Wortlehock + operations&fariaedu.com +49047 + Ville de Québec + Bruno Gagnon + bruno-b.gagnon&ville.quebec.qc.ca +49048 + AFONWeb + Alistair Fenning + pen.admin&afonweb.co.uk +49049 + Oster Consulting + CJ Oster + iana-pen&cjoster.com +49050 + PRINT SOLUTION + Naveen Sharma + print24solution&gmail.com +49051 + IKEM AD + Stefan Kirchev + stefan.kirchev&gmail.com +49052 + Trätåg AB + Olle Pettersson + mats.jannes&tieto.com +49053 + Cesare Ceneri + Cesare Ceneri + cesare.ceneri&gmail.com +49054 + Koenigin-Luise-Stiftung + Tobias Seifert + seifert&kls-berlin.de +49055 + AOIFES + Angel Suero + angel.suero&aoifes.com +49056 + 4SH FRANCE + Roux Nicolas + nicolas.roux&4sh.fr +49057 + invenio GmbH Engineering Services + Andreas Vogt + andreas.vogt&invenio.net +49058 + Glookast LLC + Felipe Santos + felipe.santos&glookast.com +49059 + Cronoburn + Eric Goerge + cronoburn&gmail.com End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 59ca48a6d4..9b2f8bf73d 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -12675,7 +12675,7 @@ const value_string sminmpec_values[] = { { 12652, "Aminor" }, { 12653, "Armitel" }, { 12654, "ATH system" }, - { 12655, "exceet Secure Solutions AG (formerly 'AuthentiDate International AG')" }, + { 12655, "exceet Secure Solutions GmbH (formerly 'AuthentiDate International AG')" }, { 12656, "Avest Plc." }, { 12657, "Birm\0303\0251 Consulting" }, { 12658, "Blue Star Sustainable Technologies Inc." }, @@ -47761,7 +47761,7 @@ const value_string sminmpec_values[] = { { 47738, "MilDef AB" }, { 47739, "Fam.Andersson Skog AB" }, { 47740, "Holmen Skog AB" }, - { 47741, "Vista Entertainment Solutions" }, + { 47741, "Vista Group Limited (formerly 'Vista Entertainment Solutions')" }, { 47742, "V-Key Pte Ltd" }, { 47743, "Atelios Communication Systems GmbH" }, { 47744, "Tomra ASA" }, @@ -48999,7 +48999,7 @@ const value_string sminmpec_values[] = { { 48976, "MURATA SYSTEMS,LTD." }, { 48977, "Corsham Technologies, LLC" }, { 48978, "Sawwave" }, - { 48979, "\0345\0270\0235\0344\0277\0241\0347\0247\0221\0346\0212\0200\0350\0202\0241\0344\0273\0275\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (DIXIN Science andTechnology Co., Ltd)" }, + { 48979, "\0345\0270\0235\0344\0277\0241\0347\0247\0221\0346\0212\0200\0350\0202\0241\0344\0273\0275\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (DIXIN Technology Co., Ltd)" }, { 48980, "TCL-IMAX" }, { 48981, "Eigenexus Incorporated" }, { 48982, "Navitel s.r.o." }, @@ -49029,6 +49029,57 @@ const value_string sminmpec_values[] = { { 49006, "DHARA CONSULTING GROUP, INC" }, { 49007, "YAMABUN ELECTRONICS CO., LTD." }, { 49008, "Derome Timber AB" }, + { 49009, "THE PUBLIC AUTHORITY FOR CIVIL INFORMATION" }, + { 49010, "Rayzon Technologies AG" }, + { 49011, "Tanium Inc." }, + { 49012, "Indasys" }, + { 49013, "Choice Cancer Care" }, + { 49014, "S\0303\0266rmlands Printing Solutions AB" }, + { 49015, "HEXBITS TECNOLOGIA LTDA" }, + { 49016, "Build Informed GmbH" }, + { 49017, "Yukoo Limited" }, + { 49018, "Assmann T\0303\0251l\0303\0251com" }, + { 49019, "ExaScaler Inc." }, + { 49020, "Exaphotons Co., ltd." }, + { 49021, "Saturn Imaging Inc." }, + { 49022, "China Moblie(Suzhou) Software Technology Co,Ltd" }, + { 49023, "Universit\0303\0244tsbibliothek Johann Christian Senckenberg" }, + { 49024, "Deutsche Gesellschaft zum Bau und Betrieb von Endlagern fuer Abfallstoffe mbH" }, + { 49025, "ISPAS AS" }, + { 49026, "DEG - Deutsche Investitions- und Entwicklungsgesellschaft mbH" }, + { 49027, "Berner Trading Holding GmbH" }, + { 49028, "V\0303\0244rmev\0303\0244rden AB" }, + { 49029, "Seven Solutions S.L" }, + { 49030, "GST" }, + { 49031, "Walhalla u. Praetoria Verlag GmbH & Co. KG" }, + { 49032, "Telecom North America Inc." }, + { 49033, "Uptake Technologies, Inc." }, + { 49034, "PROFEN ILETISIM" }, + { 49035, "Seattle Radiologists APC" }, + { 49036, "EM Group" }, + { 49037, "BrByte" }, + { 49038, "Klinikum Dortmund" }, + { 49039, "Teslonix Inc" }, + { 49040, "Pharm-IT GmbH" }, + { 49041, "Betc digital" }, + { 49042, "Blue Pillar" }, + { 49043, "TeamViewer GmbH" }, + { 49044, "NewPace Communications Inc" }, + { 49045, "JoyMoe Interactive Entertainment Limited" }, + { 49046, "Faria Education Group Limited" }, + { 49047, "Ville de Qu\0303\0251bec" }, + { 49048, "AFONWeb" }, + { 49049, "Oster Consulting" }, + { 49050, sminmpec_unknown }, /* (Added by Wireshark) */ + { 49051, "IKEM AD" }, + { 49052, "Tr\0303\0244t\0303\0245g AB" }, + { 49053, "Cesare Ceneri" }, + { 49054, "Koenigin-Luise-Stiftung" }, + { 49055, "AOIFES" }, + { 49056, "4SH FRANCE" }, + { 49057, "invenio GmbH Engineering Services" }, + { 49058, "Glookast LLC" }, + { 49059, "Cronoburn" }, { 0, NULL} }; @@ -16839,6 +16839,7 @@ 00:D0:FE AstralPo # ASTRAL POINT 00:D0:FF Cisco # Cisco Systems, Inc 00:D1:1C Acetel +00:D3:18 SpgContr # SPG Controls 00:D3:8D HotelTec # Hotel Technology Next Generation 00:D6:32 GeEnergy # GE Energy 00:D7:8F Cisco # Cisco Systems, Inc @@ -17472,6 +17473,7 @@ 08:00:8F Chipcom # Chipcom Corp. 08:00:90 Retix 08:01:0F SichuanT # SICHUAN TIANYI COMHEART TELECOMCO.,LTD +08:02:8E Netgear 08:03:71 KrgCorpo # KRG CORPORATE 08:05:81 Roku # Roku, Inc. 08:05:CD Dongguan # DongGuang EnMai Electronic Product Co.Ltd. @@ -18039,6 +18041,15 @@ 14:49:E0 SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND) 14:4C:1A MaxCommu # Max Communication GmbH 14:4D:67 ZioncomE # Zioncom Electronics (Shenzhen) Ltd. +14:4F:D7 IeeeRegi # IEEE Registration Authority +14:4F:D7:00:00:00/28 Annapurn # annapurnalabs +14:4F:D7:20:00:00/28 FedexSer # FedEx Services OTI +14:4F:D7:60:00:00/28 I-Sens # i-SENS, Inc. +14:4F:D7:70:00:00/28 Shenzhen # Shenzhen V-Streaming Technology Co., Ltd. +14:4F:D7:80:00:00/28 NportNet # NPort Networks Inc., +14:4F:D7:90:00:00/28 EmersonN # Emerson Network Power (India) Pvt. Ltd. +14:4F:D7:C0:00:00/28 D&SCable # D&S Cable Industries (HK) Limited +14:4F:D7:D0:00:00/28 Shanghai # Shanghai B&A Technology Co., Ltd 14:54:12 Entis # Entis Co., Ltd. 14:56:45 Savitech # Savitech Corp. 14:56:8E SamsungE # Samsung Electronics Co.,Ltd @@ -19098,6 +19109,7 @@ 2C:00:33 Econtrol # EControls, LLC 2C:00:F7 Xos 2C:01:0B NascentT # NASCENT Technology, LLC - RemKon +2C:02:9F 3alogics 2C:06:23 WinLeade # Win Leader Inc. 2C:07:3C Devline # DEVLINE LIMITED 2C:08:1C Ovh @@ -19145,6 +19157,7 @@ 2C:2D:48 BctElect # bct electronic GesmbH 2C:30:33 Netgear 2C:30:68 Pantech # Pantech Co.,Ltd +2C:31:24 Cisco # Cisco Systems, Inc 2C:33:11 Cisco # Cisco Systems, Inc 2C:33:61 Apple # Apple, Inc. 2C:33:7A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -19178,6 +19191,7 @@ 2C:59:8A LgElectr # LG Electronics (Mobile Communications) 2C:59:E5 HewlettP # Hewlett Packard 2C:5A:05 Nokia # Nokia Corporation +2C:5A:0F Cisco # Cisco Systems, Inc 2C:5A:8D Systroni # SYSTRONIK Elektronik u. Systemtechnik GmbH 2C:5A:A3 PromateE # PROMATE ELECTRONIC CO.LTD 2C:5B:B8 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD @@ -19472,6 +19486,7 @@ 34:14:5F SamsungE # Samsung Electronics Co.,Ltd 34:15:9E Apple # Apple, Inc. 34:17:EB Dell # Dell Inc. +34:1A:35 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD 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 @@ -20941,6 +20956,7 @@ 48:82:F2 AppelEle # Appel Elektronik GmbH 48:83:C7 Sagemcom # Sagemcom Broadband SAS 48:86:E8 Microsof # Microsoft Corporation +48:88:03 Mantechn # ManTechnology Inc. 48:88:CA Motorola # Motorola (Wuhan) Mobility Technologies Communication Co., Ltd. 48:8A:D2 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. 48:8E:42 Digalog # DIGALOG GmbH @@ -22442,6 +22458,7 @@ 6C:45:98 AntexEle # Antex Electronic Corp. 6C:4A:39 Bita 6C:4B:7F Vossloh- # Vossloh-Schwabe Deutschland GmbH +6C:4B:90 Liteon 6C:50:4D Cisco # Cisco Systems, Inc 6C:57:79 Aclima # Aclima, Inc. 6C:59:40 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. @@ -22711,6 +22728,7 @@ 70:B3:D5:02:D0:00/36 NexttecS # NEXTtec srl 70:B3:D5:03:00:00/36 TresentT # Tresent Technologies 70:B3:D5:03:30:00/36 SailmonB # Sailmon BV +70:B3:D5:03:90:00/36 DowooDig # DoWoo Digitech 70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section 70:B3:D5:03:D0:00/36 QuercusT # QUERCUS TECHNOLOGIES, S.L. 70:B3:D5:03:F0:00/36 Elesar # Elesar Limited @@ -22943,6 +22961,7 @@ 70:B3:D5:27:80:00/36 Private 70:B3:D5:27:A0:00/36 TdEcophi # TD ECOPHISIKA 70:B3:D5:27:D0:00/36 TelenorC # Telenor Connexion AB +70:B3:D5:27:E0:00/36 MettlerT # Mettler Toledo Hi Speed 70:B3:D5:28:30:00/36 Textninj # TextNinja Co. 70:B3:D5:28:50:00/36 BentecDr # Bentec GmbH Drilling & Oilfield Systems 70:B3:D5:28:60:00/36 PedaxDan # Pedax Danmark @@ -23039,6 +23058,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:36:F0:00/36 Buddygua # BuddyGuard GmbH 70:B3:D5:37:60:00/36 Private 70:B3:D5:37:70:00/36 Monnit # Monnit Corporation 70:B3:D5:37:A0:00/36 ApgCashD # APG Cash Drawer, LLC @@ -23268,6 +23288,7 @@ 70:B3:D5:5B:10:00/36 EpdElect # EPD Electronics 70:B3:D5:5B:50:00/36 LehighEl # Lehigh Electric Products Co 70:B3:D5:5B:60:00/36 EthicalL # Ethical Lighting and Sensor Solutions Limited +70:B3:D5:5B:C0:00/36 LamtecMe # LAMTEC Meß- und Regeltechnik für Feuerungen GmbH & Co. KG 70:B3:D5:5B:E0:00/36 Caswa 70:B3:D5:5C:10:00/36 Shanghai # Shanghai JaWay Information Technology Co., Ltd. 70:B3:D5:5C:40:00/36 TattileS # TATTILE SRL @@ -23304,6 +23325,7 @@ 70:B3:D5:61:50:00/36 JscOtzvu # JSC OTZVUK 70:B3:D5:61:80:00/36 MotecPty # Motec Pty Ltd 70:B3:D5:61:A0:00/36 RocketLa # Rocket Lab Ltd. +70:B3:D5:61:C0:00/36 EarthWor # Earth Works 70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH 70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH 70:B3:D5:62:80:00/36 MectSRL # MECT S.R.L. @@ -23378,6 +23400,7 @@ 70:B3:D5:6E:50:00/36 Deuta-We # DEUTA-WERKE GmbH 70:B3:D5:6E:60:00/36 ElevenEn # Eleven Engineering Incorporated 70:B3:D5:6E:80:00/36 Bluwirel # BluWireless Technology Ltd +70:B3:D5:6E:A0:00/36 Edgeware # Edgeware AB 70:B3:D5:6E:C0:00/36 Crde 70:B3:D5:6E:D0:00/36 Wiingtec # Wiingtech International Co. LTD. 70:B3:D5:6F:20:00/36 P&CMicro # P&C Micro's Pty Ltd @@ -23958,6 +23981,7 @@ 70:B3:D5:CA:90:00/36 Nxcontro # Nxcontrol system Co., Ltd. 70:B3:D5:CA:A0:00/36 BelPower # Bel Power Solutions GmbH 70:B3:D5:CA:C0:00/36 Crde +70:B3:D5:CA:E0:00/36 Thema 70:B3:D5:CB:20:00/36 Seclab 70:B3:D5:CB:60:00/36 Kuebrich # Kuebrich Ingeniergesellschaft mbh & Co. KG 70:B3:D5:CB:70:00/36 Hkc # HKC Limited @@ -24006,6 +24030,7 @@ 70:B3:D5:D2:F0:00/36 LIFESa # L.I.F.E. Corporation SA 70:B3:D5:D3:20:00/36 EuklisBy # Euklis by GSG International 70:B3:D5:D3:40:00/36 G-Philos # G-PHILOS CO.,LTD +70:B3:D5:D3:70:00/36 SiconSrl # Sicon srl 70:B3:D5:D3:80:00/36 VistaRes # Vista Research, Inc. 70:B3:D5:D3:B0:00/36 Nimbelin # NimbeLink Corp 70:B3:D5:D3:F0:00/36 Globalco # GLOBALCOM ENGINEERING SPA @@ -24228,6 +24253,7 @@ 70:B3:D5:F7:B0:00/36 KstTechn # KST technology 70:B3:D5:F7:E0:00/36 AlphaEle # Alpha Elettronica s.r.l. 70:B3:D5:F8:10:00/36 Littlemo # Littlemore Scientific +70:B3:D5:F8:30:00/36 TataComm # Tata Communications Ltd. 70:B3:D5:F8:50:00/36 Solystic 70:B3:D5:F8:B0:00/36 IoootaSr # IOOOTA Srl 70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES @@ -24841,6 +24867,7 @@ 7C:6A:F3 Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd. 7C:6B:33 TenyuTec # Tenyu Tech Co. Ltd. 7C:6B:52 TigaroWi # Tigaro Wireless +7C:6B:F7 Nti # NTI co., ltd. 7C:6C:39 PixsysSr # PIXSYS SRL 7C:6C:8F AmsNeve # AMS NEVE LTD 7C:6D:62 Apple # Apple, Inc. @@ -26176,6 +26203,7 @@ 98:94:49 Skyworth # Skyworth Wireless Technology Ltd. 98:97:D1 Mitrasta # MitraStar Technology Corp. 98:9E:63 Apple # Apple, Inc. +98:A4:0E Snap # Snap, Inc. 98:A7:B0 McstZao # MCST ZAO 98:AA:3C WillI-Te # Will i-tech Co., Ltd. 98:AA:D7 BlueWave # BLUE WAVE NETWORKING CO LTD @@ -26618,12 +26646,14 @@ A4:11:63:30:00:00/28 Pax A4:11:63:40:00:00/28 Alterg # AlterG, Inc. A4:11:63:50:00:00/28 Carbon # Carbon, Inc. A4:11:63:60:00:00/28 BeijingX # Beijing XiaoRui Technology Co., Ltd +A4:11:63:70:00:00/28 Shenzhen # SHENZHEN YIWANJIA INFORMATION TECHNOLOGY CO.,LTD A4:11:63:80:00:00/28 DspreadT # Dspread Technology (Beijing) Inc. A4:11:63:90:00:00/28 AccessoT # accesso Technology Group A4:11:63:A0:00:00/28 Ise # ISE GmbH A4:11:63:B0:00:00/28 MoogMusi # Moog Music Inc. A4:11:63:C0:00:00/28 Viloc A4:11:63:D0:00:00/28 Shenzhen # SHENZHEN ZHISHI TECHNOLOGY CO., LTD. +A4:11:63:E0:00:00/28 Tinylogi # tinylogics A4:12:42 NecPlatf # NEC Platforms, Ltd. A4:13:4E Luxul A4:14:37 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd. @@ -26757,6 +26787,7 @@ A4:99:47 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD A4:99:81 FujianEl # FuJian Elite Power Tech CO.,LTD. A4:9A:58 SamsungE # Samsung Electronics Co.,Ltd A4:9B:13 DigitalC # Digital Check +A4:9B:F5 Hybridse # Hybridserver Tec GmbH A4:9D:49 Ketra # Ketra, Inc. A4:9E:DB Autocrib # AutoCrib, Inc. A4:9F:85 LyveMind # Lyve Minds, Inc @@ -27055,6 +27086,7 @@ AC:6F:BB TatungTe # TATUNG Technology Inc. AC:6F:D9 Valueplu # Valueplus Inc. AC:72:36 LexkingT # Lexking Technology Co., Ltd. AC:72:89 IntelCor # Intel Corporate +AC:74:09 Hangzhou # Hangzhou H3C Technologies Co., Limited AC:7A:42 Iconnect # iConnectivity AC:7A:4D AlpsElec # ALPS ELECTRIC CO.,LTD. AC:7B:A1 IntelCor # Intel Corporate @@ -27364,6 +27396,7 @@ B4:34:6C Matsunic # MATSUNICHI DIGITAL TECHNOLOGY (HONG KONG) LIMI B4:35:64 FujianTi # Fujian Tian Cheng Electron Science & Technical Development Co.,Ltd. B4:35:F7 Zhejiang # Zhejiang Pearmain Electronics Co.ltd. B4:36:A9 FibocomW # Fibocom Wireless Inc. +B4:36:E3 Kbvision # KBVISION GROUP B4:37:41 Consert # Consert, Inc. B4:37:D1 IeeeRegi # IEEE Registration Authority B4:37:D1:00:00:00/28 LezyneUs # Lezyne INC USA @@ -28144,6 +28177,7 @@ C4:93:80 Speedyte # Speedytel technology C4:95:A2 Shenzhen # SHENZHEN WEIJIU INDUSTRY AND TRADE DEVELOPMENT CO., LTD C4:98:05 MinieumN # Minieum Networks, Inc C4:9A:02 LgElectr # LG Electronics (Mobile Communications) +C4:9D:ED Microsof # Microsoft Corporation C4:9E:41 G24Power # G24 Power Limited C4:9F:F3 MciaoTec # Mciao Technologies, Inc. C4:A3:66 Zte # zte corporation @@ -28621,6 +28655,7 @@ D0:3E:5C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD D0:43:1E Dell # Dell Inc. D0:46:DC Southwes # Southwest Research Institute D0:48:F3 Dattus # DATTUS Inc +D0:49:8B ZoomServ # ZOOM SERVER D0:4C:C1 Sintrone # SINTRONES Technology Corp. D0:4D:2C Roku # Roku, Inc. D0:4F:7E Apple # Apple, Inc. @@ -28629,6 +28664,7 @@ D0:51:62 SonyMobi # Sony Mobile Communications AB D0:52:A8 Physical # Physical Graph Corporation D0:53:49 LiteonTe # Liteon Technology Corporation D0:54:2D Cambridg # Cambridge Industries(Group) Co.,Ltd. +D0:55:B2 Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd. D0:57:4C Cisco # Cisco Systems, Inc D0:57:7B IntelCor # Intel Corporate D0:57:85 Pantech # Pantech Co., Ltd. @@ -30106,6 +30142,7 @@ F0:FE:6B Shanghai # Shanghai High-Flying Electronics Technology Co F4:03:04 Google # Google, Inc. F4:03:21 BenextBV # BeNeXt B.V. F4:03:2F Reduxio # Reduxio Systems +F4:03:43 HewlettP # Hewlett Packard Enterprise F4:04:4C Valencet # ValenceTech Limited F4:06:69 IntelCor # Intel Corporate F4:06:8D Devolo # devolo AG @@ -30192,6 +30229,7 @@ F4:6A:92 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO.,LTD F4:6A:BC Adonit # Adonit Corp. Ltd. F4:6D:04 AsustekC # ASUSTek COMPUTER INC. F4:6D:E2 Zte # zte corporation +F4:70:AB VivoMobi # vivo Mobile Communication Co., Ltd. F4:73:CA Conversi # Conversion Sound Inc. F4:76:26 Viltechm # Viltechmeda UAB F4:7A:4E Woojeon& # Woojeon&Handan @@ -11370,6 +11370,8 @@ rt-classmanager 35004/tcp # ReadyTech ClassManager [ReadyTech_Corporation] [Kevi rt-classmanager 35004/udp # ReadyTech ClassManager [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 rt-labtracker 35005/tcp # ReadyTech LabTracker [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 rt-helper 35006/tcp # ReadyTech Helper Service [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +axio-disc 35100/tcp # Axiomatic discovery protocol [Axiomatic_Technologies_Corporation] [Oleksandr_Bogush] 2016-12-09 +axio-disc 35100/udp # Axiomatic discovery protocol [Axiomatic_Technologies_Corporation] [Oleksandr_Bogush] 2016-12-09 kitim 35354/tcp # KIT Messenger [Rudi_Visser] [Rudi_Visser] 2011-07-07 altova-lm 35355/tcp # Altova License Management [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 altova-lm-disc 35355/udp # Altova License Management Discovery [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 88973d9320..2f83888a63 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -9479,91 +9479,91 @@ text-decoration: underline; <translation>Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden.</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <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="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <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="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <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="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation>Vor dem Fortsetzen speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>Stoppen und speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>&Ohne speichern beenden</translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Fortsetzen &ohne zu Speichern</translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <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="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>Die Wireshark Netzwerk Analysesoftware</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>Aufzeichnen von %1</translation> </message> @@ -12311,10 +12311,18 @@ text-decoration: underline; </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>RTP Player</translation> </message> @@ -12422,26 +12430,31 @@ text-decoration: underline; </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>Jitter Puffer:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>Simulierter Jitter Puffer in Millisekunden.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>Zeitsteuerung beim Abspielen:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12459,203 +12472,208 @@ text-decoration: underline; <strong>Unterbrechungsfreier Modus</strong>: Ignoriert den RTP Zeitstemel. Spielt den zusammengesetzten RTP Stream ab. Kann hilfreich sein, wenn RTP Zeitstempel fehlen.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>Jitter Puffer</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>RTP Zeitstempel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>Unterbrechungsfreier Modus</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>Zeitstempel als Uhrzeit anzeigen (ausgewählt) oder als Sekunden seit dem Start des Mitschnitts (nicht angewählt).</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>Uhrzeit</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>Graph zurücksetzen</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>Graph in den Ursprungszustand zurücksetzen.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>Vergrößern</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>Verkleinern</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>Um 10 Bildpunkte nach links verschieben</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>Um 10 Bildpunkte nach rechts verschieben</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>Um 1 Bildpunkt nach links verschieben</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Shift+Left</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>Um 1 Bildpunkt nach rechts verschieben</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Shift+Right</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>Zum Paket gehen, auf das der Mauszeiger gerade zeigt</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>Zum Paket gehen, auf das der Mauszeiger gerade zeigt</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>Verschieben / Zoomen</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>Maustastenverhalten umschalten: Verschieben / Zoomen</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>Z</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>Uhrzeit / verstrichene Zeit</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>Umschalten zwischen Uhrzeit und verstrichener Zeit</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>Fadenkreuz</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>Fadenkreuz ein/ausblenden</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>Space</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>Streams abspielen</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>Außerhalb der Reihe</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>Jitter Drops</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>Falscher Zeitstempel</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>Eingefügte Stille</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. "G" um zu Paket %2 zu gehen</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index d60c9aa479..b3dc9c92fe 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -9235,91 +9235,91 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <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="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <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="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <source>Do you want to save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <source>(File name can't be mapped to UTF-8)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation type="unfinished"></translation> </message> @@ -11991,10 +11991,18 @@ a:hover { </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation type="unfinished"></translation> </message> @@ -12081,26 +12089,31 @@ a:hover { </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12114,203 +12127,208 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index ece9017eac..1d3651f38a 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -9447,91 +9447,91 @@ a:hover { <translation>Vous ne pouvez pas exporter les paquets de la capture en cours.</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <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="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <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="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <source>Do you want to save the captured packets%1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>Arreter et Sauvegarder</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <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="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>L'analyseur de réseau Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>Capture en cours de %1</translation> </message> @@ -12279,10 +12279,18 @@ a:hover { </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>Player RTP</translation> </message> @@ -12390,26 +12398,31 @@ a:hover { </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>Tampon de Gigue:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>Le tampon de gigue simulé en millisecondes.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>Durée playback</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12423,203 +12436,208 @@ a:hover { <translation type="unfinished"></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>Tampon Gigue</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>Cachet RTP</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>Mode Ininterrompu</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>Voir les cachets comme heure du jour (coché) ou comme secondes depuis le début de la capture (décoché).</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>Heure du Jour</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>Réinitialiser le Graphique</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>Réinitialiser le graphique à son état initial.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>Zoom Avant</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>Zoom arrière</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>Déplacer à Gauche de 10 Pixels</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>Gauche</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>Déplacer à Droite de 10 Pixels</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>Droite</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>Déplacer à Gauche d'1 Pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Maj+Gauche</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>Déplacer à Droite d'1 Pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Maj+Droite</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>Aller au paquet sous le curseur</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>Aller au paquet actuellement sous le curseur</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>Glisser / Zoom</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>Basculer comportant de la souris glisser / zoom</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>Z</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>Capture / Temps de Session d'origine</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>Basculer du temps d'origine capture / session</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>Réticule</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>Basculer réticule</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>Espace</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>Jouer Flux</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>Hors de Séquence</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>Chutes de Gigue</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>Mauvais Cachets</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>Silence Inséré</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. Appuyez sur "G" pour aller au paquet %2</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>Inconnu</translation> </message> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index bcb18cb31a..889cbea8f5 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -9477,91 +9477,91 @@ a:hover { <translation>Non puoi esportare pacchetti sul file di cattura attuale.</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <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="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <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="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <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="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation>Salva prima di continuare</translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>Ferma e salva</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>Esci senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Continua senza sal&vare</translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <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="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark l'analizzatore di rete</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>Cattura da %1</translation> </message> @@ -12309,10 +12309,18 @@ a:hover { </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>Lettore RTP</translation> </message> @@ -12420,26 +12428,31 @@ a:hover { </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>Buffer jitter:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>Il buffer del jitter simulato in millisecondi.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>Orario della riproduzione:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12457,203 +12470,208 @@ a:hover { <strong>Modalità senza interruzione</strong>: ignora la marca temporale RTP. Riproduce il flusso quando è completo. Ciò è utile quando manca la marca temporale RTP.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>Buffer jitter</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>Marca temporale RTP</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>Modalità senza interruzione</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>Visualizza le marche temporali come ora del giorno (marcata) o secondi dall'inizio della cattura (non marcata).</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>Ora del giorno</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>Ripristina grafico</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>Ripristina il grafico al suo stato iniziale.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>Ingrandisci</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>Rimpicciolisci</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>Sposta a sinistra di 10 pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>Sinistra</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>Sposta a destra di 10 pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>Destra</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>Sposta a sinistra di 1 pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Maiusc+Sinistra</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>Sposta a destra di 1 pixel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Maiusc+Destra</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>Vai al pacchetto sotto il cursore</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>Vai al pacchetto attualmente sotto il cursore</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>Trascina / Ingrandisci</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>Commuta il comportamento di trascinamento/ingrandimento del mouse</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>Z</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>Origine dell'orario della cattura/sessione</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>Commuta l'origine dell'orario della cattura/sessione</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>Reticolo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>Commuta il reticolo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>Spazio</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>Riproduci flussi</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>Fuori sequenza</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>Scarti jitter</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>Marche temporali errate</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>Silenzio inserito</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. Premi "G" per andare al pacchetto %2</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 3840b29771..7680bbbdc0 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -9429,91 +9429,91 @@ a:hover { <translation>現在のキャプチャファイルへパケットをエクスポートすることはできません</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>保存しない場合キャプチャしたパケットは失われます</translation> </message> <message> - <location filename="main_window.cpp" line="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <source>Your changes will be lost if you don't save them.</source> <translation>保存しない場合変更は失われます</translation> </message> <message> - <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <source>Do you want to save the captured packets%1?</source> <translation>キャプチャしたパケットを保存しますか？%1</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>停止して保存</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <source>(File name can't be mapped to UTF-8)</source> <translation>ファイル名をUTF-8形式に割り当てできません</translation> </message> <message> - <location filename="main_window.cpp" line="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>ワイヤーシャークネットワークアナライザ</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>%1 からキャプチャ中</translation> </message> @@ -12260,10 +12260,18 @@ a:hover { </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>RTPプレイヤー</translation> </message> @@ -12371,26 +12379,31 @@ a:hover { </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>ジッタバッファ:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>ミリ秒で試算したジッタバッファ</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>再生タイミング:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12408,203 +12421,208 @@ a:hover { <strong>Uninterrupted Mode</strong>: RTPタイムスタンプを無視します。ストリームを完成させたかのようにして再生します。これはRTPタイムスタンプがない場合に有効です。</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>ジッタバッファ</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>RTPタイムスタンプ</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>非割込みモード</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>時刻表示(チェックされています）でタイムスタンプを表示するかパケットキャプチャ開始してからの秒数（チェックされていません）で表示します</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>時刻</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>グラフをリセット</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>グラフを初期状態にリセットします</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>拡大</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>縮小</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>左に10ピクセル移動</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>左</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>右に10ピクセル移動</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>右</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>左に1ピクセル移動</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Shift+左</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>右に1ピクセル移動</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Shift+右</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>カーソル位置のパケットに移動</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>現在カーソル位置のパケットに移動します</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>ドラッグ/ズーム</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>マウスのドラッグ/ズームの動作を切り替えます</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>Z</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>キャプチャ/セッション時間起点</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>キャプチャ/セッション時間起点を切り替えます</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>十字カーソル</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>十字カーソルの表示切り替え</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>スペース</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>ストリームを再生</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>シーケンス外</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>ジッタ欠落</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>タイムスタンプが誤っている</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>無音が挿入されている</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. "G" を押してパケット %2 へ移動</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>不明</translation> </message> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index d08824a597..b27cec3935 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -9479,91 +9479,91 @@ text-decoration: underline; <translation>Nie można wyeksportować pakietów do aktualnego pliku.</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <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="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <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="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <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="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation>Zapisz przed kontynuowaniem</translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>Zatrzymaj i zapisz</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>Wyjdź bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>Kontynuuj bez zapisy&wania</translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <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="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>Analizator Wireshark</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>Przechwytywanie z %1</translation> </message> @@ -12311,10 +12311,18 @@ text-decoration: underline; </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>Odtwarzacz RTP</translation> </message> @@ -12422,26 +12430,31 @@ text-decoration: underline; </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>Bufor Jitter:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>Symulowany bufor jitter w milisekundach.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>Czas strumienia:</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12459,203 +12472,208 @@ text-decoration: underline; <strong>Tryb ciągły</strong>: Ignoruje wszelkie znaczniki czasu i odgrywa strumień poskładany z przychodzących pakietów.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>Buforowanie jitter</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>RTP Timestamp</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>Tryb ciągły</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>Pokazuj znaczniki czasu jak czas dnia (zaznaczone) lub sekundy od początku przechwytywania (niezaznaczone).</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>Czas dnia</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>Resetuj wykres</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>Resetuj wykres do stanu początkowego.</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>Powiększ</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>Pomniejsz</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>Przesuń w lewo o 10 pikseli</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>W lewo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>Przesuń w prawo o 10 pikseli</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>W prawo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>Przesuń w lewo o 1 piksel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Shift+w lewo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>Przesuń w prawo o 1 piksel</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Shift+w prawo</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>Idź do pakietu pod kursorem</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>Idź do pakietu pod kursorem</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>Przeciągnij / Powiększ/pomniejsz</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>Przełącz mysz pomiędzy funkcją przeciągnięcia a powiększenia/pomniejszenia</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>ZZ</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>Czas sesji / przechwytywania</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>Przełącz między czasem przechwytywania a sesji</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>Wskaźniki</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>Przełącz wskaźnik wykresu</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>Spacja</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>Odtwarzaj Strumienie</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>Poza kolejnością</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>Porzucenia Jitter</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>Błędny znacznik czasu</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>Wstawiono ciszę</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. Naciśnij "G" przejść do pakietu %2</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>Nieznany</translation> </message> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 36de152847..46949ab84d 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -9466,91 +9466,91 @@ text-decoration: underline; <translation>您不能将分组导出到当前捕获文件。</translation> </message> <message> - <location filename="main_window.cpp" line="1519"/> - <location filename="main_window.cpp" line="1544"/> + <location filename="main_window.cpp" line="1518"/> + <location filename="main_window.cpp" line="1543"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1590"/> <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="1587"/> - <location filename="main_window.cpp" line="1595"/> + <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1594"/> <source>Your captured packets will be lost if you don't save them.</source> <translation>若不保存，您已经捕获的分组将会丢失。</translation> </message> <message> - <location filename="main_window.cpp" line="1600"/> + <location filename="main_window.cpp" line="1599"/> <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="1592"/> - <location filename="main_window.cpp" line="1601"/> + <location filename="main_window.cpp" line="1591"/> + <location filename="main_window.cpp" line="1600"/> <source>Your changes will be lost if you don't save them.</source> <translation>若不保存，您的更改将会丢失。</translation> </message> <message> - <location filename="main_window.cpp" line="1586"/> + <location filename="main_window.cpp" line="1585"/> <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="1594"/> + <location filename="main_window.cpp" line="1593"/> <source>Do you want to save the captured packets%1?</source> <translation>您是否要保存已捕获的分组%1？</translation> </message> <message> - <location filename="main_window.cpp" line="1618"/> + <location filename="main_window.cpp" line="1617"/> <source>Save before Continue</source> <translation>继续前保存</translation> </message> <message> - <location filename="main_window.cpp" line="1620"/> + <location filename="main_window.cpp" line="1619"/> <source>Stop and Save</source> <translation>停止并保存</translation> </message> <message> - <location filename="main_window.cpp" line="1632"/> + <location filename="main_window.cpp" line="1631"/> <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="1644"/> + <location filename="main_window.cpp" line="1643"/> <source>Quit &without Saving</source> <oldsource>Quit without Saving</oldsource> <translation>直接退出，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1635"/> - <location filename="main_window.cpp" line="1648"/> + <location filename="main_window.cpp" line="1634"/> + <location filename="main_window.cpp" line="1647"/> <source>Continue &without Saving</source> <oldsource>Continue without Saving</oldsource> <translation>继续，不保存(&W)</translation> </message> <message> - <location filename="main_window.cpp" line="1638"/> + <location filename="main_window.cpp" line="1637"/> <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="1991"/> + <location filename="main_window.cpp" line="1990"/> <source>(File name can't be mapped to UTF-8)</source> <translation>文件名不能映射到UTF-8</translation> </message> <message> - <location filename="main_window.cpp" line="2012"/> + <location filename="main_window.cpp" line="2011"/> <source>The Wireshark Network Analyzer</source> <translation>Wireshark 网络分析器</translation> </message> <message> - <location filename="main_window.cpp" line="2037"/> + <location filename="main_window.cpp" line="2036"/> <source>Capturing from %1</source> <translation>正在捕获 %1</translation> </message> @@ -12296,10 +12296,18 @@ text-decoration: underline; </message> </context> <context> + <name>RtpAudioStream</name> + <message> + <location filename="rtp_audio_stream.cpp" line="572"/> + <source>%1 does not support PCM at %2. Preferred format is %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>RtpPlayerDialog</name> <message> <location filename="rtp_player_dialog.ui" line="14"/> - <location filename="rtp_player_dialog.cpp" line="112"/> + <location filename="rtp_player_dialog.cpp" line="113"/> <source>RTP Player</source> <translation>RTP 播放器</translation> </message> @@ -12407,26 +12415,31 @@ text-decoration: underline; </message> <message> <location filename="rtp_player_dialog.ui" line="165"/> + <source>Output Device:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.ui" line="192"/> <source><html><head/><body><p><br/></p></body></html></source> <translation><html><head/><body><p><br/></p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="168"/> + <location filename="rtp_player_dialog.ui" line="195"/> <source>Jitter Buffer:</source> <translation>抖动缓冲区：</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="175"/> + <location filename="rtp_player_dialog.ui" line="202"/> <source>The simulated jitter buffer in milliseconds.</source> <translation>以毫秒为单位的模拟的抖动缓冲区。</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="207"/> + <location filename="rtp_player_dialog.ui" line="234"/> <source>Playback Timing:</source> <translation>播放时间：</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="214"/> + <location filename="rtp_player_dialog.ui" line="241"/> <source><strong>Jitter Buffer</strong>: Use jitter buffer to simulate the RTP stream as heard by the end user. <br/> <strong>RTP Timestamp</strong>: Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing. @@ -12444,203 +12457,208 @@ text-decoration: underline; <strong>不间断模式</strong>: 忽略 RTP 时间戳。播放流认为它是完整的。 这在 RTP 时间戳缺失时非常有用。</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="222"/> + <location filename="rtp_player_dialog.ui" line="249"/> <source>Jitter Buffer</source> <translation>抖动缓冲区</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="227"/> + <location filename="rtp_player_dialog.ui" line="254"/> <source>RTP Timestamp</source> <translation>RTP 时间戳</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="232"/> + <location filename="rtp_player_dialog.ui" line="259"/> <source>Uninterrupted Mode</source> <translation>不间断模式</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="253"/> + <location filename="rtp_player_dialog.ui" line="280"/> <source><html><head/><body><p>View the timestamps as time of day (checked) or seconds since beginning of capture (unchecked).</p></body></html></source> <translation><html><head/><body><p>以当天时间形式查看时间戳（选中状态）或者以自捕捉以来的秒数（未选中状态）</p></body></html></translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="256"/> + <location filename="rtp_player_dialog.ui" line="283"/> <source>Time of Day</source> <translation>当天时间</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="275"/> + <location filename="rtp_player_dialog.ui" line="315"/> <source>Reset Graph</source> <translation>复位图形</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="278"/> + <location filename="rtp_player_dialog.ui" line="318"/> <source>Reset the graph to its initial state.</source> <translation>复位图形到初始状态。</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="281"/> + <location filename="rtp_player_dialog.ui" line="321"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="286"/> - <location filename="rtp_player_dialog.ui" line="289"/> + <location filename="rtp_player_dialog.ui" line="326"/> + <location filename="rtp_player_dialog.ui" line="329"/> <source>Zoom In</source> <translation>放大</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="292"/> + <location filename="rtp_player_dialog.ui" line="332"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="297"/> - <location filename="rtp_player_dialog.ui" line="300"/> + <location filename="rtp_player_dialog.ui" line="337"/> + <location filename="rtp_player_dialog.ui" line="340"/> <source>Zoom Out</source> <translation>缩小</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="303"/> + <location filename="rtp_player_dialog.ui" line="343"/> <source>-</source> <translation>-</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="308"/> - <location filename="rtp_player_dialog.ui" line="311"/> + <location filename="rtp_player_dialog.ui" line="348"/> + <location filename="rtp_player_dialog.ui" line="351"/> <source>Move Left 10 Pixels</source> <translation>左移10像素</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="314"/> + <location filename="rtp_player_dialog.ui" line="354"/> <source>Left</source> <translation>左键</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="319"/> - <location filename="rtp_player_dialog.ui" line="322"/> + <location filename="rtp_player_dialog.ui" line="359"/> + <location filename="rtp_player_dialog.ui" line="362"/> <source>Move Right 10 Pixels</source> <translation>右移10像素</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="325"/> + <location filename="rtp_player_dialog.ui" line="365"/> <source>Right</source> <translation>右方向键</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="330"/> - <location filename="rtp_player_dialog.ui" line="333"/> + <location filename="rtp_player_dialog.ui" line="370"/> + <location filename="rtp_player_dialog.ui" line="373"/> <source>Move Left 1 Pixels</source> <translation>左移10像素 {1 ?}</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="336"/> + <location filename="rtp_player_dialog.ui" line="376"/> <source>Shift+Left</source> <translation>Shift+左方向键</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="341"/> - <location filename="rtp_player_dialog.ui" line="344"/> + <location filename="rtp_player_dialog.ui" line="381"/> + <location filename="rtp_player_dialog.ui" line="384"/> <source>Move Right 1 Pixels</source> <translation>右移1像素</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="347"/> + <location filename="rtp_player_dialog.ui" line="387"/> <source>Shift+Right</source> <translation>Shift+右方向键</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="352"/> + <location filename="rtp_player_dialog.ui" line="392"/> <source>Go To Packet Under Cursor</source> <translation>跳转到光标所在的分组</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="355"/> + <location filename="rtp_player_dialog.ui" line="395"/> <source>Go to packet currently under the cursor</source> <translation>跳转到当前光标所在的分组</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="358"/> + <location filename="rtp_player_dialog.ui" line="398"/> <source>G</source> <translation>G</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="363"/> + <location filename="rtp_player_dialog.ui" line="403"/> <source>Drag / Zoom</source> <translation>拖拽/缩放</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="366"/> + <location filename="rtp_player_dialog.ui" line="406"/> <source>Toggle mouse drag / zoom behavior</source> <translation>切换鼠标拖拽/缩放行为</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="369"/> + <location filename="rtp_player_dialog.ui" line="409"/> <source>Z</source> <translation>Z</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="374"/> + <location filename="rtp_player_dialog.ui" line="414"/> <source>Capture / Session Time Origin</source> <translation>捕获/会话时间起源</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="377"/> + <location filename="rtp_player_dialog.ui" line="417"/> <source>Toggle capture / session time origin</source> <translation>切换捕获/会话时间起源</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="380"/> + <location filename="rtp_player_dialog.ui" line="420"/> <source>T</source> <translation>T</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="385"/> + <location filename="rtp_player_dialog.ui" line="425"/> <source>Crosshairs</source> <translation>十字线</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="388"/> + <location filename="rtp_player_dialog.ui" line="428"/> <source>Toggle crosshairs</source> <translation>切换十字线</translation> </message> <message> - <location filename="rtp_player_dialog.ui" line="391"/> + <location filename="rtp_player_dialog.ui" line="431"/> <source>Space</source> <translation>空格键</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="170"/> + <location filename="rtp_player_dialog.cpp" line="166"/> + <source>No devices available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="rtp_player_dialog.cpp" line="186"/> <source>Play Streams</source> <translation>播放流</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="276"/> + <location filename="rtp_player_dialog.cpp" line="292"/> <source>Out of Sequence</source> <translation>乱序</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="291"/> + <location filename="rtp_player_dialog.cpp" line="307"/> <source>Jitter Drops</source> <translation>抖动过滤</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="306"/> + <location filename="rtp_player_dialog.cpp" line="322"/> <source>Wrong Timestamps</source> <translation>错误的时间戳</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="321"/> + <location filename="rtp_player_dialog.cpp" line="337"/> <source>Inserted Silence</source> <translation>插入的静默</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="501"/> + <location filename="rtp_player_dialog.cpp" line="520"/> <source>%1. Press "G" to go to packet %2</source> <translation>%1. 按 "G" 去到数据包 %2</translation> </message> <message> - <location filename="rtp_player_dialog.cpp" line="685"/> + <location filename="rtp_player_dialog.cpp" line="707"/> <source>Unknown</source> <translation>未知</translation> </message> |