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-09-14 02:24:11 +00:00
parent cbad969f4f
commit 737a0faee6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/mpriscontrol/kdeconnect_mpriscontrol.json
View file

@ -51,7 +51,7 @@
"Description[ast]": "Control remotu de la música y los vídeos",
"Description[az]": "Musiqi və Videoların məsafədən idarə edilməsi",
"Description[ca@valencia]": "Comandament a distància per a la vostra música i vídeos",
"Description[ca]": "Comandament a distància per a la vostra música i vídeos",
"Description[ca]": "Comandament a distància de la vostra música i vídeos",
"Description[cs]": "Ovládejte vzdáleně vaši hudbu a videa",
"Description[da]": "Fjernbetjen din musik og videoer",
"Description[de]": "Fernbedienung für Musik und Videos",