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 2022-06-20 01:51:58 +00:00
parent fc1efc3ea9
commit 12180f8d99
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/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -12,6 +12,7 @@
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[nn]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[ro]": "Aleix Pol i Gonzalez",