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-03-22 08:43:10 +01:00
parent 244af8433e
commit 8804c67e61
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

@ -11,6 +11,7 @@
"Name[ia]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
"Name[nn]": "David Shlemayev",
"Name[pl]": "David Shlemayev",
"Name[pt]": "David Shlemayev",
"Name[pt_BR]": "David Shlemayev",
@ -27,6 +28,7 @@
"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[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen",
"Description[nn]": "Vis signalstyrke til telefon­nettverket",
"Description[pl]": "Pokaż siłę sygnału sieciowego swojego telefnou",
"Description[pt]": "Mostrar a potência do sinal da rede do seu telefone",
"Description[pt_BR]": "Mostra a força do sinal de rede do seu celular",
@ -46,6 +48,7 @@
"Name[ia]": "Controlator de connectivitate",
"Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit",
"Name[nn]": "Sambands­overvaking",
"Name[pl]": "Monitor łączności",
"Name[pt]": "Monitor de conectividade",
"Name[pt_BR]": "Monitor de conectividade",