Commit 848cb05f 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 fd070a39
......@@ -9,6 +9,7 @@ Name[fi]=Sähköpostitarjoajat
Name[fr]=Fournisseurs de courriers électroniques
Name[gl]=Fornecedores de correo electrónico
Name[it]=Fornitori di posta elettronica
Name[ko]=이메일 공급자
Name[nl]=E-mailleveranciers
Name[pl]=Dostawcy poczty
Name[pt]=Fornecedores de E-Mail
......
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