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 2022-09-02 01:45:36 +00:00
parent 048acddf13
commit fbaacc78ac

View file

@ -29,10 +29,24 @@
}
],
"Description": "Screen recording quick setting",
"Description[ca]": "Configuració ràpida de l'enregistrament de pantalla",
"Description[eu]": "Pantaila grabatzeko ezarpen azkarra",
"Description[nl]": "Snelle instelling van scherm opnemen",
"Description[pt]": "Configuração rápida da gravação do ecrã",
"Description[tr]": "Ekran kaydetme hızlı ayarı",
"Description[uk]": "Швидке налаштовування запису з екрана",
"Description[x-test]": "xxScreen recording quick settingxx",
"Icon": "media-record",
"Id": "org.kde.plasma.quicksetting.record",
"License": "GPL-2.0+",
"Name": "Record Screen",
"Name[ca]": "Enregistra la pantalla",
"Name[eu]": "Grabatu pantaila",
"Name[nl]": "Scherm opnemen",
"Name[pt]": "Gravar o Ecrã",
"Name[tr]": "Ekranı Kaydet",
"Name[uk]": "Запис з екрана",
"Name[x-test]": "xxRecord Screenxx",
"ServiceTypes": [
"KPackage/GenericQML"
],