Commit 6fd1d018 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 ab190aa5
......@@ -16,7 +16,7 @@ Name[fr]=Plasma Mobile
Name[gl]=Plasma Mobile
Name[hu]=Plasma Mobile
Name[ia]=Plasma Mobile
Name[id]=Seluler Plasma
Name[id]=Plasma Mobile
Name[it]=Plasma Mobile
Name[ko]=Plasma 모바일
Name[lt]=Plasma mobilioji sąsaja
......@@ -44,7 +44,7 @@ Comment[fr]=Plasma Mobile par KDE
Comment[gl]=Plasma Mobile de KDE
Comment[hu]=Plasma Mobile a KDE-től
Comment[ia]=Plasma Mobile per KDE
Comment[id]=Seluler Plasma oleh KDE
Comment[id]=Plasma Mobile oleh KDE
Comment[it]=Plasma Mobile creato da KDE
Comment[ko]=KDE의 Plasma 모바일
Comment[lt]=Plasma mobilioji sąsaja pagal 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