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 2023-04-12 01:41:14 +00:00
parent 81d6a12dfa
commit f9376b427d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -67,6 +67,7 @@
"Name": "Bigscreen voice control", "Name": "Bigscreen voice control",
"Name[ca@valencia]": "Control de veu de Bigscreen", "Name[ca@valencia]": "Control de veu de Bigscreen",
"Name[ca]": "Control de veu de la Bigscreen", "Name[ca]": "Control de veu de la Bigscreen",
"Name[fr]": "Contrôle vocal pour Bigscreen",
"Name[ia]": "Controlo de voce de BigScreen", "Name[ia]": "Controlo de voce de BigScreen",
"Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი", "Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",
"Name[nl]": "Bigscreen stembesturing", "Name[nl]": "Bigscreen stembesturing",
@ -85,10 +86,10 @@
"kdeconnect.mousepad.request", "kdeconnect.mousepad.request",
"kdeconnect.bigscreen.stt" "kdeconnect.bigscreen.stt"
], ],
"X-KdeConnect-SupportedPacketType": [
"kdeconnect.bigscreen.stt"
],
"X-KdeConnect-SupportedDeviceTypes": [ "X-KdeConnect-SupportedDeviceTypes": [
"tv" "tv"
],
"X-KdeConnect-SupportedPacketType": [
"kdeconnect.bigscreen.stt"
] ]
} }