Merge from 20.*

diff --cc src/tim/prune/GpsPrune.java
index 5503ccf6e552e68b1698b0e3ca1ab2404c10cc9b,6644642cc2168172a78c6bb68f16d724d1aea7a1..b4e3699dd9d02214e71e4f0459bab7a6a4cd896a
--- 1/src/tim/prune/GpsPrune.java
--- 2/src/tim/prune/GpsPrune.java
+++ b/src/tim/prune/GpsPrune.java
@@@ -38,9 -38,9 +38,9 @@@ import tim.prune.gui.profile.ProfileCha
  public class GpsPrune
  {
        /** Version number of application, used in about screen and for version check */
 -      public static final String VERSION_NUMBER = "20.4";
 +      public static final String VERSION_NUMBER = "21";
        /** Build number, just used for about screen */
-       public static final String BUILD_NUMBER = "384";
 -      public static final String BUILD_NUMBER = "387";
++      public static final String BUILD_NUMBER = "388";
        /** Static reference to App object */
        private static App APP = null;
  

diff --cc src/tim/prune/lang/prune-texts_cz.properties
index 1b49eb1e224b7c97b56f6af576ad3cc1fb8b462c,39f177e2486a8d6eac80394399c46e2bc8ff1c1b..eca3590fe542c6ef274453dd609e3b4ad232c724
--- 1/src/tim/prune/lang/prune-texts_cz.properties
--- 2/src/tim/prune/lang/prune-texts_cz.properties
+++ b/src/tim/prune/lang/prune-texts_cz.properties
@@@ -358,7 -360,8 +360,7 @@@ dialog.gpsies.nonefound=Nenalezeny \u01
  dialog.mapillary.nonefound=Nenalezeny \u017e\u00e1dn\u00e9 fotografie
  dialog.wikipedia.column.name=N\u00e1zev \u010dl\u00e1nku
  dialog.wikipedia.column.distance=Vzd\u00e1lenost
- dialog.wikipedia.nonefound=Nenalezeny \u017e\u00e1dn\u00e9 body
+ dialog.wikipedia.nonefound=Nebyly nalezeny \u017e\u00e1dn\u00e9 z\u00e1znamy na wikipedii
 -dialog.wikipedia.gallery=Galerie
  dialog.osmpois.column.name=N\u00e1zev
  dialog.osmpois.column.type=Typ
  dialog.osmpois.nonefound=Nenalezeny \u017e\u00e1dn\u00e9 body

diff --cc src/tim/prune/lang/prune-texts_de.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_de_CH.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_en.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_es.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_fi.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_fr.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_hu.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_it.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_nl.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_pl.properties
index ec7a531991efc7477666e5e965fb0543f27f0acc,2733749ebe7c2411c31c212ebd14f4383ad3177a..fc1ec4b738c07329b6a97c0240541e328d6e7a40
--- 1/src/tim/prune/lang/prune-texts_pl.properties
--- 2/src/tim/prune/lang/prune-texts_pl.properties
+++ b/src/tim/prune/lang/prune-texts_pl.properties
@@@ -367,7 -369,10 +369,9 @@@ dialog.mapillary.nonefound=Nic nie zost
  dialog.wikipedia.column.name=Tytu\u0142 artyku\u0142u
  dialog.wikipedia.column.distance=Odleg\u0142o\u015b\u0107
  dialog.wikipedia.nonefound=Brak wpis\u00f3w w wikipedii
 -dialog.wikipedia.gallery=Galeria
  dialog.osmpois.column.name=Nazwa
+ dialog.osmpois.column.type=Typ
+ dialog.osmpois.nonefound=Nie znaleziono punkt\u00f3w
  dialog.geocaching.nonefound=Nic nie zosta\u0142o znalezione
  dialog.correlate.notimestamps=Punkty nie maj\u0105 znacznik\u00f3w czasu, nie mo\u017cna ich powi\u0105za\u0107 ze zdj\u0119ciami.
  dialog.correlate.nouncorrelatedphotos=Nie ma nie powi\u0105zanych zdj\u0119\u0107.\nCzy na pewno chcesz kontynuowa\u0107?

diff --cc src/tim/prune/lang/prune-texts_ro.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_ru.properties
Simple merge

diff --cc src/tim/prune/lang/prune-texts_sv.properties
Simple merge