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"

src/urifilters/ikws/searchproviders/rfc.desktop

@@ -10,7 +10,7 @@ Name[be@latin]=IETF: dakumenty RFC
 Name[bg]=IETF Requests for Comments
 Name[bn]=IETF Requests for Comments
 Name[bs]=IETF‑ovi zahtjevi za komentare
-Name[ca]=Requeriments per a comentaris de la IETF
+Name[ca]=Sol·licituds per a comentaris de la IETF
 Name[ca@valencia]=Requeriments per a comentaris de la IETF
 Name[cs]=IETF Requests for Comments
 Name[csb]=IETF - dokùmentë RFC (sztandardë ë protokòłë)