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-08 05:15:01 +02:00
parent 6408ae2318
commit c172a91627
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.kde.alligator.desktop
View File

@ -3,6 +3,7 @@ Name=Alligator
Name[ca]=Alligator Name[ca]=Alligator
Name[ca@valencia]=Alligator Name[ca@valencia]=Alligator
Name[cs]=Alligator Name[cs]=Alligator
Name[es]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[fr]=Alligator Name[fr]=Alligator
Name[it]=Alligator Name[it]=Alligator