Compare commits

...

2 Commits

Author SHA1 Message Date
Heiko Becker 2b7cf50f5c GIT_SILENT Update Appstream for new release
(cherry picked from commit 5befa9bc73ed60e9b407c999efdad7536ddc42a6)
2021-05-07 20:40:51 +02:00
l10n daemon script 789a014df2 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2021-05-07 01:18:46 +00:00
2 changed files with 2 additions and 2 deletions

View File

@ -265,9 +265,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
<binary>partitionmanager</binary>
</provides>
<releases>
<release version="21.04.1" date="2021-05-13"/>
<release version="21.04.0" date="2021-04-22"/>
<release version="20.12.3" date="2021-03-04"/>
<release version="20.12.2" date="2021-02-04"/>
<release version="20.12.1" date="2021-01-07"/>
</releases>
</component>

View File

@ -175,7 +175,7 @@ Keywords[ca]=partició;disc;
Keywords[ca@valencia]=partició;disc;
Keywords[cs]=oddíl;disk;
Keywords[da]=partition;disk;
Keywords[de]=partition;disk;festplatte
Keywords[de]=partition;disk;festplatte;
Keywords[el]=κατάτμηση;δίσκος;
Keywords[en_GB]=partition;disk;
Keywords[es]=partición;disco;