Commit a34edfa8 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 71948fd9
......@@ -25,6 +25,7 @@ Name[zh_TW]=電話
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[cs]=Plasma Shell pro telefony
Comment[es]=Interfaz de Plasma para teléfonos
Comment[fr]=Terminal Plasma pour smartphones
Comment[gl]=Intérprete de ordes de Plasma para móbiles
......
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