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 2021-05-17 01:29:19 +00:00
parent 036704e161
commit e8cffe2d49
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/connectivity-report/kdeconnect_connectivity_report.json
View file

@ -14,6 +14,7 @@
"Name[fi]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[ko]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
"Name[nn]": "David Shlemayev",
"Name[pl]": "David Shlemayev",
@ -40,6 +41,7 @@
"Description[fi]": "Näytä puhelimen kentän voimakkuus",
"Description[fr]": "Afficher la force du signal du réseau pour votre téléphone",
"Description[it]": "Mostra la potenza del segnale di rete del tuo telefono",
"Description[ko]": "내 휴대폰의 네트워크 신호 세기 표시",
"Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen",
"Description[nn]": "Vis signalstyrke til telefon­nettverket",
"Description[pl]": "Pokazuje siłę sygnału sieciowego innego urządzenia",
@ -69,6 +71,7 @@
"Name[fr]": "Surveillance de connectivité",
"Name[ia]": "Controlator de connectivitate",
"Name[it]": "Monitor di connettività",
"Name[ko]": "연결 모니터",
"Name[nl]": "Monitor van connectiviteit",
"Name[nn]": "Sambands­overvaking",
"Name[pl]": "Zgłaszanie łączności",