Commit b657ff2b 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 96ad49c7
......@@ -36,7 +36,7 @@ Name[sv]=Upptäck
Name[tr]=Keşfet
Name[uk]=Discover
Name[x-test]=xxDiscoverxx
Name[zh_CN]=发现
Name[zh_CN]=发现
Name[zh_TW]=Discover
MimeType=@DesktopMimeType@
Exec=@DesktopExec@
......
......@@ -36,7 +36,7 @@ Name[sv]=Upptäck
Name[tr]=Keşfet
Name[uk]=Discover
Name[x-test]=xxDiscoverxx
Name[zh_CN]=发现
Name[zh_CN]=发现
Name[zh_TW]=Discover
Exec=plasma-discover %U
Icon=plasmadiscover
......
......@@ -36,7 +36,7 @@ Comment[sv]=Upptäck
Comment[tr]=Keşfet
Comment[uk]=Discover
Comment[x-test]=xxDiscoverxx
Comment[zh_CN]=发现
Comment[zh_CN]=发现
Comment[zh_TW]=探詢
[Event/Update]
......
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