mirror of
https://github.com/KDE/kasts.git
synced 2024-12-25 08:00:48 +01:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
2871d0dadd
commit
273d652aaa
@ -3,6 +3,7 @@ Name=Alligator
|
||||
Name[ca]=Alligator
|
||||
Name[ca@valencia]=Alligator
|
||||
Name[et]=Alligator
|
||||
Name[fr]=Alligator
|
||||
Name[ko]=Alligator
|
||||
Name[nl]=Alligator
|
||||
Name[pt]=Alligator
|
||||
@ -15,6 +16,7 @@ Comment=Mobile Feed Reader
|
||||
Comment[ca]=Lector de fonts per a mòbil
|
||||
Comment[ca@valencia]=Lector de fonts per a mòbil
|
||||
Comment[et]=Mobiili uudistelugeja
|
||||
Comment[fr]=Lecteur nomade de fils d'actualité
|
||||
Comment[ko]=모바일 피드 리더
|
||||
Comment[nl]=Mobiele feedlezer
|
||||
Comment[pt]=Leitor Móvel de Fontes
|
||||
@ -26,6 +28,7 @@ GenericName=Feed Reader
|
||||
GenericName[ca]=Lector de fonts
|
||||
GenericName[ca@valencia]=Lector de fonts
|
||||
GenericName[et]=Uudistelugeja
|
||||
GenericName[fr]=Lecteur de fils d'actualité
|
||||
GenericName[ko]=피드 리더
|
||||
GenericName[nl]=Feedlezer
|
||||
GenericName[pt]=Leitor de Fontes
|
||||
|
Loading…
Reference in New Issue
Block a user