Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2024-12-26 08:25:16 +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-05-09 06:53:24 +02:00
parent 7836ee9382
commit 229cd787ec
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.mobile.alligator.desktop
View File

@ -4,6 +4,7 @@ Name[ca]=Alligator
Name[ca@valencia]=Alligator Name[ca@valencia]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[fr]=Alligator Name[fr]=Alligator
Name[it]=Alligator
Name[ko]=Alligator Name[ko]=Alligator
Name[nl]=Alligator Name[nl]=Alligator
Name[pt]=Alligator Name[pt]=Alligator
@ -17,6 +18,7 @@ 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
Comment[et]=Mobiili uudistelugeja Comment[et]=Mobiili uudistelugeja
Comment[fr]=Lecteur nomade de fils d'actualité Comment[fr]=Lecteur nomade de fils d'actualité
Comment[it]=Lettore di fonti mobile
Comment[ko]=모바일 피드 리더 Comment[ko]=모바일 피드 리더
Comment[nl]=Mobiele feedlezer Comment[nl]=Mobiele feedlezer
Comment[pt]=Leitor Móvel de Fontes Comment[pt]=Leitor Móvel de Fontes
@ -29,6 +31,7 @@ GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts GenericName[ca@valencia]=Lector de fonts
GenericName[et]=Uudistelugeja GenericName[et]=Uudistelugeja
GenericName[fr]=Lecteur de fils d'actualité GenericName[fr]=Lecteur de fils d'actualité
GenericName[it]=Lettore di fonti
GenericName[ko]=피드 리더 GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer GenericName[nl]=Feedlezer
GenericName[pt]=Leitor de Fontes GenericName[pt]=Leitor de Fontes