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
6310491216
commit
b3dac269b7
|
@ -10,6 +10,7 @@ Name[en_GB]=Kasts
|
|||
Name[es]=Kasts
|
||||
Name[fi]=Kasts
|
||||
Name[fr]=Kasts
|
||||
Name[it]=Kasts
|
||||
Name[ko]=Kasts
|
||||
Name[nl]=Kasts
|
||||
Name[pa]=ਕਾਸਟਸ
|
||||
|
@ -30,6 +31,7 @@ Comment[en_GB]=Mobile Podcast Application
|
|||
Comment[es]=Aplicación de pódcast para móviles
|
||||
Comment[fi]=Podcast-mobiilisovellus
|
||||
Comment[fr]=Application mobile pour podcasts
|
||||
Comment[it]=Applicazione mobile per podcast
|
||||
Comment[ko]=모바일 팟캐스트 프로그램
|
||||
Comment[nl]=Podcastprogramma voor mobiel
|
||||
Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||
|
@ -50,6 +52,7 @@ GenericName[en_GB]=Podcast Application
|
|||
GenericName[es]=Aplicación de pódcast
|
||||
GenericName[fi]=Podcast-sovellus
|
||||
GenericName[fr]=Application pour podcasts
|
||||
GenericName[it]=Applicazione podcast
|
||||
GenericName[ko]=팟캐스트 프로그램
|
||||
GenericName[nl]=Podcastprogramma
|
||||
GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||
|
|
Loading…
Reference in New Issue