Commit fcf89805 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 9b984932
......@@ -31,6 +31,7 @@ Name[sk]=Plasma Mobile
Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
Name[x-test]=xxPlasma Mobilexx
Name[zh_CN]=Plasma Mobile
Name[zh_TW]=Plasma 行動
Comment=Plasma Mobile by KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
......@@ -61,5 +62,6 @@ Comment[sk]=Plasma Mobile od KDE
Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE
Comment[x-test]=xxPlasma Mobile by KDExx
Comment[zh_CN]=KDE Plasma Mobile
Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統
......@@ -59,6 +59,7 @@ Comment[sk]=Plasma shell pre telefóny
Comment[sv]=Plasma skal för telefoner
Comment[uk]=Оболонка Плазми для телефонів
Comment[x-test]=xxPlasma shell for phonesxx
Comment[zh_CN]=适配手机的 Plasma 外壳
Comment[zh_TW]=適用於手機的 Plasma Shell
......@@ -28,6 +28,7 @@ Name[sv]=Beröringsprov
Name[tr]=Dokunma Testi
Name[uk]=Тестування дотику
Name[x-test]=xxTouch Testxx
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