Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests 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-02 05:22:31 +02:00
parent 5b1d69256c
commit 2aa1252abf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,13 @@
Name=Alligator Name=Alligator
Name[ca]=Alligator Name[ca]=Alligator
Name[ca@valencia]=Alligator Name[ca@valencia]=Alligator
Name[cs]=Alligator
Name[et]=Alligator Name[et]=Alligator
Name[fr]=Alligator Name[fr]=Alligator
Name[it]=Alligator Name[it]=Alligator
Name[ko]=Alligator Name[ko]=Alligator
Name[nl]=Alligator Name[nl]=Alligator
Name[nn]=Alligator
Name[pt]=Alligator Name[pt]=Alligator
Name[ru]=Alligator Name[ru]=Alligator
Name[sk]=Alligator Name[sk]=Alligator
@ -16,11 +18,13 @@ Name[x-test]=xxAlligatorxx
Comment=Mobile Feed Reader Comment=Mobile Feed Reader
Comment[ca]=Lector de fonts per a mòbil 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[cs]=Mobilní čtečka kanálů
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[it]=Lettore di fonti mobile
Comment[ko]=모바일 피드 리더 Comment[ko]=모바일 피드 리더
Comment[nl]=Mobiele feedlezer Comment[nl]=Mobiele feedlezer
Comment[nn]=Mobil kjeldelesar
Comment[pt]=Leitor Móvel de Fontes Comment[pt]=Leitor Móvel de Fontes
Comment[ru]=Чтение лент новостей для мобильных устройств Comment[ru]=Чтение лент новостей для мобильных устройств
Comment[sv]=Mobil kanalläsare Comment[sv]=Mobil kanalläsare
@ -29,11 +33,13 @@ Comment[x-test]=xxMobile Feed Readerxx
GenericName=Feed Reader GenericName=Feed Reader
GenericName[ca]=Lector de fonts GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts GenericName[ca@valencia]=Lector de fonts
GenericName[cs]=Čtečka kanálů
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[it]=Lettore di fonti
GenericName[ko]=피드 리더 GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer GenericName[nl]=Feedlezer
GenericName[nn]=Kjeldelesar
GenericName[pt]=Leitor de Fontes GenericName[pt]=Leitor de Fontes
GenericName[ru]=Чтение лент новостей GenericName[ru]=Чтение лент новостей
GenericName[sk]=Čítačka RSS kanálov GenericName[sk]=Čítačka RSS kanálov