[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a0c1a57
The following commit has been merged in the master branch:
commit a0c1a57999afa61104822a9d7992d8d73bd860a7
Author: l10n daemon script <scripty at kde.org>
Date: Wed Dec 30 09:23:05 2015 +0000
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 | 3 ++-
plugins/clipboard/kdeconnect_clipboard.json | 3 ++-
plugins/findmyphone/kdeconnect_findmyphone.json | 6 ++++--
plugins/lockdevice/kdeconnect_lockdevice.json | 3 ++-
plugins/mousepad/kdeconnect_mousepad.json | 3 ++-
plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 3 ++-
plugins/mprisremote/kdeconnect_mprisremote.json | 3 ++-
plugins/notifications/kdeconnect_notifications.json | 3 ++-
plugins/pausemusic/kdeconnect_pausemusic.json | 3 ++-
plugins/ping/kdeconnect_ping.json | 3 ++-
plugins/remotecontrol/kdeconnect_remotecontrol.json | 3 ++-
plugins/runcommand/kdeconnect_runcommand.json | 6 ++++--
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 3 ++-
plugins/sftp/kdeconnect_sftp.json | 4 +++-
plugins/share/kdeconnect_share.json | 3 ++-
plugins/telephony/kdeconnect_telephony.json | 3 ++-
16 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index cd3d849..c02b83a 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show your phone battery next to your computer battery",
diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index 27e6e4b..13c217f 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Share the clipboard between devices",
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index 08bf3e6..1b75c8b 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -3,11 +3,13 @@
"Authors": [
{
"Email": "apparle at gmail.com",
- "Name": "Apoorv Parle"
+ "Name": "Apoorv Parle",
+ "Name[x-test]": "xxApoorv Parlexx"
},
{
"Email": "davidedmundson at kde.org",
- "Name": "David Edmundson"
+ "Name": "David Edmundson",
+ "Name[x-test]": "xxDavid Edmundsonxx"
}
],
"Description": "Find your lost phone by making it play an alarm sound ",
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index de9a317..0c22969 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol at kde.org",
- "Name": "Aleix Pol"
+ "Name": "Aleix Pol",
+ "Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Locks your systems",
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index a7bedb3..e90d213 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "ahmedibrahimkhali at gmail.com",
- "Name": "Ahmed I. Khalil"
+ "Name": "Ahmed I. Khalil",
+ "Name[x-test]": "xxAhmed I. Khalilxx"
}
],
"Description": "Use your phone as a touchpad and keyboard",
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 30bfa76..2027124 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Remote control your music and videos",
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 4dc9f8c..50ffc15 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol at kde.org",
- "Name": "Aleix Pol"
+ "Name": "Aleix Pol",
+ "Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Control MPRIS services",
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 38aecbb..d696436 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show phone notifications on your computer and keep them in sync",
diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json
index bd36016..4638ac1 100644
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Pause music/videos during a phone call",
diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json
index ee06d31..c47eb42 100644
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Send and receive pings",
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 1b657f0..4067c1d 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "aleixpol at kde.org",
- "Name": "Aleix Pol"
+ "Name": "Aleix Pol",
+ "Name[x-test]": "xxAleix Polxx"
}
],
"Description": "Control Remote systems",
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index 8e9d0d1..134a228 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -4,11 +4,13 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
},
{
"Email": "david at davidedmundson.co.uk",
- "Name": "David Edmundson"
+ "Name": "David Edmundson",
+ "Name[x-test]": "xxDavid Edmundsonxx"
}
],
"Description": "Execute console commands remotely",
diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 8c23b8c..9696d18 100644
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "pmdematagoda at mykolab.ch",
- "Name": "Pramod Dematagoda"
+ "Name": "Pramod Dematagoda",
+ "Name[x-test]": "xxPramod Dematagodaxx"
}
],
"Description": "Inhibit the screensaver when the device is connected",
diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json
index dde501f..afc8b2c 100644
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@ -4,7 +4,9 @@
"Authors": [
{
"Email": "kinnalru at gmail.com",
- "Name": "Samoilenko Yuri"
+ "Name": "Samoilenko Yuri",
+ "Name[uk]": "Юрій Самойленко",
+ "Name[x-test]": "xxSamoilenko Yurixx"
}
],
"Description": "Browse the remote device filesystem using SFTP",
diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json
index 8a565e5..804255b 100644
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Receive and send files, URLs or plain text easily",
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 6066e3b..e32a5c1 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -4,7 +4,8 @@
"Authors": [
{
"Email": "albertvaka at gmail.com",
- "Name": "Albert Vaca"
+ "Name": "Albert Vaca",
+ "Name[x-test]": "xxAlbert Vacaxx"
}
],
"Description": "Show notifications for calls and SMS (answering coming soon)",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list