Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2024-12-24 15:40:44 +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-07-30 05:56:43 +02:00
parent 66b345bdd0
commit 6dc1ef11e2
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

@ -5,6 +5,7 @@ Name[ca@valencia]=Alligator
Name[cs]=Alligator Name[cs]=Alligator
Name[es]=Alligator Name[es]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[eu]=Alligator
Name[fr]=Alligator Name[fr]=Alligator
Name[it]=Alligator Name[it]=Alligator
Name[ko]=Alligator Name[ko]=Alligator
@ -23,6 +24,7 @@ Comment[ca]=Lector de fonts per al mòbil
Comment[ca@valencia]=Lector de fonts per al mòbil Comment[ca@valencia]=Lector de fonts per al mòbil
Comment[cs]=Mobilní čtečka kanálů Comment[cs]=Mobilní čtečka kanálů
Comment[et]=Mobiili uudistelugeja Comment[et]=Mobiili uudistelugeja
Comment[eu]=Mugikorrerako web-jario irakurlea
Comment[fr]=Lecteur nomade de fils d'actualité Comment[fr]=Lecteur nomade de fils d'actualité
Comment[it]=Lettore di fonti mobile Comment[it]=Lettore di fonti mobile
Comment[ko]=모바일 피드 리더 Comment[ko]=모바일 피드 리더
@ -40,6 +42,7 @@ GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts GenericName[ca@valencia]=Lector de fonts
GenericName[cs]=Čtečka kanálů GenericName[cs]=Čtečka kanálů
GenericName[et]=Uudistelugeja GenericName[et]=Uudistelugeja
GenericName[eu]=Web-jario irakurlea
GenericName[fr]=Lecteur de fils d'actualité GenericName[fr]=Lecteur de fils d'actualité
GenericName[it]=Lettore di fonti GenericName[it]=Lettore di fonti
GenericName[ko]=피드 리더 GenericName[ko]=피드 리더