mirror of
https://github.com/KDE/kasts.git
synced 2024-12-24 15:40:44 +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
66b345bdd0
commit
6dc1ef11e2
@ -5,6 +5,7 @@ Name[ca@valencia]=Alligator
|
||||
Name[cs]=Alligator
|
||||
Name[es]=Alligator
|
||||
Name[et]=Alligator
|
||||
Name[eu]=Alligator
|
||||
Name[fr]=Alligator
|
||||
Name[it]=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[cs]=Mobilní čtečka kanálů
|
||||
Comment[et]=Mobiili uudistelugeja
|
||||
Comment[eu]=Mugikorrerako web-jario irakurlea
|
||||
Comment[fr]=Lecteur nomade de fils d'actualité
|
||||
Comment[it]=Lettore di fonti mobile
|
||||
Comment[ko]=모바일 피드 리더
|
||||
@ -40,6 +42,7 @@ GenericName[ca]=Lector de fonts
|
||||
GenericName[ca@valencia]=Lector de fonts
|
||||
GenericName[cs]=Čtečka kanálů
|
||||
GenericName[et]=Uudistelugeja
|
||||
GenericName[eu]=Web-jario irakurlea
|
||||
GenericName[fr]=Lecteur de fils d'actualité
|
||||
GenericName[it]=Lettore di fonti
|
||||
GenericName[ko]=피드 리더
|
||||
|
Loading…
Reference in New Issue
Block a user