SVN_SILENT made messages (.desktop file) - always resolve ours
463c6bb2d34e
Actions

Authored by l10n daemon script <scripty@kde.org> on Aug 7 2019, 3:12 AM.

Description

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"

Committed

l10n daemon script <scripty@kde.org>

Aug 7 2019, 3:12 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			applet/metadata.desktop
	M			kcm/kcm_networkmanagement.desktop
	M			kded/networkmanagement.desktop
	M			kded/networkmanagement.notifyrc
	M			mobile/broadband/mobilebroadbandsettings.desktop
	M			mobile/broadband/package/metadata.desktop
	M			mobile/wifi/package/metadata.desktop
	M			mobile/wifi/wifisettings.desktop
	M			vpn/l2tp/plasmanetworkmanagement_l2tpui.desktop
	M			vpn/openconnect/plasmanetworkmanagement_openconnect_globalprotectui.desktop
	M			vpn/openconnect/plasmanetworkmanagement_openconnectui.desktop
	M			vpn/openswan/plasmanetworkmanagement_openswanui.desktop
	M			vpn/openvpn/plasmanetworkmanagement_openvpnui.desktop
	M			vpn/pptp/plasmanetworkmanagement_pptpui.desktop
	M			vpn/ssh/plasmanetworkmanagement_sshui.desktop
	M			vpn/sstp/plasmanetworkmanagement_sstpui.desktop
	M			vpn/strongswan/plasmanetworkmanagement_strongswanui.desktop
	M			vpn/vpnc/plasmanetworkmanagement_vpncui.desktop