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-12-31 03:45:09 +00:00
parent 1981c79a2f
commit ac85db03c9
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -55,6 +55,7 @@
"Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen",
"Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen",
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
"Description[de]": "Sendet Sprachbefehle zum Steuern des Fernsehers über Plasma Bigscreen",
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
"Description[eo]": "Sendi voĉkomandojn al via televidilo kun Plasma Bigscreen",
"Description[es]": "Envie órdenes de voz a su televisor ejecutando Plasma Bigscreen",
@ -90,6 +91,7 @@
"Name[ca@valencia]": "Control de veu de la Bigscreen",
"Name[ca]": "Control de veu de la Bigscreen",
"Name[cs]": "Hlasové ovládání pro Bigscreen",
"Name[de]": "Bigscreen-Spracheingabe",
"Name[en_GB]": "Bigscreen voice control",
"Name[eo]": "Grandekrana voĉa kontrolo",
"Name[es]": "Control de voz de Bigscreen",

1
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -94,6 +94,7 @@
"Name[ca@valencia]": "Integració amb la telefonia de ModemManager",
"Name[ca]": "Integració amb la telefonia del ModemManager",
"Name[cs]": "Integrace telefonu pro ModemManager",
"Name[de]": "ModemManager-Telefon-Integration",
"Name[en_GB]": "ModemManager Telephony integration",
"Name[eo]": "ModemManager Telefonia integriĝo",
"Name[es]": "Integración con el teléfono ModemManager",