Commit eb5c0996 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 56b6c019
...@@ -7,18 +7,22 @@ ...@@ -7,18 +7,22 @@
"Name": "Aleix Pol" "Name": "Aleix Pol"
} }
], ],
"Description": "Locks your systems", "Description": "Locks your systems",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "applications-miscelaneaous", "Icon": "applications-miscelaneaous",
"Id": "kdeconnect_lockdevice", "Id": "kdeconnect_lockdevice",
"License": "GPL", "License": "GPL",
"Name": "LockDevice", "Name": "LockDevice",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],
"Version": "0.1", "Version": "0.1",
"Website": "https://kde.org" "Website": "https://kde.org"
}, },
"X-KdeConnect-OutgoingPackageType": [ "kdeconnect.lock" ], "X-KdeConnect-OutgoingPackageType": [
"X-KdeConnect-SupportedPackageType": [ "kdeconnect.lock" ] "kdeconnect.lock"
} ],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.lock"
]
}
\ No newline at end of file
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
], ],
"Version": "0.1" "Version": "0.1"
}, },
"X-KdeConnect-OutgoingPackageType": [], "X-KdeConnect-OutgoingPackageType": [],
"X-KdeConnect-SupportedPackageType": [ "X-KdeConnect-SupportedPackageType": [
"kdeconnect.mousepad" "kdeconnect.mousepad"
] ]
} }
\ No newline at end of file
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
"Name": "Aleix Pol" "Name": "Aleix Pol"
} }
], ],
"Description": "Control Remote systems", "Description": "Control Remote systems",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "applications-multimedia", "Icon": "applications-multimedia",
"Id": "kdeconnect_remotecontrol", "Id": "kdeconnect_remotecontrol",
"License": "GPL", "License": "GPL",
"Name": "RemoteControl", "Name": "RemoteControl",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
"kdeconnect.mousepad" "kdeconnect.mousepad"
], ],
"X-KdeConnect-SupportedPackageType": [] "X-KdeConnect-SupportedPackageType": []
} }
\ No newline at end of file
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