Commit 53b56eab 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 339dad57
...@@ -14,6 +14,7 @@ Name[sk]=Pix ...@@ -14,6 +14,7 @@ Name[sk]=Pix
Name[sv]=Pix Name[sv]=Pix
Name[uk]=Pix Name[uk]=Pix
Name[x-test]=xxPixxx Name[x-test]=xxPixxx
Name[zh_TW]=Pix
Comment=Image gallery viewer Comment=Image gallery viewer
Comment[ca]=Visor de galeria d'imatges Comment[ca]=Visor de galeria d'imatges
Comment[ca@valencia]=Visor de galeria d'imatges Comment[ca@valencia]=Visor de galeria d'imatges
......
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