SVN_SILENT made messages (.desktop file) - always resolve ours
057a11462956
Actions

Authored by l10n daemon script <scripty@kde.org> on Sep 19 2017, 2:58 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"

Details

Committed

l10n daemon script <scripty@kde.org>

Sep 19 2017, 2:58 AM

Parents

R224:6ed61f306c93: GIT_SILENT made messages (after extraction)

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R224:057a11462956: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 19 2017, 2:58 AM

Changes (35)

				Path	Packages
	M			app/org.kde.kdeconnect.app.desktop
	M			daemon/kdeconnect.desktop
	M			daemon/kdeconnectd.desktop.cmake
	M			fileitemactionplugin/kdeconnectsendfile.desktop
	M			indicator/org.kde.kdeconnect.nonplasma.desktop
	M			kcm/kcm_kdeconnect.desktop
	M			kcm/org.kde.kdeconnect.kcm.desktop
	M			plasmoid/package/metadata.desktop
	M			plugins/battery/kdeconnect_battery.json
	M			plugins/clipboard/kdeconnect_clipboard.json
	M			plugins/findmyphone/kdeconnect_findmyphone.json
	M			plugins/kdeconnect.notifyrc
	M			plugins/kdeconnect_plugin.desktop
	M			plugins/lockdevice/kdeconnect_lockdevice.json
	M			plugins/mousepad/kdeconnect_mousepad.json
	M			plugins/mousepad_windows/kdeconnect_mousepad.json
	M			plugins/mpriscontrol/kdeconnect_mpriscontrol.json
	M			plugins/mprisremote/kdeconnect_mprisremote.json
	M			plugins/notifications/kdeconnect_notifications.json
	M			plugins/pausemusic/kdeconnect_pausemusic.json
	M			plugins/pausemusic/kdeconnect_pausemusic_config.desktop
	M			plugins/ping/kdeconnect_ping.json
	M			plugins/remotecommands/kdeconnect_remotecommands.json
	M			plugins/remotecontrol/kdeconnect_remotecontrol.json
	M			plugins/remotekeyboard/kdeconnect_remotekeyboard.json
	M			plugins/runcommand/kdeconnect_runcommand.json
	M			plugins/runcommand/kdeconnect_runcommand_config.desktop
	M			plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
	M			plugins/sendnotifications/kdeconnect_sendnotifications.json
	M			plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
	M			plugins/sftp/kdeconnect_sftp.json
	M			plugins/share/kdeconnect_share.json
	M			plugins/share/kdeconnect_share_config.desktop
	M			plugins/telephony/kdeconnect_telephony.json
	M			urlhandler/org.kde.kdeconnect.telhandler.desktop