From: Méven Car <meven29@gmail.com>
Date: Mon, 18 May 2020 06:17:01 +0000 (+0200)
Subject: Merge branch 'release/20.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a058c64eba30f11bfa87ac097371c04437d0471e?hp=-c

Merge branch 'release/20.04'
---

a058c64eba30f11bfa87ac097371c04437d0471e
diff --combined src/org.kde.dolphin.appdata.xml
index 4e5025916,c77e4e12e..215e670fe
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@@ -576,7 -576,6 +576,7 @@@
        <caption xml:lang="pt-BR">Gerenciamento de arquivos no Dolphin</caption>
        <caption xml:lang="ru">Управление файлами</caption>
        <caption xml:lang="sk">Správa súborov v Dolphin</caption>
 +      <caption xml:lang="sl">Upravljanje datotek v Dolphinu</caption>
        <caption xml:lang="sv">Filhantering i Dolphin</caption>
        <caption xml:lang="uk">Керування файлами у Dolphin</caption>
        <caption xml:lang="x-test">xxFile management in Dolphinxx</caption>
@@@ -590,9 -589,9 +590,9 @@@
      <binary>dolphin</binary>
    </provides>
    <releases>
+     <release version="20.04.1" date="2020-05-14"/>
      <release version="20.04.0" date="2020-04-23"/>
      <release version="19.12.3" date="2020-03-05"/>
      <release version="19.12.2" date="2020-02-06"/>
-     <release version="19.12.1" date="2020-01-09"/>
    </releases>
  </component>