Commit ca8f3087 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 2b9cec93
......@@ -39,6 +39,7 @@ Comment[en_GB]=Plasma shell for phones
Comment[es]=Interfaz de Plasma para teléfonos
Comment[et]=Plasma kest telefonidele
Comment[eu]=Telefonoetarako Plasma oskola
Comment[fi]=Plasma-työtila puhelimiin
Comment[fr]=Terminal Plasma pour smartphones
Comment[gl]=Intérprete de ordes de Plasma para móbiles
Comment[hu]=Plasma felület telefonokhoz
......@@ -6,6 +6,7 @@ Name[en_GB]=Plasma Phone Lockers
Name[es]=Bloqueos del teléfono de Plasma
Name[et]=Plasma telefonilukustajad
Name[eu]=Plasma telefono giltzatzaileak
Name[fi]=Plasman puhelinlukot
Name[fr]=Verrouillage de téléphone Plasma
Name[gl]=Casilleiros de Plasma Phone
Name[hu]=Plasma Phone zárképernyők
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