tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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"
This commit is contained in:
l10n daemon script 2021-12-16 01:53:14 +00:00
parent dc34cfb66c
commit bb39ef84b5
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/findthisdevice/kdeconnect_findthisdevice.json
View file

@ -126,8 +126,8 @@
"Version": "0.1", "Version": "0.1",
"Website": "https://kde.org" "Website": "https://kde.org"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config",
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.findmyphone.request" "kdeconnect.findmyphone.request"
], ]
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config"
} }

4
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -142,8 +142,8 @@
"Version": "0.1", "Version": "0.1",
"Website": "https://albertvaka.wordpress.com" "Website": "https://albertvaka.wordpress.com"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config",
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.telephony" "kdeconnect.telephony"
], ]
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config"
} }

4
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -189,11 +189,11 @@
"Version": "0.1", "Version": "0.1",
"Website": "https://albertvaka.wordpress.com" "Website": "https://albertvaka.wordpress.com"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_runcommand_config",
"X-KdeConnect-OutgoingPacketType": [ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.runcommand" "kdeconnect.runcommand"
], ],
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.runcommand.request" "kdeconnect.runcommand.request"
], ]
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_runcommand_config"
} }

4
plugins/share/kdeconnect_share.json
View file

@ -143,12 +143,12 @@
"Version": "0.1", "Version": "0.1",
"Website": "https://albertvaka.wordpress.com" "Website": "https://albertvaka.wordpress.com"
}, },
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_share_config",
"X-KdeConnect-OutgoingPacketType": [ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.share.request", "kdeconnect.share.request",
"kdeconnect.share.request.update" "kdeconnect.share.request.update"
], ],
"X-KdeConnect-SupportedPacketType": [ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.share.request" "kdeconnect.share.request"
], ]
"X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_share_config"
} }