Commit d2492d7a 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 568b10a6
......@@ -20,7 +20,6 @@ Name[sk]=Pix
Name[sl]=Pix
Name[sv]=Pix
Name[uk]=Pix
Name[x-test]=xxPixxx
Name[zh_TW]=Pix
Comment=Image gallery viewer
Comment[ca]=Visor de galeria d'imatges
......@@ -42,7 +41,6 @@ Comment[sk]=Prehliadač galérie obrázkov
Comment[sl]=Pregledovalnik galerij slik
Comment[sv]=Bildgallerivisning
Comment[uk]=Перегляд галерей зображень
Comment[x-test]=xxImage gallery viewerxx
TryExec=pix
Exec=pix %U
Terminal=false
......@@ -73,4 +71,3 @@ GenericName[sk]=Galéria obrázkov
GenericName[sl]=Galerija slik
GenericName[sv]=Bildgalleri
GenericName[uk]=Галерея зображень
GenericName[x-test]=xxImage Galleryxx
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