Commit 35a9b234 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 5055ec98
......@@ -18,6 +18,7 @@ Name[nn]=LastFmImageFetcher
Name[pl]=LastFmImageFetcher
Name[pt]=LastFmImageFetcher
Name[pt_BR]=LastFmImageFetcher
Name[ru]=Обложки с Last.fm
Name[sk]=LastFmImageFetcher
Name[sl]=LastFmImageFetcher
Name[sr]=Добављач слика са ЛастФМ‑а
......
Supports Markdown
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