Commit d080e7f5 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 94f54af2
......@@ -25,6 +25,7 @@ Name[pt]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
Name[zh_TW]=KDE 連線
Comment=Connect and sync your devices
Comment[ca]=Connecta i sincronitza els vostres dispositius
Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius
......@@ -38,5 +39,6 @@ Comment[pt]=Ligue e sincronize os seus dispositivos
Comment[sv]=Anslut och synkronisera dina apparater
Comment[uk]=З'єднання і синхронізація ваших пристроїв
Comment[x-test]=xxConnect and sync your devicesxx
Comment[zh_TW]=連線並同步您的裝置
Categories=Qt;KDE;X-KDE-settings-wifi;
......@@ -12,6 +12,7 @@ Name[pt]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
Name[zh_TW]=KDE 連線
Icon=kdeconnect
Type=Service
......
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