Commit ae25dcf4 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 a5052934
......@@ -86,7 +86,7 @@ TryExec=fsearch
Exec=fsearch
Categories=GTK;Utility;Core;
Keywords=search;fsearch;files;folders;music;video;documents;find;tool;everything;
Keywords[ast]=busca;buscar;fsearch;ficheros;carpetes;música;videu;documentos;alcontrar;ferramienta;too;
Keywords[ast]=busca;buscar;fsearch;ficheros;carpetes;música;videu;documentos;atopar;ferramienta;too;
Keywords[az]=search;fsearch;files;folders;music;video;documents;find;tool;everything; axtarış;qovluqlar;musiqi;video;sənədlər;tapmaq;hər şey;
Keywords[ca]=cerca;fsearch;fitxers;carpetes;música;vídeo;documents;troba;eina;tot;
Keywords[ca@valencia]=cerca;fsearch;fitxers;carpetes;música;vídeo;documents;cerca;eina;tot;
......
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