From eabdfc892b2b0d44f40269676cd026ad846f07ca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Nov 2016 04:24:23 +0100 Subject: [PATCH] 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" --- plugins/battery/kdeconnect_battery.json | 2 +- plugins/clipboard/kdeconnect_clipboard.json | 2 +- plugins/findmyphone/kdeconnect_findmyphone.json | 2 +- plugins/lockdevice/kdeconnect_lockdevice.json | 2 +- plugins/mousepad/kdeconnect_mousepad.json | 2 +- plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- plugins/mprisremote/kdeconnect_mprisremote.json | 2 +- plugins/notifications/kdeconnect_notifications.json | 2 +- plugins/pausemusic/kdeconnect_pausemusic.json | 2 +- plugins/ping/kdeconnect_ping.json | 2 +- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 +- plugins/runcommand/kdeconnect_runcommand.json | 2 +- plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 2 +- plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 +- plugins/sftp/kdeconnect_sftp.json | 2 +- plugins/share/kdeconnect_share.json | 2 +- plugins/telephony/kdeconnect_telephony.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index e318d4d8f..64bcfdc79 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -82,4 +82,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.battery" ] -} +} \ No newline at end of file diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index d6bf98b8b..ff91d1e47 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -82,4 +82,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.clipboard" ] -} +} \ No newline at end of file diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 668e1e1d3..f17cf7258 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -74,4 +74,4 @@ "X-KdeConnect-OutgoingPackageType": [ "kdeconnect.findmyphone.request" ] -} +} \ No newline at end of file diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index cadf76afc..6537e6103 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/plugins/lockdevice/kdeconnect_lockdevice.json @@ -80,4 +80,4 @@ "kdeconnect.lock.request", "kdeconnect.lock" ] -} +} \ No newline at end of file diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json index 81c046218..987b534aa 100644 --- a/plugins/mousepad/kdeconnect_mousepad.json +++ b/plugins/mousepad/kdeconnect_mousepad.json @@ -80,4 +80,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mousepad.request" ] -} +} \ No newline at end of file diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index 32803e8a5..81bdbff22 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -82,4 +82,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mpris.request" ] -} +} \ No newline at end of file diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index dc6f15f4d..385d583d4 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -63,4 +63,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mpris" ] -} +} \ No newline at end of file diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 798aab76c..f22d2d431 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -72,4 +72,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.notification" ] -} +} \ No newline at end of file diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index a1fc9d9e5..1d73a9ae6 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -79,4 +79,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.telephony" ] -} +} \ No newline at end of file diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 84678f849..a9d3a6773 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -63,4 +63,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.ping" ] -} +} \ No newline at end of file diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 2fb4f66cd..3c51fab7d 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -63,4 +63,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.runcommand" ] -} +} \ No newline at end of file diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index 9b89f83b7..38b044bbb 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -76,4 +76,4 @@ "kdeconnect.mousepad.request" ], "X-KdeConnect-SupportedPackageType": [] -} +} \ No newline at end of file diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index a29ef949c..1abe56690 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -85,4 +85,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.runcommand.request" ] -} +} \ No newline at end of file diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index 8e9efd4d9..d4a57b488 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -76,4 +76,4 @@ "Version": "0.1", "Website": "http://albertvaka.wordpress.com" } -} +} \ No newline at end of file diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 058a3b4d9..fa369958e 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -70,4 +70,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.notification.request" ] -} +} \ No newline at end of file diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index c27944fd5..235c7743e 100644 --- a/plugins/sftp/kdeconnect_sftp.json +++ b/plugins/sftp/kdeconnect_sftp.json @@ -83,4 +83,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.sftp" ] -} +} \ No newline at end of file diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index d1a2812cc..dcd52d59d 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -82,4 +82,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.share.request" ] -} +} \ No newline at end of file diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index e0ba321ea..2a4d2aaa1 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -73,4 +73,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.telephony" ] -} +} \ No newline at end of file