Commit 16174ef0 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 8cf5e618
......@@ -14,6 +14,7 @@ Name[et]=Kaamera
Name[fi]=Kamera
Name[fr]=Appareil photo
Name[gl]=Cámara
Name[ia]=Camera
Name[it]=Camera
Name[ko]=카메라
Name[nl]=Camera
......@@ -38,6 +39,7 @@ GenericName[et]=Mobiili fotod
GenericName[fi]=Mobiilikuvat
GenericName[fr]=Photos mobiles
GenericName[gl]=Fotos móbiles
GenericName[ia]=Photos de Mobile
GenericName[it]=Foto per mobile
GenericName[ko]=모바일 사진
GenericName[nl]=Foto's op mobiel
......
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