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 2023-03-11 01:45:11 +00:00
parent d99a241114
commit 14fbfe04db
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcm/kcm_kdeconnect.json
View file

@ -13,6 +13,7 @@
"Description[en_GB]": "Connect and sync your devices",
"Description[es]": "Conecta y sincroniza sus dispositivos",
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
"Description[fi]": "Yhdistä ja synkronoi laitteitasi",
"Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux",
"Description[ia]": "Connecte e synchronisa tu dispositivos",
"Description[is]": "Tengja og samstilla tækin þín",
@ -44,6 +45,7 @@
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",
"Name[fi]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[ia]": "KDE Connect",
"Name[is]": "KDE Connect",

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -14,6 +14,7 @@
"Name[en_GB]": "Yoram Bar-Haim",
"Name[es]": "Yoram Bar-Haim",
"Name[eu]": "Yoram Bar-Haim",
"Name[fi]": "Yoram Bar-Haim",
"Name[fr]": "Yoram Bar-Haim",
"Name[ia]": "Yoram Bar-Haim",
"Name[is]": "Yoram Bar-Haim",
@ -90,6 +91,7 @@
"Name[en_GB]": "ModemManager Telephony integration",
"Name[es]": "Integración con el teléfono ModemManager",
"Name[eu]": "«ModemManager» telefonia bateratzea",
"Name[fi]": "ModemManagerin Telephony-integrointi",
"Name[fr]": "Intégration de la téléphonie avec ModemManager ",
"Name[ia]": "Integration de telephonia Modem Manager (Gerente de Modem)",
"Name[is]": "ModemManager samþætting símaaðgerða",