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-01-21 06:55:46 +01:00
parent c7411ead21
commit 68599c8273
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/photo/kdeconnect_photo.json
View file

@ -40,7 +40,7 @@
} }
], ],
"Description": "Use a connected device to take a photo", "Description": "Use a connected device to take a photo",
"Description[ast]": "Usa un preséu coneutáu pa facer una semeya", "Description[ast]": "Usa un preséu conectáu pa facer una semeya",
"Description[az]": "Qoşulmuş cihazla şəkil çəkmək", "Description[az]": "Qoşulmuş cihazla şəkil çəkmək",
"Description[ca@valencia]": "Usa un dispositiu connectat per a prendre una fotografia", "Description[ca@valencia]": "Usa un dispositiu connectat per a prendre una fotografia",
"Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia", "Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia",

2
plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json
View file

@ -40,7 +40,7 @@
} }
], ],
"Description": "Control the volume of the connected device", "Description": "Control the volume of the connected device",
"Description[ast]": "Controla'l volume del preséu coneutáu", "Description[ast]": "Controla'l volume del preséu conectáu",
"Description[az]": "Qoşulmuş cihazın səs səviyyəsini idarə etmək", "Description[az]": "Qoşulmuş cihazın səs səviyyəsini idarə etmək",
"Description[ca@valencia]": "Controla el volum del dispositiu connectat", "Description[ca@valencia]": "Controla el volum del dispositiu connectat",
"Description[ca]": "Controla el volum del dispositiu connectat", "Description[ca]": "Controla el volum del dispositiu connectat",