Commit 7bc20806 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 9222d501
...@@ -17,6 +17,7 @@ Name[pt]=Plasma Mobile ...@@ -17,6 +17,7 @@ Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма Name[uk]=Мобільна Плазма
Name[x-test]=xxPlasma Mobilexx Name[x-test]=xxPlasma Mobilexx
Name[zh_TW]=Plasma 行動
Comment=Plasma Mobile by KDE Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile por KDE Comment[ast]=Plasma Mobile por KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
...@@ -31,3 +32,4 @@ Comment[pt]=Plasma Mobile do KDE ...@@ -31,3 +32,4 @@ Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE Comment[uk]=Мобільна Плазма від KDE
Comment[x-test]=xxPlasma Mobile by KDExx Comment[x-test]=xxPlasma Mobile by KDExx
Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統
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