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-20 06:24:53 +01:00
parent 8d521540a8
commit b2036bd374
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,12 @@
"Name": "David Shlemayev",
"Name[az]": "David Shlemayev",
"Name[ca]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
"Name[pt]": "David Shlemayev",
"Name[pt_BR]": "David Shlemayev",
"Name[sk]": "David Shlemayev",
"Name[sl]": "David Shlemayev",
"Name[sv]": "David Shlemayev",
@ -20,10 +22,12 @@
"Description": "Show your phone's network signal strength",
"Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin",
"Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono",
"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[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[sk]": "Zobraziť silu signálu vášho telefónu",
"Description[sl]": "Pokaži moč omrežnega signala telefona",
"Description[sv]": "Visa telefonens nätverkssignalstyrka",
@ -36,10 +40,12 @@
"Name": "Connectivity monitor",
"Name[az]": "Bağlantı monitoru",
"Name[ca]": "Monitor de la connectivitat",
"Name[es]": "Monitor de conectividad",
"Name[fr]": "Surveillance de connectivité",
"Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit",
"Name[pt]": "Monitor de conectividade",
"Name[pt_BR]": "Monitor de conectividade",
"Name[sk]": "Monitor pripojenia",
"Name[sl]": "Nadzornik povezovanja",
"Name[sv]": "Anslutningsövervakare",