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-11-24 06:08:41 +01:00
parent 7d75c6cf9b
commit 61cfb4a24f
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

@ -9,6 +9,7 @@ Name[et]=Alligator
Name[eu]=Alligator
Name[fr]=Alligator
Name[hi]=एल्लिगेटर (Alligator)
Name[hu]=Alligator
Name[ia]=Alligator
Name[it]=Alligator
Name[ko]=Alligator
@ -32,6 +33,7 @@ Comment[et]=Mobiili uudistelugeja
Comment[eu]=Mugikorrerako web-jario irakurlea
Comment[fr]=Lecteur nomade de fils d'actualité
Comment[hi]=मोबाइल फ़ीड रीडर
Comment[hu]=Mobil hírolvasó
Comment[ia]=Lector de syndicationes Mobile
Comment[it]=Lettore di fonti mobile
Comment[ko]=모바일 피드 리더
@ -54,6 +56,7 @@ GenericName[et]=Uudistelugeja
GenericName[eu]=Web-jario irakurlea
GenericName[fr]=Lecteur de fils d'actualité
GenericName[hi]=फ़ीड रीडर
GenericName[hu]=Hírolvasó
GenericName[ia]=Lector de syndication
GenericName[it]=Lettore di fonti
GenericName[ko]=피드 리더