Commit a19629cc 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 48bdc101
......@@ -34,7 +34,7 @@
"Name[es]": "Buscar/sustituir en archivos",
"Name[et]": "Failides otsimine ja asendamine",
"Name[fr]": "Chercher / Remplacer dans les fichiers",
"Name[gl]": "Buscar/Substituír nos ficheiros",
"Name[gl]": "Atopar e substituír en ficheiros",
"Name[it]": "Cerca/Sostituisci nei file",
"Name[nb]": "Finn/erstatt i filer",
"Name[nl]": "Zoeken/vervangen in bestanden",
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