Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2020-04-28 06:40:55 +02:00
parent da921e4ad4
commit 9c506c5338
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.kde.mobile.alligator.desktop
View File

@ -5,6 +5,7 @@ Name[et]=Alligator
Name[ko]=Alligator
Name[nl]=Alligator
Name[pt]=Alligator
Name[sk]=Alligator
Name[sv]=Alligator
Name[uk]=Alligator
Name[x-test]=xxAlligatorxx
@ -23,6 +24,7 @@ GenericName[et]=Uudistelugeja
GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer
GenericName[pt]=Leitor de Fontes
GenericName[sk]=Čítačka RSS kanálov
GenericName[sv]=Kanalläsare
GenericName[uk]=Читання подач
GenericName[x-test]=xxFeed Readerxx