Commit 276e5e1a 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 39d6c713
......@@ -8,6 +8,7 @@ Name[ca]=Plasma Mòbil
Name[ca@valencia]=Plasma Mòbil
Name[es]=Plasma Mobile
Name[pl]=Plazma Mobile
Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
......@@ -17,6 +18,7 @@ Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[es]=Plasma Mobile creado por KDE
Comment[nl]=Plasma-mobiel door KDE
Comment[pl]=Plazma Mobile stworzona przez KDE
Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE
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