mirror of
https://github.com/KDE/kasts.git
synced 2024-12-22 13:43:58 +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
c7a510335a
commit
159688035a
@ -10,6 +10,7 @@ Name[es]=Kasts
|
|||||||
Name[fr]=Kasts
|
Name[fr]=Kasts
|
||||||
Name[ko]=Kasts
|
Name[ko]=Kasts
|
||||||
Name[nl]=Kasts
|
Name[nl]=Kasts
|
||||||
|
Name[pa]=ਕਾਸਟਸ
|
||||||
Name[pl]=Kasts
|
Name[pl]=Kasts
|
||||||
Name[pt]=Kasts
|
Name[pt]=Kasts
|
||||||
Name[pt_BR]=Kasts
|
Name[pt_BR]=Kasts
|
||||||
@ -26,6 +27,7 @@ Comment[es]=Aplicación de pódcast para móviles
|
|||||||
Comment[fr]=Application mobile pour podcasts
|
Comment[fr]=Application mobile pour podcasts
|
||||||
Comment[ko]=모바일 팟캐스트 프로그램
|
Comment[ko]=모바일 팟캐스트 프로그램
|
||||||
Comment[nl]=Podcastprogramma voor mobiel
|
Comment[nl]=Podcastprogramma voor mobiel
|
||||||
|
Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||||
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[pt_BR]=Aplicativo de podcast móvel
|
||||||
@ -42,6 +44,7 @@ GenericName[es]=Aplicación de pódcast
|
|||||||
GenericName[fr]=Application pour podcasts
|
GenericName[fr]=Application pour podcasts
|
||||||
GenericName[ko]=팟캐스트 프로그램
|
GenericName[ko]=팟캐스트 프로그램
|
||||||
GenericName[nl]=Podcastprogramma
|
GenericName[nl]=Podcastprogramma
|
||||||
|
GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||||
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[pt_BR]=Aplicativo de podcast
|
||||||
|
Loading…
Reference in New Issue
Block a user