mirror of
https://github.com/KDE/kasts.git
synced 2024-12-22 21:47:56 +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
d268e4c5cf
commit
b0d130b421
@ -27,6 +27,7 @@ Name[pl]=Kasts
|
||||
Name[pt]=Kasts
|
||||
Name[pt_BR]=Kasts
|
||||
Name[ru]=Kasts
|
||||
Name[sa]=कोश
|
||||
Name[sk]=Kasts
|
||||
Name[sl]=Kasts
|
||||
Name[sv]=Kasts
|
||||
@ -60,6 +61,7 @@ Comment[pl]=Przenośna aplikacja do podkastów
|
||||
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
||||
Comment[pt_BR]=Aplicativo de podcast móvel
|
||||
Comment[ru]=Мобильное приложение для прослушивания подкастов
|
||||
Comment[sa]=मोबाइल पॉडकास्ट अनुप्रयोग
|
||||
Comment[sk]=Mobilná aplikácia na podcasty
|
||||
Comment[sl]=Program za spremljanje spletnih oddaj
|
||||
Comment[sv]=Mobilt poddradioprogram
|
||||
@ -93,6 +95,7 @@ GenericName[pl]=Aplikacja do podkastów
|
||||
GenericName[pt]=Aplicação de 'Podcasts'
|
||||
GenericName[pt_BR]=Aplicativo de podcast
|
||||
GenericName[ru]=Приложение для прослушивания подкастов
|
||||
GenericName[sa]=पॉडकास्ट अनुप्रयोग
|
||||
GenericName[sk]=Aplikácia na podcasty
|
||||
GenericName[sl]=Program za spletne oddaje
|
||||
GenericName[sv]=Poddradioprogram
|
||||
@ -125,6 +128,7 @@ Keywords[pl]=podkast
|
||||
Keywords[pt]=podcast
|
||||
Keywords[pt_BR]=podcast
|
||||
Keywords[ru]=подкаст
|
||||
Keywords[sa]=पॉडकास्टं
|
||||
Keywords[sk]=podcast
|
||||
Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja
|
||||
Keywords[sv]=poddsändning
|
||||
|
Loading…
Reference in New Issue
Block a user