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
ebe3a4044f
commit
4ba6516663
|
@ -31,7 +31,7 @@ Name[x-test]=xxKastsxx
|
|||
Name[zh_CN]=Kasts
|
||||
Comment=Mobile Podcast Application
|
||||
Comment[ca]=Aplicació mòbil per a podcast
|
||||
Comment[ca@valencia]=Aplicació mòbil per a podcast
|
||||
Comment[ca@valencia]=Aplicació mòbil per a pòdcast
|
||||
Comment[cs]=Mobilní aplikace pro přehrávání podcastů
|
||||
Comment[de]=Podcast-Anwendung für Mobilgeräte
|
||||
Comment[en_GB]=Mobile Podcast Application
|
||||
|
@ -59,7 +59,7 @@ Comment[x-test]=xxMobile Podcast Applicationxx
|
|||
Comment[zh_CN]=移动设备播客应用程序
|
||||
GenericName=Podcast Application
|
||||
GenericName[ca]=Aplicació de podcast
|
||||
GenericName[ca@valencia]=Aplicació de podcast
|
||||
GenericName[ca@valencia]=Aplicació de pòdcast
|
||||
GenericName[cs]=Aplikace pro přehrávání podcastů
|
||||
GenericName[de]=Podcast-Anwendung
|
||||
GenericName[en_GB]=Podcast Application
|
||||
|
@ -87,7 +87,7 @@ GenericName[x-test]=xxPodcast Applicationxx
|
|||
GenericName[zh_CN]=播客应用程序
|
||||
Keywords=podcast
|
||||
Keywords[ca]=podcast
|
||||
Keywords[ca@valencia]=podcast
|
||||
Keywords[ca@valencia]=pòdcast
|
||||
Keywords[cs]=podcast
|
||||
Keywords[de]=Podcast
|
||||
Keywords[en_GB]=podcast
|
||||
|
|
Loading…
Reference in New Issue