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-02-03 02:04:58 +00:00
parent ecb6ca48b3
commit 6d9c5cdd3e
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

@ -12,6 +12,7 @@
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
"Description[fr]": "Vous connecter à vos périphériques et se synchroniser avec eux",
"Description[ia]": "Connecte e synchronisa tu dispositivos",
"Description[is]": "Tengdu og samstilltu tækin þín",
"Description[it]": "Connetti e sincronizza i tuoi dispositivi",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
@ -36,6 +37,7 @@
"Name[eu]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[ia]": "KDE Connect",
"Name[is]": "KDE Connect",
"Name[it]": "KDE Connect",
"Name[ka]": "KDE Connect",
"Name[nl]": "KDE Connect",

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -14,6 +14,7 @@
"Name[eu]": "Yoram Bar-Haim",
"Name[fr]": "Yoram Bar-Haim",
"Name[ia]": "Yoram Bar-Haim",
"Name[is]": "Yoram Bar-Haim",
"Name[it]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim",
@ -84,6 +85,7 @@
"Name[eu]": "«ModemManager» telefonia bateratzea",
"Name[fr]": "Intégration de la téléphonie avec ModemManager ",
"Name[ia]": "Integration de telephonia Modem Manager (Gerente de Modem)",
"Name[is]": "Samþætting símkerfa með ModemManager",
"Name[it]": "Integrazione telefonica di ModemManager",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[nl]": "Modembeheerder telefoonintegratie",