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
ef1830eec6
commit
8dee08991f
@ -46,7 +46,7 @@ Comment[pt_BR]=Aplicativo de podcast móvel
|
|||||||
Comment[sk]=Mobilná aplikácia na podcasty
|
Comment[sk]=Mobilná aplikácia na podcasty
|
||||||
Comment[sl]=Aplikacija mobilnih podcastov
|
Comment[sl]=Aplikacija mobilnih podcastov
|
||||||
Comment[sv]=Mobilt poddradioprogram
|
Comment[sv]=Mobilt poddradioprogram
|
||||||
Comment[tr]=Taşınabilir Podcast Uygulaması
|
Comment[tr]=Taşınabilir Pod Yayını Uygulaması
|
||||||
Comment[uk]=Мобільна програма для подкастів
|
Comment[uk]=Мобільна програма для подкастів
|
||||||
Comment[x-test]=xxMobile Podcast Applicationxx
|
Comment[x-test]=xxMobile Podcast Applicationxx
|
||||||
Comment[zh_CN]=移动设备播客应用程序
|
Comment[zh_CN]=移动设备播客应用程序
|
||||||
@ -70,7 +70,7 @@ GenericName[pt_BR]=Aplicativo de podcast
|
|||||||
GenericName[sk]=Aplikácia na podcasty
|
GenericName[sk]=Aplikácia na podcasty
|
||||||
GenericName[sl]=Aplikacija podcastov
|
GenericName[sl]=Aplikacija podcastov
|
||||||
GenericName[sv]=Poddradioprogram
|
GenericName[sv]=Poddradioprogram
|
||||||
GenericName[tr]=Podcast Uygulaması
|
GenericName[tr]=Pod Yayını Uygulaması
|
||||||
GenericName[uk]=Програма для подкастів
|
GenericName[uk]=Програма для подкастів
|
||||||
GenericName[x-test]=xxPodcast Applicationxx
|
GenericName[x-test]=xxPodcast Applicationxx
|
||||||
GenericName[zh_CN]=播客应用程序
|
GenericName[zh_CN]=播客应用程序
|
||||||
@ -92,7 +92,7 @@ Keywords[pl]=podkast
|
|||||||
Keywords[pt]=podcast
|
Keywords[pt]=podcast
|
||||||
Keywords[sl]=podcast
|
Keywords[sl]=podcast
|
||||||
Keywords[sv]=poddsändning
|
Keywords[sv]=poddsändning
|
||||||
Keywords[tr]=podcast
|
Keywords[tr]=pod yayını
|
||||||
Keywords[uk]=трансляція
|
Keywords[uk]=трансляція
|
||||||
Keywords[x-test]=xxpodcastxx
|
Keywords[x-test]=xxpodcastxx
|
||||||
Keywords[zh_CN]=播客
|
Keywords[zh_CN]=播客
|
||||||
|
Loading…
x
Reference in New Issue
Block a user