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 2024-11-18 03:14:01 +00:00
parent c7393be376
commit fc3ee357ef
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcm/kcm_kdeconnect.json
View file

@ -14,6 +14,7 @@
"Description[fr]": "Configurer la synchronisation des périphériques", "Description[fr]": "Configurer la synchronisation des périphériques",
"Description[gl]": "Configurar a sincronización de dispositivos.", "Description[gl]": "Configurar a sincronización de dispositivos.",
"Description[he]": "הגדרת סנכרון מכשירים", "Description[he]": "הגדרת סנכרון מכשירים",
"Description[hu]": "Eszközszinkronizáció beállítása",
"Description[ia]": "Configura Synchronisation de dispositivo", "Description[ia]": "Configura Synchronisation de dispositivo",
"Description[is]": "Grunnstilla samstillingu tækja", "Description[is]": "Grunnstilla samstillingu tækja",
"Description[it]": "Configura la sincronizzazione del dispositivo", "Description[it]": "Configura la sincronizzazione del dispositivo",

1
plasmoid/package/metadata.json
View file

@ -62,6 +62,7 @@
"Description[fr]": "Gérer les appareils connectés", "Description[fr]": "Gérer les appareils connectés",
"Description[gl]": "Xestionar os dispositivos conectados.", "Description[gl]": "Xestionar os dispositivos conectados.",
"Description[he]": "ניהול התקנים מחוברים", "Description[he]": "ניהול התקנים מחוברים",
"Description[hu]": "Csatlakoztatott eszközök kezelése",
"Description[ia]": "Gere dispositivos connectite", "Description[ia]": "Gere dispositivos connectite",
"Description[is]": "Stjórna tengdum tækjum", "Description[is]": "Stjórna tengdum tækjum",
"Description[it]": "Gestisci i dispositivi connessi", "Description[it]": "Gestisci i dispositivi connessi",