Commit c5b0a824 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 147dfaec
Pipeline #68775 skipped
......@@ -29,6 +29,7 @@
"Name[pl]": "Potwierdź przed usunięciem wiadomości",
"Name[pt]": "Confirmar Antes de Apagar as Mensagens",
"Name[pt_BR]": "Confirmar antes de excluir e-mails",
"Name[sl]": "Potrdi pred brisanjem sporočil",
"Name[sv]": "Bekräfta innan brev tas bort",
"Name[uk]": "Підтвердження перед вилученням повідомлень",
"Name[x-test]": "xxConfirm Before Deleting Emailsxx",
......
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