mirror of
https://github.com/KDE/kasts.git
synced 2024-12-18 11:39:48 +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
c46d65507d
commit
91a6cc652e
@ -21,6 +21,7 @@ Name[sl]=Kasts
|
||||
Name[sv]=Kasts
|
||||
Name[uk]=Kasts
|
||||
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
|
||||
@ -40,6 +41,7 @@ Comment[sl]=Aplikacija mobilnih podcastov
|
||||
Comment[sv]=Mobilt poddradioprogram
|
||||
Comment[uk]=Мобільна програма для подкастів
|
||||
Comment[x-test]=xxMobile Podcast Applicationxx
|
||||
Comment[zh_CN]=移动播客应用程序
|
||||
GenericName=Podcast Application
|
||||
GenericName[ca]=Aplicació de podcast
|
||||
GenericName[ca@valencia]=Aplicació de podcast
|
||||
@ -59,6 +61,7 @@ GenericName[sl]=Aplikacija podcastov
|
||||
GenericName[sv]=Poddradioprogram
|
||||
GenericName[uk]=Програма для подкастів
|
||||
GenericName[x-test]=xxPodcast Applicationxx
|
||||
GenericName[zh_CN]=播客应用程序
|
||||
Icon=kasts
|
||||
Exec=kasts
|
||||
Type=Application
|
||||
|
Loading…
Reference in New Issue
Block a user