Commit 6a39b14c 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 540b4fa4
...@@ -57,7 +57,6 @@ Name[tr]=Svg Parçacığı ...@@ -57,7 +57,6 @@ Name[tr]=Svg Parçacığı
Name[ug]=Svg Part Name[ug]=Svg Part
Name[uk]=Компонент Svg Name[uk]=Компонент Svg
Name[vi]=Phần nhúng đọc SVG Name[vi]=Phần nhúng đọc SVG
Name[x-test]=xxSvg Partxx
Name[zh_CN]=Svg 组件 Name[zh_CN]=Svg 组件
Name[zh_TW]=Svg 部件 Name[zh_TW]=Svg 部件
MimeType=image/svg+xml;image/svg+xml-compressed; MimeType=image/svg+xml;image/svg+xml-compressed;
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