SVN_SILENT made messages (.desktop file) - always resolve ours

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-25 02:07:27 +00:00
parent 5e355caed4
commit 2d2589c98f

View file

@ -1,7 +1,25 @@
{
"KPlugin": {
"Description": "Run initial tasks for Plasma Mobile during session startup",
"Name": "Plasma Mobile Start"
"Description[ca]": "Executa les tasques inicials del Plasma Mobile durant l'inici de sessió",
"Description[es]": "Ejecutar tareas iniciales para Plasma Mobile durante el inicio de sesión",
"Description[ia]": "Executa cargas initial per Plasma Mobile durante initio de session",
"Description[ka]": "Plasma Mobile-ის საწყისი ამოცანების შესრულება სესიის გაშვებისას",
"Description[nl]": "Initiële taken voor Plasma Mobile uitvoeren tijdens opstarten van sessie",
"Description[sl]": "Poženi zagonske naloge za Plasma Mobile ob začetku seje",
"Description[tr]": "Oturum başlangıcı sırasında Plasma Mobile .başlangıç görevlerini çalıştır",
"Description[uk]": "Запуск початкових завдань для Plasma Mobile під час запуску сеансу",
"Description[x-test]": "xxRun initial tasks for Plasma Mobile during session startupxx",
"Name": "Plasma Mobile Start",
"Name[ca]": "Inici del Plasma Mobile",
"Name[es]": "Inicio de Plasma Mobile",
"Name[ia]": "Initio de Plasma Mobile",
"Name[ka]": "Plasma Mobile-ის გაშვება",
"Name[nl]": "Begin van Plasma Mobile",
"Name[sl]": "Zagon Plasma Mobile",
"Name[tr]": "Plasma Mobile Başlangıç",
"Name[uk]": "Запуск Plasma Mobile",
"Name[x-test]": "xxPlasma Mobile Startxx"
},
"X-KDE-Kded-autoload": true,
"X-KDE-Kded-phase": 1,