Commit c61ad33b 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 73ef664f
......@@ -8,6 +8,7 @@ Name[de]=AtCore-Testprogramm
Name[el]=Εφαρμογή δοκιμής AtCore
Name[en_GB]=AtCore Test Client
Name[es]=Cliente de prueba de AtCore
Name[et]=AtCore testimise klient
Name[fi]=AtCore – koeasiakas
Name[fr]=Client de test AtCore
Name[gl]=Cliente de probas de AtCore
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