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-12 01:44:01 +00:00
parent 5899830917
commit 336f35a235

View file

@ -29,10 +29,26 @@
}
],
"Description": "Quick setting to toggle do not disturb mode",
"Description[ca@valencia]": "Configuració ràpida per a canviar el mode no destorbar",
"Description[ca]": "Configuració ràpida per canviar el mode no destorbar",
"Description[eu]": "Zaratarik ez modua txandakatzeko ezarpen azkarra",
"Description[nl]": "Snelle instelling om modus niet storen om te schakelen",
"Description[pt]": "Configuração rápida para activar/desactivar o modo 'não incomodar'",
"Description[tr]": "Rahatsız etme kipini açıp/kapatmak için tez ayar",
"Description[uk]": "Швидке встановлення режиму «не турбувати»",
"Description[x-test]": "xxQuick setting to toggle do not disturb modexx",
"Icon": "notifications",
"Id": "org.kde.plasma.quicksetting.donotdisturb",
"License": "GPL",
"Name": "Do Not Disturb",
"Name[ca@valencia]": "No destorbar",
"Name[ca]": "No destorbar",
"Name[eu]": "Zatarik ez",
"Name[nl]": "Niet storen",
"Name[pt]": "Não Incomodar",
"Name[tr]": "Rahatsız Etme",
"Name[uk]": "Не турбувати",
"Name[x-test]": "xxDo Not Disturbxx",
"ServiceTypes": [
"KPackage/GenericQML"
],