Merge branch 'master' into 'master'

Update Kwik EFIS links to HTML - See website issue 150

See merge request fdroid/fdroiddata!6813

metadata/player.efis.cfd.yml

@@ -20,11 +20,11 @@ Description: |-
     data. If enabled, it also allows for some terrain collision detection. The
     required terrain data packages are available via F-Droid, see:
 
-    * [[player.efis.data.usa.can]]
+    * [https://f-droid.org/en/packages/player.efis.data.usa.can/ North America, Canada]
-    * [[player.efis.data.eur.rus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Europe, Russia]
-    * [[player.efis.data.sah.jap]]
+    * [https://f-droid.org/en/packages/player.efis.data.sah.jap/ Sahara / North Africa, India / Indonesia, Japan]
-    * [[player.efis.data.zar.aus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Southern Africa, Australia / New Zealand]
-    * [[player.efis.data.pan.arg]]
+    * [https://f-droid.org/en/packages/player.efis.data.pan.arg/ South America]
 
     '''Flight Director'''
 
@@ -58,11 +58,11 @@ Description: |-
 
     '''Companion Applications'''
 
-    [[player.efis.pfd]] is the primary flight display
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS] is the primary flight display
     application of the EFIS. It provides a modern attitude and flight
     instrument display.
 
-    [[player.efis.mfd]] is a stand-alone digital
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] is a stand-alone digital
     moving map application. It provides situational awareness and navigation
     functionality.
 

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

@@ -10,9 +10,9 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DataPac (eur.rus)
 Description: |-
     The synthetic vision terrain (DEM) data pack for use with
-    [[player.efis.pfd]],
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS],
-    [[player.efis.mfd]] and
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] and
-    [[player.efis.cfd]].
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP].
 
     * Europe
     * Russia

metadata/player.efis.data.pan.arg.yml

@@ -10,9 +10,9 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DataPac (pan.arg)
 Description: |-
     The synthetic vision terrain (DEM) data pack for use with
-    [[player.efis.pfd]],
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS],
-    [[player.efis.mfd]] and
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] and
-    [[player.efis.cfd]].
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP].
 
     * South America
 

metadata/player.efis.data.sah.jap.yml

@@ -10,9 +10,9 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DataPac (sah.jap)
 Description: |-
     The synthetic vision terrain (DEM) data pack for use with
-    [[player.efis.pfd]],
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS],
-    [[player.efis.mfd]] and
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] and
-    [[player.efis.cfd]].
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP].
 
     * Sahara / North Africa
     * India / Indonesia

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

@@ -10,9 +10,9 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DataPac (usa.can)
 Description: |-
     The synthetic vision terrain (DEM) data pack for use with
-    [[player.efis.pfd]],
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS],
-    [[player.efis.mfd]] and
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] and
-    [[player.efis.cfd]].
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP].
 
     * North America
     * Canada

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

@@ -10,9 +10,9 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DataPac (zar.aus)
 Description: |-
     The synthetic vision terrain (DEM) data pack for use with
-    [[player.efis.pfd]],
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS],
-    [[player.efis.mfd]] and
+    [https://f-droid.org/en/packages/player.efis.mfd/ Kwik DMAP] and
-    [[player.efis.cfd]].
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP].
 
     * Southern Africa
     * Australia / New Zealand

metadata/player.efis.mfd.yml

@@ -10,7 +10,7 @@ Bitcoin: 1KKWRF25NwVgNdankr1vBphtkLbX766Ee1
 AutoName: Kwik DMAP
 Description: |-
     Kwik Moving Map is a companion application to the EFIS. It provides situational
-    awareness and and navigation functionality. All Kwik applications can optionally
+    awareness and navigation functionality. All Kwik applications can optionally
     integrate with the Stratux ADS-B/AHRS to provide real-time traffic overlay.
 
     '''Synthetic Vision'''
@@ -19,11 +19,11 @@ Description: |-
     data. If enabled, it also allows for some terrain collision detection. The
     required terrain data packages are available via F-Droid, see:
 
-    * [[player.efis.data.usa.can]]
+    * [https://f-droid.org/en/packages/player.efis.data.usa.can/ North America, Canada]
-    * [[player.efis.data.eur.rus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Europe, Russia]
-    * [[player.efis.data.sah.jap]]
+    * [https://f-droid.org/en/packages/player.efis.data.sah.jap/ Sahara / North Africa, India / Indonesia, Japan]
-    * [[player.efis.data.zar.aus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Southern Africa, Australia / New Zealand]
-    * [[player.efis.data.pan.arg]]
+    * [https://f-droid.org/en/packages/player.efis.data.pan.arg/ South America]
 
     '''Airspace'''
 
@@ -50,11 +50,11 @@ Description: |-
 
     '''Companion Applications'''
 
-    [[player.efis.pfd]] is the primary flight display
+    [https://f-droid.org/en/packages/player.efis.pfd/ Kwik EFIS] is the primary flight display
     application of the EFIS. It provides a modern attitude and flight
     instrument display.
 
-    [[player.efis.cfd]] is a composite flight display
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP] is a composite flight display
     application combining the moving map and the primary flight display. It provides
     both displays on a single device.
 

metadata/player.efis.pfd.yml

@@ -20,11 +20,11 @@ Description: |-
     data. If enabled, it also allows for some terrain collision detection. The
     required terrain data packages are available via F-Droid, see:
 
-    * [[player.efis.data.usa.can]]
+    * [https://f-droid.org/en/packages/player.efis.data.usa.can/ North America, Canada]
-    * [[player.efis.data.eur.rus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Europe, Russia]
-    * [[player.efis.data.sah.jap]]
+    * [https://f-droid.org/en/packages/player.efis.data.sah.jap/ Sahara / North Africa, India / Indonesia, Japan]
-    * [[player.efis.data.zar.aus]]
+    * [https://f-droid.org/en/packages/player.efis.data.eur.rus/ Southern Africa, Australia / New Zealand]
-    * [[player.efis.data.pan.arg]]
+    * [https://f-droid.org/en/packages/player.efis.data.pan.arg/ South America]
 
     '''Flight Director'''
 
@@ -48,11 +48,11 @@ Description: |-
 
     '''Companion Applications'''
 
-    [[player.efis.mfd]] is a stand-alone digital
+    [https://f-droid.org/en/packages/player.efis.mfd// Kwik DMAP] is a stand-alone digital
     moving map application. It provides situational awareness and navigation
     functionality.
 
-    [[player.efis.cfd]] is a composite flight display
+    [https://f-droid.org/en/packages/player.efis.cfd/ Kwik COMP] is a composite flight display
     application combining the moving map and the primary flight display. It
     provides both displays on a single device.