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 05:27:00 +01:00
parent e5f8bf330a
commit ca78059740
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
"Name[fr]": "David Shlemayev", "Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev", "Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev", "Name[nl]": "David Shlemayev",
"Name[nn]": "David Shlemayev",
"Name[pl]": "David Shlemayev", "Name[pl]": "David Shlemayev",
"Name[pt]": "David Shlemayev", "Name[pt]": "David Shlemayev",
"Name[pt_BR]": "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[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[it]": "Mostra la potenza del segnale di rete del tuo telefono",
"Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen", "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[pl]": "Pokaż siłę sygnału sieciowego swojego telefnou",
"Description[pt]": "Mostrar a potência do sinal da rede do seu telefone", "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", "Description[pt_BR]": "Mostra a força do sinal de rede do seu celular",
@ -44,8 +46,10 @@
"Name[ca]": "Monitor de la connectivitat", "Name[ca]": "Monitor de la connectivitat",
"Name[es]": "Monitor de conectividad", "Name[es]": "Monitor de conectividad",
"Name[fr]": "Surveillance de connectivité", "Name[fr]": "Surveillance de connectivité",
"Name[ia]": "Controlator de connectivitate",
"Name[it]": "Monitor di connettività", "Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit", "Name[nl]": "Monitor van connectiviteit",
"Name[nn]": "Sambands­overvaking",
"Name[pl]": "Monitor łączności", "Name[pl]": "Monitor łączności",
"Name[pt]": "Monitor de conectividade", "Name[pt]": "Monitor de conectividade",
"Name[pt_BR]": "Monitor de conectividade", "Name[pt_BR]": "Monitor de conectividade",

1
plugins/findmyphone/kdeconnect_findmyphone.json
View file

@ -150,6 +150,7 @@
"Name[fi]": "Soita puhelimeeni", "Name[fi]": "Soita puhelimeeni",
"Name[fr]": "Faire sonner mon téléphone", "Name[fr]": "Faire sonner mon téléphone",
"Name[gl]": "Facer soar o meu móbil", "Name[gl]": "Facer soar o meu móbil",
"Name[ia]": "Sona mi telephono",
"Name[id]": "Ring my phone", "Name[id]": "Ring my phone",
"Name[it]": "Fai squillare il mio telefono", "Name[it]": "Fai squillare il mio telefono",
"Name[ja]": "端末を鳴らす", "Name[ja]": "端末を鳴らす",

1
plugins/findthisdevice/kdeconnect_findthisdevice.json
View file

@ -93,6 +93,7 @@
"Name[fi]": "Etsi tämä laite", "Name[fi]": "Etsi tämä laite",
"Name[fr]": "Trouver ce périphérique", "Name[fr]": "Trouver ce périphérique",
"Name[gl]": "Atopar o dispositivo", "Name[gl]": "Atopar o dispositivo",
"Name[ia]": "Trova iste dispositivo",
"Name[id]": "Find this device", "Name[id]": "Find this device",
"Name[it]": "Trova questo dispositivo", "Name[it]": "Trova questo dispositivo",
"Name[ja]": "デバイスを探す", "Name[ja]": "デバイスを探す",