Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] master 9b5a09a: [Automatic update for 20

From: Martin Kaiser <lists@xxxxxxxxx>
Date: Mon, 27 Apr 2015 17:44:14 +0200
Thus wrote Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

> We're really close to not worrying about that :-)

That's what I was hoping :-)

I couldn't get the QMakefile to rebuild the .qm files correctly. There's
a bunch of examples on the web, none of them would work for me.

The cmake version should be ok, I had to make modifications to create
and use the .qm files in the build dir rather than in the source. My
solution might be a bit clumsy but it should work.

Regards,
Martin

> On 26 April 2015 at 19:01, Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
> wrote:

> > Hi Evan,

> > Martin have start to work for generate qm files but the problem is don't
> > (yet) work for nmake...
> > https://code.wireshark.org/review/#/c/7597/

> > Regards,

> > On Sun, Apr 26, 2015 at 7:29 PM, Evan Huus <eapache@xxxxxxxxx> wrote:

> >> Now that the translation files are being updated every week, we really
> >> need to remove the binary files from the repo. I know it's been
> >> discussed before, but anybody with a working qt-dev installation
> >> should be able to generate the .qm files from the .ts files, yes?

> >> On Sun, Apr 26, 2015 at 11:07 AM, Wireshark code review
> >> <code-review-do-not-reply@xxxxxxxxxxxxx> wrote:
> >> > URL:
> >> https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9b5a09aa3479b56b111439222397f239b477cda8
> >> > Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
> >> > Changed: branch: master
> >> > Repository: wireshark

> >> > Commits:

> >> > 9b5a09a by Gerald Combs (gerald@xxxxxxxxxxxxx):

> >> >     [Automatic update for 2015-04-26]

> >> >     Update manuf, services enterprise-numbers, translations, and other
> >> items.

> >> >     Change-Id: I431063783434a6f7a9a4f4b8186316ed3f98005b
> >> >     Reviewed-on: https://code.wireshark.org/review/8199
> >> >     Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>


> >> > Actions performed:

> >> >     from  0437280   C15ch: fix o previous prototype for function
> >> [-Wmissing-prototypes]
> >> >     adds  9b5a09a   [Automatic update for 2015-04-26]


> >> > Summary of changes:
> >> >  epan/dissectors/usb.c    |   76 ++++++++++---
> >> >  epan/enterprise-numbers  |  116 +++++++++++++++++++-
> >> >  epan/sminmpec.c          |   30 ++++-
> >> >  manuf                    |   46 +++++++-
> >> >  services                 |   18 +--
> >> >  ui/qt/wireshark_it.qm    |  Bin 239430 -> 239746 bytes
> >> >  ui/qt/wireshark_it.ts    |    4 +-
> >> >  ui/qt/wireshark_zh_CN.qm |  Bin 173107 -> 173233 bytes
> >> >  ui/qt/wireshark_zh_CN.ts |  272
> >> +++++++++++++++++++++++-----------------------
> >> >  9 files changed, 398 insertions(+), 164 deletions(-)

> >> ___________________________________________________________________________
> >> > Sent via:    Wireshark-commits mailing list <
> >> wireshark-commits@xxxxxxxxxxxxx>
> >> > Archives:    https://www.wireshark.org/lists/wireshark-commits
> >> > Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
> >> >              mailto:wireshark-commits-request@xxxxxxxxxxxxx
> >> ?subject=unsubscribe

> >> ___________________________________________________________________________
> >> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> >> Archives:    https://www.wireshark.org/lists/wireshark-dev
> >> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
> >>              mailto:wireshark-dev-request@xxxxxxxxxxxxx
> >> ?subject=unsubscribe



> > ___________________________________________________________________________
> > Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> > Archives:    https://www.wireshark.org/lists/wireshark-dev
> > Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
> >              mailto:wireshark-dev-request@xxxxxxxxxxxxx
> > ?subject=unsubscribe





> ___________________________________________________________________________
> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives:    https://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe