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-17 08:05:28 +01:00
parent 67a6a9f0a6
commit 31ca3cbf4f
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

@ -6,6 +6,7 @@
"Name": "David Shlemayev", "Name": "David Shlemayev",
"Name[az]": "David Shlemayev", "Name[az]": "David Shlemayev",
"Name[ca]": "David Shlemayev", "Name[ca]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev", "Name[nl]": "David Shlemayev",
"Name[pt]": "David Shlemayev", "Name[pt]": "David Shlemayev",
"Name[sk]": "David Shlemayev", "Name[sk]": "David Shlemayev",
@ -18,6 +19,7 @@
"Description": "Show your phone's network signal strength", "Description": "Show your phone's network signal strength",
"Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", "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[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
"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[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[sk]": "Zobraziť silu signálu vášho telefónu", "Description[sk]": "Zobraziť silu signálu vášho telefónu",
@ -32,6 +34,7 @@
"Name": "Connectivity monitor", "Name": "Connectivity monitor",
"Name[az]": "Bağlantı monitoru", "Name[az]": "Bağlantı monitoru",
"Name[ca]": "Monitor de la connectivitat", "Name[ca]": "Monitor de la connectivitat",
"Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit", "Name[nl]": "Monitor van connectiviteit",
"Name[pt]": "Monitor de conectividade", "Name[pt]": "Monitor de conectividade",
"Name[sk]": "Monitor pripojenia", "Name[sk]": "Monitor pripojenia",