Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2025-02-03 02:37:32 +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-08-27 06:07:22 +02:00
parent bcacaf67b7
commit a0da7b7f41
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

@ -7,6 +7,7 @@ Name[es]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[eu]=Alligator Name[eu]=Alligator
Name[fr]=Alligator Name[fr]=Alligator
Name[hi]=एल्लिगेटर (Alligator)
Name[it]=Alligator Name[it]=Alligator
Name[ko]=Alligator Name[ko]=Alligator
Name[nl]=Alligator Name[nl]=Alligator
@ -26,6 +27,7 @@ Comment[cs]=Mobilní čtečka kanálů
Comment[et]=Mobiili uudistelugeja Comment[et]=Mobiili uudistelugeja
Comment[eu]=Mugikorrerako web-jario irakurlea Comment[eu]=Mugikorrerako web-jario irakurlea
Comment[fr]=Lecteur nomade de fils d'actualité Comment[fr]=Lecteur nomade de fils d'actualité
Comment[hi]=मोबाइल फ़ीड रीडर
Comment[it]=Lettore di fonti mobile Comment[it]=Lettore di fonti mobile
Comment[ko]=모바일 피드 리더 Comment[ko]=모바일 피드 리더
Comment[nl]=Mobiele feedlezer Comment[nl]=Mobiele feedlezer
@ -44,6 +46,7 @@ GenericName[cs]=Čtečka kanálů
GenericName[et]=Uudistelugeja GenericName[et]=Uudistelugeja
GenericName[eu]=Web-jario irakurlea GenericName[eu]=Web-jario irakurlea
GenericName[fr]=Lecteur de fils d'actualité GenericName[fr]=Lecteur de fils d'actualité
GenericName[hi]=फ़ीड रीडर
GenericName[it]=Lettore di fonti GenericName[it]=Lettore di fonti
GenericName[ko]=피드 리더 GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer GenericName[nl]=Feedlezer