mirror of
https://github.com/KDE/kasts.git
synced 2024-12-25 16:02:54 +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
a25f591919
commit
add3c78df2
@ -57,7 +57,7 @@ Comment[pt]=Aplicação Móvel de 'Podcasts'
|
||||
Comment[pt_BR]=Aplicativo de podcast móvel
|
||||
Comment[ru]=Мобильное приложение для прослушивания подкастов
|
||||
Comment[sk]=Mobilná aplikácia na podcasty
|
||||
Comment[sl]=Aplikacija mobilnih podcastov
|
||||
Comment[sl]=Program za spremljanje spletnih oddaj
|
||||
Comment[sv]=Mobilt poddradioprogram
|
||||
Comment[tr]=Taşınabilir Pod Yayını Uygulaması
|
||||
Comment[uk]=Мобільна програма для подкастів
|
||||
@ -88,7 +88,7 @@ GenericName[pt]=Aplicação de 'Podcasts'
|
||||
GenericName[pt_BR]=Aplicativo de podcast
|
||||
GenericName[ru]=Приложение для прослушивания подкастов
|
||||
GenericName[sk]=Aplikácia na podcasty
|
||||
GenericName[sl]=Aplikacija podcastov
|
||||
GenericName[sl]=Program za spletne oddaje
|
||||
GenericName[sv]=Poddradioprogram
|
||||
GenericName[tr]=Pod Yayını Uygulaması
|
||||
GenericName[uk]=Програма для подкастів
|
||||
@ -117,7 +117,7 @@ Keywords[pl]=podkast
|
||||
Keywords[pt]=podcast
|
||||
Keywords[ru]=подкаст
|
||||
Keywords[sk]=podcast
|
||||
Keywords[sl]=podcast
|
||||
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja
|
||||
Keywords[sv]=poddsändning
|
||||
Keywords[tr]=pod yayını
|
||||
Keywords[uk]=трансляція
|
||||
|
Loading…
Reference in New Issue
Block a user