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 2022-09-20 01:48:04 +00:00
parent 2006424e21
commit 03a58c66a5
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/contacts/kdeconnect_contacts.json
View file

@ -58,6 +58,7 @@
"Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
"Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",
"Description[ko]": "연결된 장치에서 데스크톱으로 연락처 동기화",
"Description[lt]": "Sinchronizuoti adresatus iš prijungto įrenginio į darbalaukį",
"Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad",
"Description[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet",
"Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem",

3
plugins/virtualmonitor/kdeconnect_virtualmonitor.json
View file

@ -20,6 +20,7 @@
"Name[is]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[ko]": "Aleix Pol i Gonzalez",
"Name[lt]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[nn]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
@ -54,6 +55,7 @@
"Description[is]": "Notaðu tækin þín sem sýndarskjái",
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
"Description[ko]": "내 장치를 가상 모니터로 사용",
"Description[lt]": "Naudoti įrenginius kaip virtualius monitorius",
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
"Description[nn]": "Bruk einingane som virtuelle avlyttarar",
"Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego",
@ -90,6 +92,7 @@
"Name[is]": "Sýndarskjár",
"Name[it]": "Schermo virtuale",
"Name[ko]": "가상 모니터",
"Name[lt]": "Virtualus monitorius",
"Name[nl]": "Virtuele monitor",
"Name[nn]": "Virtuell avlyttar",
"Name[pl]": "Wyświetlacz wirtualny",