Commit 9d8b2f8d 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 71d375d0
......@@ -31,6 +31,7 @@ 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
Comment[pl]=Powłoka Plazmy dla telefonów
Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[sv]=Plasma skal för telefoner
Comment[uk]=Оболонка Плазми для телефонів
......
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