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-05 01:59:29 +00:00
parent 5d002a4137
commit e31f3c4abb
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

@ -15,6 +15,7 @@
"Description[is]": "Tengja og samstilla tækin þín", "Description[is]": "Tengja og samstilla tækin þín",
"Description[it]": "Connetti e sincronizza i tuoi dispositivi", "Description[it]": "Connetti e sincronizza i tuoi dispositivi",
"Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია", "Description[ka]": "თქვენი მოწყობილობების მიერთება და სინქრონიზაცია",
"Description[lt]": "Prijunkite ir sinchronizuokite savo įrenginius",
"Description[nl]": "Uw apparaten verbinden en synchroniseren", "Description[nl]": "Uw apparaten verbinden en synchroniseren",
"Description[nn]": "Kopla til og synkroniser einingar", "Description[nn]": "Kopla til og synkroniser einingar",
"Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia", "Description[pl]": "Podłącz i zsynchronizuj swoje urządzenia",
@ -40,6 +41,7 @@
"Name[is]": "KDE Connect", "Name[is]": "KDE Connect",
"Name[it]": "KDE Connect", "Name[it]": "KDE Connect",
"Name[ka]": "KDE Connect", "Name[ka]": "KDE Connect",
"Name[lt]": "KDE Connect",
"Name[nl]": "KDE Connect", "Name[nl]": "KDE Connect",
"Name[nn]": "KDE Connect", "Name[nn]": "KDE Connect",
"Name[pl]": "KDE Connect", "Name[pl]": "KDE Connect",

2
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -17,6 +17,7 @@
"Name[is]": "Yoram Bar-Haim", "Name[is]": "Yoram Bar-Haim",
"Name[it]": "Yoram Bar-Haim", "Name[it]": "Yoram Bar-Haim",
"Name[ka]": "Yoram Bar-Haim", "Name[ka]": "Yoram Bar-Haim",
"Name[lt]": "Yoram Bar-Haim",
"Name[nl]": "Yoram Bar-Haim", "Name[nl]": "Yoram Bar-Haim",
"Name[nn]": "Yoram Bar-Haim", "Name[nn]": "Yoram Bar-Haim",
"Name[pl]": "Yoram Bar-Haim", "Name[pl]": "Yoram Bar-Haim",
@ -88,6 +89,7 @@
"Name[is]": "ModemManager samþætting símaaðgerða", "Name[is]": "ModemManager samþætting símaaðgerða",
"Name[it]": "Integrazione telefonica di ModemManager", "Name[it]": "Integrazione telefonica di ModemManager",
"Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია", "Name[ka]": "ModemManager -ის ტელეფონის ინტეგრაცია",
"Name[lt]": "ModemManager telefonijos integracija",
"Name[nl]": "Modembeheerder telefoonintegratie", "Name[nl]": "Modembeheerder telefoonintegratie",
"Name[nn]": "ModemManager-telefoniintegrering", "Name[nn]": "ModemManager-telefoniintegrering",
"Name[pl]": "Integracja z telefonią zarządzania modemem", "Name[pl]": "Integracja z telefonią zarządzania modemem",