Commit 96339b87 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 983ee6e4
Pipeline #55424 skipped
...@@ -35,6 +35,7 @@ GenericName[ru]=Музыкальный проигрыватель ...@@ -35,6 +35,7 @@ GenericName[ru]=Музыкальный проигрыватель
GenericName[sk]=Hudobný prehrávač GenericName[sk]=Hudobný prehrávač
GenericName[sl]=Predvajalnik glasbe GenericName[sl]=Predvajalnik glasbe
GenericName[sv]=Musikspelare GenericName[sv]=Musikspelare
GenericName[tr]=Müzik Çalar
GenericName[uk]=Музичний програвач GenericName[uk]=Музичний програвач
GenericName[x-test]=xxMusic Playerxx GenericName[x-test]=xxMusic Playerxx
GenericName[zh_CN]=音乐播放器 GenericName[zh_CN]=音乐播放器
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment