Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2024-12-25 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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 2020-06-18 05:46:40 +02:00
parent 5ea5a6f0ec
commit 5d8865a8f1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.kde.alligator.desktop
View File

@ -16,6 +16,7 @@ Name[sk]=Alligator
Name[sl]=Alligator Name[sl]=Alligator
Name[sv]=Alligator Name[sv]=Alligator
Name[uk]=Alligator Name[uk]=Alligator
Name[x-test]=xxAlligatorxx
Comment=Mobile Feed Reader Comment=Mobile Feed Reader
Comment[ca]=Lector de fonts per a mòbil Comment[ca]=Lector de fonts per a mòbil
Comment[ca@valencia]=Lector de fonts per a mòbil Comment[ca@valencia]=Lector de fonts per a mòbil
@ -31,6 +32,7 @@ Comment[ru]=Чтение лент новостей для мобильных у
Comment[sl]=Mobilni bralnik novic Comment[sl]=Mobilni bralnik novic
Comment[sv]=Mobil kanalläsare Comment[sv]=Mobil kanalläsare
Comment[uk]=Програма для читання подач на мобільному Comment[uk]=Програма для читання подач на мобільному
Comment[x-test]=xxMobile Feed Readerxx
GenericName=Feed Reader GenericName=Feed Reader
GenericName[ca]=Lector de fonts GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts GenericName[ca@valencia]=Lector de fonts
@ -47,6 +49,7 @@ GenericName[sk]=Čítačka RSS kanálov
GenericName[sl]=Bralnik novic GenericName[sl]=Bralnik novic
GenericName[sv]=Kanalläsare GenericName[sv]=Kanalläsare
GenericName[uk]=Читання подач GenericName[uk]=Читання подач
GenericName[x-test]=xxFeed Readerxx
Encoding=UTF-8 Encoding=UTF-8
Icon=alligator Icon=alligator
Exec=alligator Exec=alligator