Commit 13f2e6b1 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 828a94f0
......@@ -14,19 +14,25 @@ X-KDE-FormFactors=mediacenter
Name=KDE Connect
Name[ca]=KDE Connect
Name[cs]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[pt]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
Comment=Connect and sync your devices
Comment[ca]=Connecta i sincronitza els vostres dispositius
Comment[cs]=Připojte a synchronizujte svá zařízení
Comment[es]=Conecta y sincroniza sus dispositivos
Comment[et]=Seadmete ühendamine ja sünkroonimine
Comment[it]=Connetti e sincronizza i tuoi dispositivi
Comment[ko]=내 장치에 연결하고 동기화
Comment[nl]=Uw apparaten verbinden en synchroniseren
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
......
[Desktop Entry]
Name=KDE Connect
Name[ca]=KDE Connect
Name[cs]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[pt]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
......
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