Commit 731c11f9 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 bd03f211
......@@ -26,6 +26,7 @@ Comment=Plasma shell for phones
Comment[ca]=Espai de treball Plasma per a telèfons
Comment[ca@valencia]=Espai de treball Plasma per a telèfons
Comment[es]=Interfaz de Plasma para teléfonos
Comment[gl]=Intérprete de ordes de Plasma para móbiles
Comment[it]=Shell di Plasma per telefoni
Comment[ko]=휴대폰용 Plasma 셸
Comment[nl]=Plasma-shell voor telefoons
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