Commit 7d96aadc 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 60c98f48
......@@ -74,7 +74,7 @@ Name[ro]=Editor de meniuri
Name[ru]=Редактор меню
Name[si]=මෙනු සකසනය
Name[sk]=Editor menu
Name[sk]=Editor ponuky
Name[sl]=Urejevalnik menijev
Name[sr]=Уређивач менија
Name[sr@ijekavian]=Уређивач менија
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