Commit b176a416 authored by Script Kiddy's avatar Script Kiddy

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 aecd9917
...@@ -32,6 +32,7 @@ GenericName[sk]=Hudobný prehrávač ...@@ -32,6 +32,7 @@ GenericName[sk]=Hudobný prehrávač
GenericName[sl]=Predvajalnik glasbe GenericName[sl]=Predvajalnik glasbe
GenericName[sv]=Musikspelare GenericName[sv]=Musikspelare
GenericName[uk]=Музичний програвач GenericName[uk]=Музичний програвач
GenericName[x-test]=xxMusic Playerxx
GenericName[zh_CN]=音乐播放器 GenericName[zh_CN]=音乐播放器
GenericName[zh_TW]=音樂播放器 GenericName[zh_TW]=音樂播放器
Icon=elisa Icon=elisa
...@@ -68,6 +69,7 @@ Name[sl]=Elisa ...@@ -68,6 +69,7 @@ Name[sl]=Elisa
Name[sv]=Elisa Name[sv]=Elisa
Name[tr]=Elisa Name[tr]=Elisa
Name[uk]=Elisa Name[uk]=Elisa
Name[zh_CN]=Elisa Name[zh_CN]=Elisa
Name[zh_TW]=Elisa Name[zh_TW]=Elisa
StartupNotify=false StartupNotify=false
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