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-09 02:05:26 +00:00
parent 3b057ab466
commit a1653720e5
3 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

@ -7,6 +7,7 @@
"Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius",
"Description[ca]": "Connecta i sincronitza els vostres dispositius",
"Description[cs]": "Připojte a synchronizujte svá zařízení",
"Description[de]": "Verbinden und Abgleichen Ihrer Geräte",
"Description[en_GB]": "Connect and sync your devices",
"Description[es]": "Conecta y sincroniza sus dispositivos",
"Description[eu]": "Zure gailuak konektatu eta sinkronizatzea",
@ -35,6 +36,7 @@
"Name[ca@valencia]": "KDE Connect",
"Name[ca]": "KDE Connect",
"Name[cs]": "KDE Connect",
"Name[de]": "KDE Connect",
"Name[en_GB]": "KDE Connect",
"Name[es]": "KDE Connect",
"Name[eu]": "KDE Connect",

1
plugins/contacts/kdeconnect_contacts.json
View file

@ -54,6 +54,7 @@
"Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori",
"Description[cs]": "Synchronizovat kontakty z připojeného zařízení do pracovního prostředí",
"Description[de]": "Abgleich von Kontakten vom angeschlossenen Gerät zum Arbeitsplatz",
"Description[en_GB]": "Synchronise Contacts from the Connected Device to the Desktop",
"Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio",
"Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera",

1
plugins/mmtelephony/kdeconnect_mmtelephony.json
View file

@ -9,6 +9,7 @@
"Name[ca@valencia]": "Yoram Bar-Haim",
"Name[ca]": "Yoram Bar-Haim",
"Name[cs]": "Yoram Bar-Haim",
"Name[de]": "Yoram Bar-Haim",
"Name[en_GB]": "Yoram Bar-Haim",
"Name[es]": "Yoram Bar-Haim",
"Name[eu]": "Yoram Bar-Haim",