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-23 05:42:13 +01:00
parent ca78059740
commit 45691c6a81
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

@ -5,6 +5,7 @@
"Email": "david.shlemayev@gmail.com",
"Name": "David Shlemayev",
"Name[az]": "David Shlemayev",
"Name[ca@valencia]": "David Shlemayev",
"Name[ca]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
@ -23,6 +24,7 @@
],
"Description": "Show your phone's network signal strength",
"Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin",
"Description[ca@valencia]": "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[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",
@ -43,6 +45,7 @@
"License": "GPL",
"Name": "Connectivity monitor",
"Name[az]": "Bağlantı monitoru",
"Name[ca@valencia]": "Monitor de la connectivitat",
"Name[ca]": "Monitor de la connectivitat",
"Name[es]": "Monitor de conectividad",
"Name[fr]": "Surveillance de connectivité",