Commit 6230cdde 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 d1443053
......@@ -729,12 +729,16 @@ Action=Popup
[Event/ProcessFinishedHidden]
Name=Process finished in Non-Focused Monitored Session
Name[x-test]=xxProcess finished in Non-Focused Monitored Sessionxx
Comment=Process finished in a non-focused monitored session
Comment[x-test]=xxProcess finished in a non-focused monitored sessionxx
Action=Popup
[Event/ProcessFinished]
Name=Process finished in Monitored Session
Name[x-test]=xxProcess finished in Monitored Sessionxx
Comment=Process finished in a monitored session
Comment[x-test]=xxProcess finished in a monitored sessionxx
Action=Popup
[Event/Finished]
......
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