mirror of https://github.com/KDE/kasts.git
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
83f7359c71
commit
4289170c0c
|
@ -1,6 +1,7 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Alligator
|
Name=Alligator
|
||||||
Name[ca]=Alligator
|
Name[ca]=Alligator
|
||||||
|
Name[ca@valencia]=Alligator
|
||||||
Name[et]=Alligator
|
Name[et]=Alligator
|
||||||
Name[ko]=Alligator
|
Name[ko]=Alligator
|
||||||
Name[nl]=Alligator
|
Name[nl]=Alligator
|
||||||
|
@ -12,6 +13,7 @@ Name[uk]=Alligator
|
||||||
Name[x-test]=xxAlligatorxx
|
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[et]=Mobiili uudistelugeja
|
Comment[et]=Mobiili uudistelugeja
|
||||||
Comment[ko]=모바일 피드 리더
|
Comment[ko]=모바일 피드 리더
|
||||||
Comment[nl]=Mobiele feedlezer
|
Comment[nl]=Mobiele feedlezer
|
||||||
|
@ -22,6 +24,7 @@ Comment[uk]=Програма для читання подач на мобіль
|
||||||
Comment[x-test]=xxMobile Feed Readerxx
|
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[et]=Uudistelugeja
|
GenericName[et]=Uudistelugeja
|
||||||
GenericName[ko]=피드 리더
|
GenericName[ko]=피드 리더
|
||||||
GenericName[nl]=Feedlezer
|
GenericName[nl]=Feedlezer
|
||||||
|
|
Loading…
Reference in New Issue