[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4bd609e7db802a88d1de8bbf6777ac589688409
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

d4bd609 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2018-05-27]
    
    Update manuf, services enterprise numbers, translations, and other items.
    
    Change-Id: I1c965ee7870ca5a8603f6d41b7f361fa5a02ccf8
    Reviewed-on: https://code.wireshark.org/review/27841
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  3ffd964   Fix STUN-over-SSL/TLS/DTLS.
    adds  d4bd609   [Automatic update for 2018-05-27]


Summary of changes:
 docbook/wsug_src/editcap-T.txt |   4 +-
 enterprises.tsv                |  49 +++-
 manuf                          | 105 +++++---
 ui/qt/wireshark_de.ts          |   4 +-
 ui/qt/wireshark_en.ts          |   8 -
 ui/qt/wireshark_fr.ts          |   4 +-
 ui/qt/wireshark_it.ts          |   4 +-
 ui/qt/wireshark_ja_JP.ts       | 600 ++++++++++++++++++++++-------------------
 ui/qt/wireshark_pl.ts          |   4 +-
 ui/qt/wireshark_zh_CN.ts       |   4 +-
 10 files changed, 454 insertions(+), 332 deletions(-)