Commit e31f362d 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 8a4c661a
......@@ -15,6 +15,7 @@ Name[pl]=Przenieś do katalogu
Name[pt]=Mover para a pasta
Name[pt_BR]=Mover para a pasta
Name[sk]=Presunúť do adresára
Name[sl]=Premakni v mapo
Name[sr]=Премести у фасциклу
Name[sr@ijekavian]=Премести у фасциклу
Name[sr@ijekavianlatin]=Premesti u fasciklu
......
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