Commit 1f21c229 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c9ed37b2
......@@ -30,7 +30,7 @@ Name[et]=Failide/kataloogide otsimine
Name[eu]=Bilatu fitxategiak/karpetak
Name[fa]=یافتن پرونده‌ها/پوشه‌ها
Name[fi]=Etsi tiedostoja ja kansioita
Name[fr]=Recherche de fichiers / dossiers
Name[fr]=Trouver des fichiers ou dossiers
Name[fy]=Triemmen/mappen sykje
Name[ga]=Aimsigh Comhaid/Comhadlanna
Name[gl]=Buscar ficheiros/cartafoles
......
Supports Markdown
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