Commit 828a94f0 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 f14f547b
......@@ -18,7 +18,7 @@ Comment=Homescreen for Plasma and Mycroft based TVs
Comment[ca]=Pantalla d'inici del Plasma i Mycroft per a televisors
Comment[ca@valencia]=Pantalla d'inici del Plasma i Mycroft per a televisors
Comment[es]=Pantalla de inicio para televisores basados en Plasma y Mycroft
Comment[et]=Plasma ja Mycrofti põhine teleekraan
Comment[et]=Plasma ja Mycrofti põhise TV avaekraan
Comment[it]=Schermata principale per i televisori basati su Plasma e Mycroft
Comment[ko]=Plasma 및 Mycroft 기반 TV 홈 화면
Comment[nl]=Standaardscherm voor Plasma en op Mycroft gebaseerde TV's
......
......@@ -13,6 +13,22 @@ X-KDE-Weight=40
X-KDE-FormFactors=mediacenter
Name=KDE Connect
Name[ca]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=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[et]=Seadmete ühendamine ja sünkroonimine
Comment[it]=Connetti e sincronizza i tuoi dispositivi
Comment[ko]=내 장치에 연결하고 동기화
Comment[nl]=Uw apparaten verbinden en synchroniseren
Comment[sv]=Anslut och synkronisera dina apparater
Comment[uk]=З'єднання і синхронізація ваших пристроїв
Comment[x-test]=xxConnect and sync your devicesxx
Categories=Qt;KDE;X-KDE-settings-wifi;
[Desktop Entry]
Name=KDE Connect
Name[ca]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
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