mirror of
https://github.com/KDE/kasts.git
synced 2024-12-19 20:28:22 +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
087a835b64
commit
4221d5fa9d
@ -12,6 +12,7 @@ Name[ko]=Kasts
|
|||||||
Name[nl]=Kasts
|
Name[nl]=Kasts
|
||||||
Name[pl]=Kasts
|
Name[pl]=Kasts
|
||||||
Name[pt]=Kasts
|
Name[pt]=Kasts
|
||||||
|
Name[pt_BR]=Kasts
|
||||||
Name[sk]=Kasts
|
Name[sk]=Kasts
|
||||||
Name[sl]=Kasts
|
Name[sl]=Kasts
|
||||||
Name[sv]=Kasts
|
Name[sv]=Kasts
|
||||||
@ -27,6 +28,7 @@ Comment[ko]=모바일 팟캐스트 프로그램
|
|||||||
Comment[nl]=Podcastprogramma voor mobiel
|
Comment[nl]=Podcastprogramma voor mobiel
|
||||||
Comment[pl]=Przenośna aplikacja do podkastów
|
Comment[pl]=Przenośna aplikacja do podkastów
|
||||||
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
||||||
|
Comment[pt_BR]=Aplicativo de podcast móvel
|
||||||
Comment[sk]=Mobilná aplikácia na podcasty
|
Comment[sk]=Mobilná aplikácia na podcasty
|
||||||
Comment[sl]=Aplikacija mobilnih podcastov
|
Comment[sl]=Aplikacija mobilnih podcastov
|
||||||
Comment[sv]=Mobilt poddradioprogram
|
Comment[sv]=Mobilt poddradioprogram
|
||||||
@ -42,6 +44,7 @@ GenericName[ko]=팟캐스트 프로그램
|
|||||||
GenericName[nl]=Podcastprogramma
|
GenericName[nl]=Podcastprogramma
|
||||||
GenericName[pl]=Aplikacja do podkastów
|
GenericName[pl]=Aplikacja do podkastów
|
||||||
GenericName[pt]=Aplicação de 'Podcasts'
|
GenericName[pt]=Aplicação de 'Podcasts'
|
||||||
|
GenericName[pt_BR]=Aplicativo de podcast
|
||||||
GenericName[sk]=Aplikácia na podcasty
|
GenericName[sk]=Aplikácia na podcasty
|
||||||
GenericName[sl]=Aplikacija podcastov
|
GenericName[sl]=Aplikacija podcastov
|
||||||
GenericName[sv]=Poddradioprogram
|
GenericName[sv]=Poddradioprogram
|
||||||
|
Loading…
Reference in New Issue
Block a user