Commit 2b9cec93 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 6fd1d018
......@@ -4,6 +4,7 @@ Name[ca]=Bloqueigs de telèfon del Plasma
Name[ca@valencia]=Bloqueigs del telèfon del Plasma
Name[en_GB]=Plasma Phone Lockers
Name[es]=Bloqueos del teléfono de Plasma
Name[et]=Plasma telefonilukustajad
Name[eu]=Plasma telefono giltzatzaileak
Name[fr]=Verrouillage de téléphone Plasma
Name[gl]=Casilleiros de Plasma Phone
......
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