Commit 2e882cb6 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 9d9f70d1
......@@ -9,6 +9,7 @@ Name[ca]=Pix
Name[ca@valencia]=Pix
Name[cs]=Pix
Name[de]=Pix
Name[en_GB]=Pix
Name[es]=Pix
Name[et]=Pix
Name[fi]=Pix
......@@ -33,6 +34,7 @@ Comment=Image gallery viewer
Comment[ca]=Visor de galeria d'imatges
Comment[ca@valencia]=Visor de galeria d'imatges
Comment[de]=Bildergalerieanzeige
Comment[en_GB]=Image gallery viewer
Comment[es]=Visor de galería de imágenes
Comment[et]=Pildigalerii näitaja
Comment[fi]=Kuvagalleriakatselin
......@@ -66,6 +68,7 @@ GenericName[ca]=Galeria d'imatges
GenericName[ca@valencia]=Galeria d'imatges
GenericName[cs]=Galerie obrázků
GenericName[de]=Bildergalerie
GenericName[en_GB]=Image Gallery
GenericName[es]=Galería de imágenes
GenericName[et]=Pildigalerii
GenericName[fi]=Kuvagalleria
......
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