Commit 63964d4e 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 d46da415
......@@ -34,6 +34,7 @@ GenericName[el]=Φωτογραφίες από κινητό
GenericName[en_GB]=Mobile Photos
GenericName[es]=Fotos del móvil
GenericName[fi]=Mobiilikuvat
GenericName[fr]=Photos mobiles
GenericName[gl]=Fotos móbiles
GenericName[it]=Foto per mobile
GenericName[ko]=모바일 사진
......
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