Commit 850af0d4 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 3a62b987
......@@ -40,7 +40,7 @@ Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament
Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament
Keywords[en_GB]=Phone, Workspace, Look and Feel
Keywords[es]=Teléfono, espacio de trabajo, aspecto visual
Keywords[gl]=Phone,teléfono,workspace,espazo de traballo,anbiente,Look and Feel,aparencia,comportamento
Keywords[gl]=teléfono, espazo de traballo, aparencia e comportamento
Keywords[nl]=Telefoon, werkruimte, uiterlijk
Keywords[nn]=telefon, arbeidsflate, utsjånad
Keywords[pl]=Telefon, Przestrzeń robocza, Wrażenia wzrokowe i dotykowe
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