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-18 05:17:20 +02:00
parent abac7dac46
commit 01e52aa9c9
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

@ -53,6 +53,7 @@
"Name[it]": "Presentatore",
"Name[lt]": "Pristatytojas",
"Name[nl]": "Presentator",
"Name[nn]": "Presentatør",
"Name[pl]": "Przedstawiający",
"Name[pt]": "Apresentação",
"Name[pt_BR]": "Apresentação",