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 2021-05-08 01:18:40 +00:00
parent f4f7728629
commit 86327a98d8
1 changed files with 21 additions and 0 deletions

View File

@ -1,7 +1,28 @@
[Desktop Entry] [Desktop Entry]
Name=Kasts Name=Kasts
Name[ca]=Kasts
Name[de]=Kasts
Name[es]=Kasts
Name[nl]=Kasts
Name[sv]=Kasts
Name[uk]=Kasts
Name[x-test]=xxKastsxx
Comment=Mobile Podcast Application Comment=Mobile Podcast Application
Comment[ca]=Aplicació mòbil per a podcast
Comment[de]= Podcast-App für Mobilgeräte
Comment[es]=Aplicación de podcast para móviles
Comment[nl]=Podcastprogramma voor mobiel
Comment[sv]=Mobilt poddradioprogram
Comment[uk]=Мобільна програма для подкастів
Comment[x-test]=xxMobile Podcast Applicationxx
GenericName=Podcast Application GenericName=Podcast Application
GenericName[ca]=Aplicació de podcast
GenericName[de]=Podcast-App
GenericName[es]=Aplicación de podcast
GenericName[nl]=Podcastprogramma
GenericName[sv]=Poddradioprogram
GenericName[uk]=Програма для подкастів
GenericName[x-test]=xxPodcast Applicationxx
Icon=kasts Icon=kasts
Exec=kasts Exec=kasts
Type=Application Type=Application