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-01-16 01:58:23 +00:00
parent 5db7d31ee0
commit 058c2b095f
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcm/kcm_kdeconnect.json
View file

@ -12,8 +12,10 @@
"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[it]": "Connetti e sincronizza i tuoi dispositivi",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[nn]": "Kopla til og synkroniser einingar",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
"Description[pt]": "Ligue e sincronize os seus dispositivos",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
@ -33,8 +35,10 @@
"Name[eu]": "KDE Connect",
"Name[fr]": "KDE Connect",
"Name[ia]": "KDE Connect",
"Name[it]": "KDE Connect",
"Name[ka]": "KDE Connect",
"Name[nl]": "KDE Connect",
"Name[nn]": "KDE Connect",
"Name[pl]": "KDE Connect",
"Name[pt]": "KDE Connect",
"Name[ru]": "KDE Connect",

4
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -14,8 +14,10 @@
"Name[eu]": "Yoram Bar-Haim",
"Name[fr]": "Yoram Bar-Haim",
"Name[ia]": "Yoram Bar-Haim",
"Name[it]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim",
"Name[nn]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim",
"Name[pt]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim",
@ -81,8 +83,10 @@
"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[it]": "Integrazione telefonica di ModemManager",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[nl]": "Modembeheerder telefoonintegratie",
"Name[nn]": "ModemManager-telefoniintegrering",
"Name[pl]": "Integracja z telefonią zarządzania modemem",
"Name[pt]": "Integração telefónica com o ModemManager",
"Name[sl]": "Upravljalnik modema integracija telefonije",