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-27 09:17:12 +01:00
parent 7115afd6a6
commit 8001863ff4
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

@ -7,6 +7,7 @@
"Name[az]": "David Shlemayev", "Name[az]": "David Shlemayev",
"Name[ca@valencia]": "David Shlemayev", "Name[ca@valencia]": "David Shlemayev",
"Name[ca]": "David Shlemayev", "Name[ca]": "David Shlemayev",
"Name[cs]": "David Shlemayev",
"Name[es]": "David Shlemayev", "Name[es]": "David Shlemayev",
"Name[fr]": "David Shlemayev", "Name[fr]": "David Shlemayev",
"Name[ia]": "David Shlemayev", "Name[ia]": "David Shlemayev",
@ -29,6 +30,7 @@
"Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", "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@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[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
"Description[cs]": "Zobrazit sílu signálu telefonu",
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono", "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[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",
@ -52,6 +54,7 @@
"Name[az]": "Bağlantı monitoru", "Name[az]": "Bağlantı monitoru",
"Name[ca@valencia]": "Monitor de la connectivitat", "Name[ca@valencia]": "Monitor de la connectivitat",
"Name[ca]": "Monitor de la connectivitat", "Name[ca]": "Monitor de la connectivitat",
"Name[cs]": "Monitor spojení",
"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[ia]": "Controlator de connectivitate",