GitLab

Now first the block of nodes will be written then the block of ways and finally the block of relations.

Thanks go to Gerhard Holtkamp for working on this and for
providing the most recent version.

REVIEW: 124807

Edit Maps panel).

CCBUG: 363587

These experimental features and their corresponding OSM tags have been added so as to enable the rendering of features obtained on converting the NaturalEarth dataset into OSM form.

Differential Revision: https://phabricator.kde.org/D1823

The foreach loop is only entered if there are inner polygons. Therefore, the check inside the loop was redundant.

Differential Revision: https://phabricator.kde.org/D1628

* store all qt-only strings in marble_qt.pot, not some in marble.pot
* use $EXTRACT_TR_STRINGS, $XGETTEXT_QT was for kdelibs4-based projects only
* pass UI files directly to $EXTRACT_TR_STRINGS, not via $EXTRACTRC
* be more explicit when finding files to not also include files from
  tools or examples
* create proper QCoreApplication::translate calls for strings extracted
  from data files, when used via Qt translation mechanism.
* separate Messages.sh file for KDE Marble app in its source folder
* use consistently i18n() calls in marble-kde source code

CCMAIL:	kde-i18n-doc@kde.org

Differential Revision: https://phabricator.kde.org/D1763

 Please enter the commit message for your changes. Lines starting

https://phabricator.kde.org/T2424

* reduces indirection:
  const char* is another object, its value pointing to the actual char array,
  while const char[] is the array itself
* prevents accidental changes of the variable:
  const char* itself is non-const type, just pointing to const chars,
  so could be set to another value without the compiler complaining

Qt already comes with a serial port module which is most likely provided by distributions shipping Qt. For QextSerialPort, however, this doesn't seem to be the case, e.g. ArchLinux. Therefore, Qt's serial port module seems to be the better alternative.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"