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
ccd5148dec
commit
45074ca2e8
|
@ -3,18 +3,21 @@ Name=Alligator
|
||||||
Name[ca]=Alligator
|
Name[ca]=Alligator
|
||||||
Name[et]=Alligator
|
Name[et]=Alligator
|
||||||
Name[nl]=Alligator
|
Name[nl]=Alligator
|
||||||
|
Name[pt]=Alligator
|
||||||
Name[uk]=Alligator
|
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[et]=Mobiili uudistelugeja
|
Comment[et]=Mobiili uudistelugeja
|
||||||
Comment[nl]=Mobiele feedlezer
|
Comment[nl]=Mobiele feedlezer
|
||||||
|
Comment[pt]=Leitor Móvel de Fontes
|
||||||
Comment[uk]=Програма для читання подач на мобільному
|
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[et]=Uudistelugeja
|
GenericName[et]=Uudistelugeja
|
||||||
GenericName[nl]=Feedlezer
|
GenericName[nl]=Feedlezer
|
||||||
|
GenericName[pt]=Leitor de Fontes
|
||||||
GenericName[uk]=Читання подач
|
GenericName[uk]=Читання подач
|
||||||
GenericName[x-test]=xxFeed Readerxx
|
GenericName[x-test]=xxFeed Readerxx
|
||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
|
|
Loading…
Reference in New Issue