mirror of
https://github.com/KDE/kasts.git
synced 2025-02-01 18:07:10 +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
7887ff2cc9
commit
6416733153
@ -27,6 +27,7 @@ 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[cs]=Mobilní aplikace pro přehrávání podcastů
|
||||
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
||||
Comment[en_GB]=Mobile Podcast Application
|
||||
Comment[es]=Aplicación de pódcast para móviles
|
||||
@ -49,6 +50,7 @@ Comment[zh_CN]=移动设备播客应用程序
|
||||
GenericName=Podcast Application
|
||||
GenericName[ca]=Aplicació de podcast
|
||||
GenericName[ca@valencia]=Aplicació de podcast
|
||||
GenericName[cs]=Aplikace pro přehrávání podcastů
|
||||
GenericName[de]=Podcast-Anwendung
|
||||
GenericName[en_GB]=Podcast Application
|
||||
GenericName[es]=Aplicación de pódcast
|
||||
@ -71,6 +73,8 @@ GenericName[zh_CN]=播客应用程序
|
||||
Keywords=podcast
|
||||
Keywords[ca]=podcast
|
||||
Keywords[ca@valencia]=podcast
|
||||
Keywords[cs]=podcast
|
||||
Keywords[de]=Podcast
|
||||
Keywords[en_GB]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fr]=podcast
|
||||
@ -82,6 +86,7 @@ Keywords[sv]=poddsändning
|
||||
Keywords[tr]=podcast
|
||||
Keywords[uk]=трансляція
|
||||
Keywords[x-test]=xxpodcastxx
|
||||
Keywords[zh_CN]=播客
|
||||
Icon=kasts
|
||||
Exec=kasts
|
||||
Type=Application
|
||||
|
Loading…
x
Reference in New Issue
Block a user