Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2025-01-11 16:13:56 +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-13 05:33:05 +02:00
parent 2e21dbc002
commit 6bfc732ac7
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

@ -13,6 +13,7 @@ Name[nn]=Alligator
Name[pt]=Alligator
Name[ru]=Alligator
Name[sk]=Alligator
Name[sl]=Alligator
Name[sv]=Alligator
Name[uk]=Alligator
Name[x-test]=xxAlligatorxx
@ -28,6 +29,7 @@ Comment[nl]=Mobiele feedlezer
Comment[nn]=Mobil kjeldelesar
Comment[pt]=Leitor Móvel de Fontes
Comment[ru]=Чтение лент новостей для мобильных устройств
Comment[sl]=Mobilni bralnik novic
Comment[sv]=Mobil kanalläsare
Comment[uk]=Програма для читання подач на мобільному
Comment[x-test]=xxMobile Feed Readerxx
@ -44,6 +46,7 @@ GenericName[nn]=Kjeldelesar
GenericName[pt]=Leitor de Fontes
GenericName[ru]=Чтение лент новостей
GenericName[sk]=Čítačka RSS kanálov
GenericName[sl]=Bralnik novic
GenericName[sv]=Kanalläsare
GenericName[uk]=Читання подач
GenericName[x-test]=xxFeed Readerxx