Commit e364d9e4 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 35cb877a
......@@ -72,6 +72,7 @@ Name[nn]=Photo teke
Name[pl]=Zrobiono zdjęcie
Name[pt]=Fotografia Tirada
Name[pt_BR]=Foto tirada
Name[sk]=Fotka urobená
Name[sv]=Foto taget
Name[uk]=Створено фотографію
Name[x-test]=xxPhoto Takenxx
......
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