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
14ae73c86c
commit
b00b04c790
|
@ -22,6 +22,7 @@ Name[ru]=Alligator
|
|||
Name[sk]=Alligator
|
||||
Name[sl]=Alligator
|
||||
Name[sv]=Alligator
|
||||
Name[tr]=Alligator
|
||||
Name[uk]=Alligator
|
||||
Name[x-test]=xxAlligatorxx
|
||||
Comment=Mobile Feed Reader
|
||||
|
@ -46,6 +47,7 @@ Comment[pt_BR]=Leitor de fonte de notícias móvel
|
|||
Comment[ru]=Чтение лент новостей для мобильных устройств
|
||||
Comment[sl]=Mobilni bralnik novic
|
||||
Comment[sv]=Mobil kanalläsare
|
||||
Comment[tr]=Mobil Besleme Okuyucu
|
||||
Comment[uk]=Програма для читання подач на мобільному
|
||||
Comment[x-test]=xxMobile Feed Readerxx
|
||||
GenericName=Feed Reader
|
||||
|
@ -71,6 +73,7 @@ GenericName[ru]=Чтение лент новостей
|
|||
GenericName[sk]=Čítačka RSS kanálov
|
||||
GenericName[sl]=Bralnik novic
|
||||
GenericName[sv]=Kanalläsare
|
||||
GenericName[tr]=Besleme Okuyucu
|
||||
GenericName[uk]=Читання подач
|
||||
GenericName[x-test]=xxFeed Readerxx
|
||||
Icon=alligator
|
||||
|
|
Loading…
Reference in New Issue