From: activityworkshop <mail@activityworkshop.net>
Date: Tue, 11 May 2021 19:05:18 +0000 (+0200)
Subject: Merge from 20.*
X-Git-Tag: v21.dev.fp1~24
X-Git-Url: https://gitweb.fperrin.net/?a=commitdiff_plain;h=81c4925ba427f2bc1f50b5af31f5a94206e91248;p=GpsPrune.git

Merge from 20.*
---

81c4925ba427f2bc1f50b5af31f5a94206e91248
diff --cc src/tim/prune/GpsPrune.java
index 5503ccf,6644642..b4e3699
--- a/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 1b49eb1,39f177e..eca3590
--- a/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_pl.properties
index ec7a531,2733749..fc1ec4b
--- a/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?