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"
This commit is contained in:
l10n daemon script 2022-05-27 01:43:32 +00:00
parent 3a13e0ec9d
commit 75bfdb616d
1 changed files with 1 additions and 1 deletions

View File

@ -28,7 +28,7 @@ Comment=Mobile Podcast Application
Comment[ca]=Aplicació mòbil per a podcast
Comment[ca@valencia]=Aplicació mòbil per a podcast
Comment[cs]=Mobilní aplikace pro přehrávání podcastů
Comment[de]= Podcast-Anwendung für Mobilgeräte
Comment[de]=Podcast-Anwendung für Mobilgeräte
Comment[en_GB]=Mobile Podcast Application
Comment[es]=Aplicación de pódcast para móviles
Comment[fi]=Podcast-mobiilisovellus