subsurface.git/core, branch v4.6.4

Correct divesite geocoding translation

2017-04-26T12:34:40Z

See https://github.com/Subsurface-divelog/subsurface/issues/345. The menues where not translated. The basis of this error is a simple typo in core/taxonomy.c where the classname was mis-spelled in the QT_TRANSLATE_NOOP. In addition, to pull and translate the strings from C code, the normal tr() does not work, and the functionality from the gettextfromc class is used. Fixes: #345 Signed-off-by: Jan Mulder

Do not carry po2 setpoint data over dive boundaries

2017-04-24T14:51:12Z

The file static po2 value, used to set the setpoint data, was not re-initialized at the parsing of a dive during import from the divecomputer. So, in one import session, the po2 was transferred from one dive to the next, obviously resulting in weird bugs, due to possible wrong po2 settings. Signed-off-by: Jan Mulder

Reduce default verbosity

2017-04-22T19:38:59Z

Signed-off-by: Dirk Hohndel

Identify user provided notes in plain text in replan

2017-04-20T17:57:47Z

This is another attept at the problem if identifying a potentially user supplied text in the dive notes upon replannig a dive. It gets rid of the user visable position markers (*!* and ***) and cirumvents problems with mark-up by first converting the old notes to plan text (assuming that user only enters plain text in the notes field as we do in other places as well). Then the automatically added part is identified by locating the disclaimer in the text (if the user edited/delted the disclaimer or changed langue in between it is her problem to manually delete the old plan). Everything from the disclaimer on is deleted and replaced by the new plan. If the disclaimer is not found, the new plan is appended to the old notes. This way we make sure no information gets automatically deleted. Signed-off-by: Robert C. Helling

Show % after Büllmanns GFs

2017-04-20T17:57:11Z

2 strings in the planner output showed based on "Bühlmann ZHL-16B with GFLow = " gradient factors without % after the factor. While this is fine for an abbreviated form like GF 40/80, this looks strange for a verbose sentence like the 2 corrected ones. Signed-off-by: Jan Mulder

Support for new DM5 blob format

2017-04-20T17:55:19Z

Currently we do not know what the extra data in the sampleBlob is, but the block size must be adjusted nevertheless. Signed-off-by: Miika Turkia

Attempt latin1 parsing on import

2017-04-19T01:13:05Z

We parse input XML using UTF-8 encoding by default. If this fails, try latin1 instead. Signed-off-by: Miika Turkia

Handle notes from planner

2017-04-16T14:42:32Z

New strategy to identify old planner output in notes when replanning a dive: Text anchors ("*!*" and "***") added for planner output For backwards compatibility: If there is no anchor but an old table delete everything. Signed-off-by: Stefan Fuchs

Cleanup some unnecessary include statements

2017-04-14T01:02:47Z

Some of these header files are no longer necessary, and will be removed from libdivecomputer in the near future. Signed-off-by: Jef Driesen Signed-off-by: Dirk Hohndel

Fix building against upstream libdivecomputer

2017-04-14T01:02:39Z

The custom_serial.h header doesn't exist in upstream libdivecomputer. Signed-off-by: Jef Driesen Signed-off-by: Dirk Hohndel