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 2019-07-19 05:32:47 +02:00
parent 5831de92d8
commit e6f8a391c9
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/presenter/kdeconnect_presenter.json
View file

@ -51,6 +51,7 @@
"Name[es]": "Presentador",
"Name[gl]": "Presentador",
"Name[it]": "Presentatore",
"Name[ko]": "프레젠터",
"Name[lt]": "Pristatytojas",
"Name[nl]": "Presentator",
"Name[nn]": "Presentatør",