Merge branch 'master' into 'master'

player.efis.pfd Version 3.2 production release.

See merge request !2333

metadata/player.efis.data.eur.rus.txt

@@ -22,11 +22,9 @@ Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
 Build:1.0,1
-    disable=fdroid/admin#31
     commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.eur.rus
     gradle=yes
-    prebuild=sed -i -e 's@//applicationId@applicationId@g' build.gradle
 
 Auto Update Mode:None
 Update Check Mode:Tags ^PROD

metadata/player.efis.data.txt

@@ -1,3 +1,4 @@
+Disabled:Superseded by player.efis.data.*.*.txt
 Categories:Navigation
 License:Apache-2.0
 Web Site:http://members.iinet.net.au/~ninelima/efis/

metadata/player.efis.data.usa.can.txt

@@ -21,8 +21,7 @@ The synthetic vision terrain (DEM) data pack for use with Kwik EFIS.
 Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
-Build:1.1,2
+Build:1.2,3
-    disable=fdroid/admin#31
     commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.usa.can
     gradle=yes

metadata/player.efis.data.zar.aus.txt

@@ -22,7 +22,6 @@ Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
 Build:1.2,3
-    disable=fdroid/admin#31
     commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.zar.aus
     gradle=yes

metadata/player.efis.pfd.txt

@@ -21,7 +21,9 @@ required terrain data packages are available on F-Droid, see:
 
 1. North America/Canada [[player.efis.data.usa.can]]
 
-2. Southren Africa/Australia [[player.efis.data.zar.aus]]
+2. Europe/Russia [[player.efis.data.eur.rus]]
+
+3. Southern Africa/Australia [[player.efis.data.zar.aus]]
 
 * Flight Director