doing a 4.6.1 release

[Robert Helling]

Hi,

> On 02.02.2017, at 06:49, Robert Helling <helling at atdotde.de> wrote:
> 
> there are three things on my pending issues list:
> 
> - Stefan’s patch printing the altitude/surface pressure in the dive plan which needs a rebase
> 
> - The issue with the Vyper in gauge mode with gas transmitter (at least make that error go away)
> 
> - Willem’s merging problem (this might be too difficult for a quick fix).
> 
> Give me time tonight to do something about 2. and give 3. a try (or decide it’s too hard).
> 
> Do we have new strings since the release that need translation?
> 


quick update:

In a day full of oral exams, I managed to squeeze in some coding. I have a branch on github (small_fixes) that

a) solves 2) from above (at the price of two new strings that should be visible only to users with the original reporter’s problem, so missing translations should not really be a show stopper)

b) almost solves 3): the actual problem is solved by taking the union of the cylinders when merging a dive from the planner. I only need to make sure that in the statistics, we do not double count the gas use then, hope to finish that tonight, will then send a pull request.

It seems, that we now do polish translations (at least for Qt elements) and those do not exist in Qt 5.5 (which I still use). I copied those from 5.7 and then the build works again, just wanted to report that this breaks building with 5.5 (which shouldn’t really be a problem).

Best
Robert

--
.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
Robert C. Helling     Elite Master Course Theoretical and Mathematical Physics
                      Scientific Coordinator
                      Ludwig Maximilians Universitaet Muenchen, Dept. Physik
                      Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339
                      http://www.atdotde.de

Enhance your privacy, use cryptography! My PGP keys have fingerprints
A9D1 A01D 13A5 31FA 6515  BB44 0820 367C 36BC 0C1D    and
DCED 37B6 251C 7861 270D  5613 95C7 9D32 9A8D 9B8F





-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170202/3fc0e483/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170202/3fc0e483/attachment.sig>