Commit 35bb3491 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 13e92f7c
......@@ -4,6 +4,7 @@
"Name": "Email Address Requester for Templateparser",
"Name[ca@valencia]": "Adreça de correu electrònic requerida per «Templateparser»",
"Name[ca]": "Adreça de correu electrònic requerida per «Templateparser»",
"Name[es]": "Peticionario de dirección de correo para Templateparser",
"Name[nl]": "Verzoeker om e-mailadres voor ontleden van sjabloon",
"Name[pt]": "Pedido de Endereço de E-Mail para o Processador de Modelos",
"Name[sk]": "Requester e-mailovej adresy pre Templateparser",
......
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