Commit f14f547b 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 712606ac
......@@ -13,30 +13,6 @@ X-KDE-Weight=40
X-KDE-FormFactors=mediacenter
Name=KDE Connect
Name[ca]=KDE Connect
Name[ca@valencia]=KDE Connect
Name[cs]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[nl]=KDE Connect
Name[pt]=KDE Connect
Name[sk]=KDE Connect
Name[sv]=KDE Connect
Name[uk]=KDE Connect
Name[x-test]=xxWifixx
Name[zh_TW]=Wi-Fi
Comment=Connect and sync your devices
Comment[ca]=Connecta a les xarxes Wi-Fi
Comment[ca@valencia]=Connecta a les xarxes Wi-Fi
Comment[es]=Conectar a redes Wifi
Comment[et]=Ühendumine WiFi võrkudega
Comment[it]=Connettiti alle reti senza fili
Comment[nl]=Met WiFi-netwerken verbinden
Comment[pt]=Ligar a redes Wi-Fi
Comment[sv]=Anslut till WIFI-nätverk
Comment[uk]=З'єднання із мережами Wi-Fi
Comment[x-test]=xxConnect to Wifi networksxx
Comment[zh_TW]=連線至 Wi-Fi 網路
Categories=Qt;KDE;X-KDE-settings-wifi;
[Desktop Entry]
Name=KDE Connect
Name[ca]=KDE-Connect
Name[ca@valencia]=KDE-Connect
Name[cs]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[it]=KDE Connect
Name[nl]=KDE-Connect
Name[pt]=KDE-Connect
Name[sk]=KDE Connect
Name[sv]=WIFI
Name[uk]=KDE-Connect
Name[x-test]=xxKDE Connectxx
Name[zh_TW]=KDE-Connect
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