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-06-09 05:04:22 +02:00
parent b776617646
commit af57aca545
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/telephony/kdeconnect_telephony.json
View file

@ -82,7 +82,7 @@
"Name[hu]": "Telefonintegráció", "Name[hu]": "Telefonintegráció",
"Name[id]": "Telephony integration", "Name[id]": "Telephony integration",
"Name[it]": "Integrazione telefonica", "Name[it]": "Integrazione telefonica",
"Name[ja]": "Telephony 統合", "Name[ja]": "電話の統合",
"Name[ko]": "전화 통합", "Name[ko]": "전화 통합",
"Name[nl]": "Telefoonintegratie", "Name[nl]": "Telefoonintegratie",
"Name[nn]": "Telefonintegrering", "Name[nn]": "Telefonintegrering",