mirror of
https://github.com/KDE/audiotube.git
synced 2025-12-24 00:18:04 -05: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:
@@ -38,7 +38,6 @@ Name[sl]=AudioTube
|
||||
Name[sv]=AudioTube
|
||||
Name[tr]=AudioTube
|
||||
Name[uk]=AudioTube
|
||||
Name[x-test]=xxAudioTubexx
|
||||
Name[zh_CN]=AudioTube
|
||||
Name[zh_TW]=AudioTube
|
||||
Comment=YouTube Music client
|
||||
@@ -80,7 +79,6 @@ Comment[sl]=Glasbeni odjemalec Youtube
|
||||
Comment[sv]=YouTube-musikprogram
|
||||
Comment[tr]=YouTube Müzik istemcisi
|
||||
Comment[uk]=Музичний клієнт YouTube
|
||||
Comment[x-test]=xxYouTube Music clientxx
|
||||
Comment[zh_CN]=YouTube Music 客户端
|
||||
Comment[zh_TW]=YouTube Music 用戶端
|
||||
Version=1.0
|
||||
|
||||
Reference in New Issue
Block a user