From e8e8b0d0b46941f79535c020f5464c372d0138a7 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 17 Sep 2017 08:07:02 +0000 Subject: [PATCH] [Automatic update for 2017-09-17] Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0b157ca377ef2e8f1a2502e51b542322dc0d36b2 Reviewed-on: https://code.wireshark.org/review/23580 Reviewed-by: Gerald Combs --- enterprises.tsv | 27 ++++++++++++++++++++-- epan/dissectors/usb.c | 3 +++ ui/qt/wireshark_de.ts | 24 ++++++++++---------- ui/qt/wireshark_en.ts | 48 ---------------------------------------- ui/qt/wireshark_fr.ts | 24 ++++++++++---------- ui/qt/wireshark_it.ts | 24 ++++++++++---------- ui/qt/wireshark_ja_JP.ts | 24 ++++++++++---------- ui/qt/wireshark_pl.ts | 24 ++++++++++---------- ui/qt/wireshark_zh_CN.ts | 24 ++++++++++---------- 9 files changed, 100 insertions(+), 122 deletions(-) diff --git a/enterprises.tsv b/enterprises.tsv index 6739b2086e..6e88d51aa7 100644 --- a/enterprises.tsv +++ b/enterprises.tsv @@ -5,7 +5,7 @@ # The format used here is: # Where SPACE can be any sequence of spaces and tabs. # -# (last updated 2017-09-09) +# (last updated 2017-09-16) 0 Reserved 1 NxNetworks @@ -2506,7 +2506,7 @@ 2501 Yago Systems, Inc. 2502 LunarWave Communications 2503 Bangkok Pattaya Hospital -2504 Roke Manor Research Limited Keith +2504 Roke Manor Research Limited 2505 New Oak Communications, Inc. 2506 Bug Free Development 2507 ARC Technologies Group, Inc. @@ -50495,3 +50495,26 @@ 50675 TRANSMASH-TOMSK 50676 Essenjay Technology 50677 datacrumbs +50678 Cihan Aydin +50679 Hanssens Telecom +50680 SomaLogic Inc. +50681 IPHolders Inc. +50682 SKB Prominform +50683 NETMA +50684 Xantaro +50685 OSZ Informations- und Medizintechnik +50686 Blue Cedar +50687 Energyfive +50688 GRIDNET +50689 Uila Inc. +50690 Space Exploration Technologies +50691 Janus Technology Ltda. +50692 Embrapa Sede +50693 ATEA Baltic +50694 Symanitron-electronics +50695 ENLITEON Limited +50696 Brightways Corporation +50697 Cafari Inc. +50698 North Central Texas Council of Governments +50699 ASiO +50700 Ulrich Busch diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index b0c617bee1..d212411e44 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -2818,6 +2818,7 @@ static const value_string usb_vendors_vals[] = { { 0x1e71, "NZXT" }, { 0x1e74, "Coby Electronics Corporation" }, { 0x1e7d, "ROCCAT" }, + { 0x1ea7, "SHARKOON Technologies GmbH" }, { 0x1ebb, "NuCORE Technology, Inc." }, { 0x1eda, "AirTies Wireless Networks" }, { 0x1edb, "Blackmagic design" }, @@ -18880,6 +18881,8 @@ static const value_string usb_products_vals[] = { { 0x1e7d2d50, "Kova+ Mouse" }, { 0x1e7d2d51, "Kone+ Mouse" }, { 0x1e7d30d4, "Arvo Keyboard" }, + { 0x1ea70066, "[Mediatrack Edge Mini Keyboard]" }, + { 0x1ea72007, "SHARK ZONE K30 Illuminated Gaming Keyboard" }, { 0x1eda2012, "Air2210 54 Mbps Wireless Adapter" }, { 0x1eda2210, "Air2210 54 Mbps Wireless Adapter" }, { 0x1eda2310, "Air2310 150 Mbps Wireless Adapter" }, diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 338b7d83e9..7d2f2235c7 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -1518,39 +1518,39 @@ Achtung: Eine Option MUSS ausgewählt sein. DecodeAsDialog Field - Feld + Feld Match using this field - Übereinstimmend mit diesem Feld + Übereinstimmend mit diesem Feld Value - Wert + Wert Current "Decode As" behavior - Aktuelles "Dekodieren als"-Verhalten + Aktuelles "Dekodieren als"-Verhalten Type - Typ + Typ Default - Standard + Standard Default "Decode As" behavior - Standard "Dekodieren als"-Verhalten + Standard "Dekodieren als"-Verhalten Current - Aktuell + Aktuell Change behavior when the protocol field matches this value - Wenn dieser Wert auf das Protokollfeld zutrifft, soll das Verhalten geändert werden + Wenn dieser Wert auf das Protokollfeld zutrifft, soll das Verhalten geändert werden Change the dissection behavior for a protocol. @@ -1570,15 +1570,15 @@ Achtung: Eine Option MUSS ausgewählt sein. String - Zeichenkette + Zeichenkette Integer, base - Integer, base + Integer, base unknown - unbekannt + unbekannt diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index d7592541ac..6e87b5cf47 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -1513,42 +1513,6 @@ PLEASE NOTE: One option MUST be selected. DecodeAsDialog - - Field - - - - Match using this field - - - - Value - - - - Current "Decode As" behavior - - - - Type - - - - Default - - - - Default "Decode As" behavior - - - - Current - - - - Change behavior when the protocol field matches this value - - Change the dissection behavior for a protocol. @@ -1565,18 +1529,6 @@ PLEASE NOTE: One option MUST be selected. Decode As - - String - - - - Integer, base - - - - unknown - - DisplayFilterExpressionDialog diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 0f57ac7a95..dbf1062edf 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -1518,39 +1518,39 @@ NOTE: Une option DOIT être sélectionnée. DecodeAsDialog Field - Champs + Champs Match using this field - Correspondre à l'utilisation de ce champs + Correspondre à l'utilisation de ce champs Value - Valeur + Valeur Current "Decode As" behavior - Status "Decoder comme" + Status "Decoder comme" Type - Type + Type Default - Défaut + Défaut Default "Decode As" behavior - "Decodé comme" : défaut + "Decodé comme" : défaut Current - actuel + actuel Change behavior when the protocol field matches this value - Modifer le comportement lorsque le champ de protocole correspond à cette valeur + Modifer le comportement lorsque le champ de protocole correspond à cette valeur Change the dissection behavior for a protocol. @@ -1570,15 +1570,15 @@ NOTE: Une option DOIT être sélectionnée. String - Chaine de Caractères + Chaine de Caractères Integer, base - Nombre + Nombre unknown - inconnu + inconnu diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index dcd0537709..3f3d2afea3 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -1518,39 +1518,39 @@ NOTA: un'opzione DEVE essere selezionata. DecodeAsDialog Field - Campo + Campo Match using this field - Cerca usando questo campo + Cerca usando questo campo Value - Valore + Valore Current "Decode As" behavior - Comportamento corrente di "Decodifica come" + Comportamento corrente di "Decodifica come" Type - Tipo + Tipo Default - Predefinito + Predefinito Default "Decode As" behavior - Comportamento predefinito di "Decodifica come" + Comportamento predefinito di "Decodifica come" Current - Attuale + Attuale Change behavior when the protocol field matches this value - Cambia il comportamento quando il campo del protocollo corrisponde a questo valore + Cambia il comportamento quando il campo del protocollo corrisponde a questo valore Change the dissection behavior for a protocol. @@ -1570,15 +1570,15 @@ NOTA: un'opzione DEVE essere selezionata. String - Stringa + Stringa Integer, base - Intero, base + Intero, base unknown - sconosciuto + sconosciuto diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index eda279846e..f9a3eafc31 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -1513,39 +1513,39 @@ PLEASE NOTE: One option MUST be selected. DecodeAsDialog Field - フィールド + フィールド Match using this field - このフィールドを利用して照合します + このフィールドを利用して照合します Value - 値 + 値 Current "Decode As" behavior - 現在の "としてデコード" の振る舞い + 現在の "としてデコード" の振る舞い Type - 種別 + 種別 Default - デフォルト + デフォルト Default "Decode As" behavior - デフォルトの "としてデコード " の振る舞い + デフォルトの "としてデコード " の振る舞い Current - 現在 + 現在 Change behavior when the protocol field matches this value - プロトコルフィールドがこの値に一致した際の振る舞いを変更します + プロトコルフィールドがこの値に一致した際の振る舞いを変更します Change the dissection behavior for a protocol. @@ -1565,15 +1565,15 @@ PLEASE NOTE: One option MUST be selected. String - 文字列 + 文字列 Integer, base - 整数型, 基数 + 整数型, 基数 unknown - 不明 + 不明 diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 4608472257..1a8079b775 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -1519,39 +1519,39 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona. DecodeAsDialog Field - Pole + Pole Match using this field - Porówuje używając tego pola + Porówuje używając tego pola Value - Wartość + Wartość Current "Decode As" behavior - Obecne ustawienia dekodowania + Obecne ustawienia dekodowania Type - Typ + Typ Default - Domyślne + Domyślne Default "Decode As" behavior - Obecne ustawiania dekodowania + Obecne ustawiania dekodowania Current - Obecnie + Obecnie Change behavior when the protocol field matches this value - Zmienia dekodowanie gdy pole protokołu będzie mieć zadaną wartość + Zmienia dekodowanie gdy pole protokołu będzie mieć zadaną wartość Change the dissection behavior for a protocol. @@ -1571,15 +1571,15 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona. String - String + String Integer, base - Integer, o podstawie + Integer, o podstawie unknown - nieznany + nieznany diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 8ee7d77e70..56f9c94281 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -1514,39 +1514,39 @@ PLEASE NOTE: One option MUST be selected. DecodeAsDialog Field - 字段 + 字段 Match using this field - 使用此字段匹配 + 使用此字段匹配 Value - 值 + 值 Current "Decode As" behavior - 当前“解码”行为 + 当前“解码”行为 Type - 类型 + 类型 Default - 默认 + 默认 Default "Decode As" behavior - 默认“解码”行为 + 默认“解码”行为 Current - 当前 + 当前 Change behavior when the protocol field matches this value - 当协议字段匹配此值时变更行为 + 当协议字段匹配此值时变更行为 Change the dissection behavior for a protocol. @@ -1566,15 +1566,15 @@ PLEASE NOTE: One option MUST be selected. String - 字符串 + 字符串 Integer, base - 整数，底数 + 整数，底数 unknown - 未知 + 未知