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-05-24 01:40:12 +00:00
parent 6004cd32f0
commit 64217456ab
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/mprisremote/kdeconnect_mprisremote.json
View file

@ -89,7 +89,7 @@
"Description[sr@latin]": "Kontrola MPRIS servisa", "Description[sr@latin]": "Kontrola MPRIS servisa",
"Description[sr]": "Контрола МПРИС сервиса", "Description[sr]": "Контрола МПРИС сервиса",
"Description[sv]": "Styr MPRIS-tjänster", "Description[sv]": "Styr MPRIS-tjänster",
"Description[tr]": "MPRIS servislerini denetle", "Description[tr]": "MPRIS hizmetlerini denetle",
"Description[uk]": "Керування службами MPRIS", "Description[uk]": "Керування службами MPRIS",
"Description[x-test]": "xxControl MPRIS servicesxx", "Description[x-test]": "xxControl MPRIS servicesxx",
"Description[zh_CN]": "控制 MPRIS 服务", "Description[zh_CN]": "控制 MPRIS 服务",