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-05-01 09:04:39 +02:00
parent 1d55c781fe
commit 746e5c7eeb
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/share/kdeconnect_share.json
View file

@ -97,7 +97,6 @@
"Name[fr]": "Partager et recevoir",
"Name[gl]": "Compartir e recibir",
"Name[hu]": "Megosztás és fogadás",
"Name[id]": "Share and receive",
"Name[it]": "Condividi e ricevi",
"Name[ja]": "共有と受信",
"Name[ko]": "공유하고 받기",