Wireshark-commits: [Wireshark-commits] master-2.6 8aad1c3: Revert translation changes in commit 066

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 24 Oct 2018 03:36:51 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8aad1c3d09a6e107ae17f69ed5ba6b6b3cb307ee
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

8aad1c3 by Gerald Combs (gerald.combs@xxxxxxxxxxxx):

    Revert translation changes in commit 066ab657c4.
    
    `tx pull -f` clobbers our translation strings, and the result was
    committed in 066ab657c4. Revert the change and disable pulls for now.
    
    Ping-bug: 15207
    Change-Id: I15912ace333f34b3a99963cccb1c301921e8efd5
    Reviewed-on: https://code.wireshark.org/review/30360
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1ec5a93   LBMPDM: fix heap-buffer-overflow (write) in dissect_segment_ofstable
     add  8aad1c3   Revert translation changes in commit 066ab657c4.


Summary of changes:
 tools/update-tx          |     2 +-
 ui/qt/wireshark_de.ts    | 12830 ++++++++++++++++++++++++++++++++++++++++++++-
 ui/qt/wireshark_fr.ts    | 10208 +++++++++++++++++++++++++++++++++++-
 ui/qt/wireshark_it.ts    | 12825 +++++++++++++++++++++++++++++++++++++++++++-
 ui/qt/wireshark_ja_JP.ts | 12792 +++++++++++++++++++++++++++++++++++++++++++-
 ui/qt/wireshark_pl.ts    | 11452 +++++++++++++++++++++++++++++++++++++++-
 ui/qt/wireshark_zh_CN.ts | 11450 +++++++++++++++++++++++++++++++++++++++-
 7 files changed, 70648 insertions(+), 911 deletions(-)