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-06-14 01:14:54 +00:00
parent 82c7a8080d
commit 146a359b7e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/kdeconnectsendfile.json
View file

@ -51,7 +51,7 @@
"Name[en_GB]": "Send file via KDE Connect",
"Name[es]": "Enviar archivo con KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu",
"Name[eu]": "Bidali fitxategia KDE Connect bidez",
"Name[eu]": "Bidali fitxategia KDE Connect bidez",
"Name[fi]": "Lähetä tiedosto KDE Connectilla",
"Name[fr]": "Envoyer un fichier via KDE Connect",
"Name[gl]": "Enviar o ficheiro por KDE Connect",

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

@ -11,6 +11,7 @@
"Name[de]": "David Shlemayev",
"Name[en_GB]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[eu]": "David Shlemayev",
"Name[fi]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev",
@ -38,6 +39,7 @@
"Description[de]": "Signalstärke des Mobiltelefons anzeigen",
"Description[en_GB]": "Show your phone's network signal strength",
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono",
"Description[eu]": "Erakutsi zure telefonoaren sare-seinalearen sendotasuna",
"Description[fi]": "Näytä puhelimen kentän voimakkuus",
"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",
@ -67,6 +69,7 @@
"Name[de]": "Verbindungs-Überwachung",
"Name[en_GB]": "Connectivity monitor",
"Name[es]": "Monitor de conectividad",
"Name[eu]": "Konektagarritasun begiralea",
"Name[fi]": "Yhteysvalvonta",
"Name[fr]": "Surveillance de connectivité",
"Name[ia]": "Controlator de connectivitate",