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 2024-08-08 01:22:12 +00:00
parent 7752db3a88
commit 51b5fa1e74
2 changed files with 6 additions and 0 deletions

View file

@ -2,6 +2,8 @@
"KPlugin": {
"Category": "Tools",
"Description": "Display if compositing is active",
"Description[bg]": "Показване, ако композирането е активно",
"Description[ca@valencia]": "Mostra si la composició està activa",
"Description[ca]": "Mostra si la composició està activa",
"Description[es]": "Mostrar si la composición está activa",
"Description[eu]": "Azaldu konposatzea aktibo dagoen",
@ -17,6 +19,8 @@
"EnabledByDefault": false,
"License": "GPL",
"Name": "Show Compositing",
"Name[bg]": "Показване на визуални ефекти",
"Name[ca@valencia]": "Mostra la composició",
"Name[ca]": "Mostra la composició",
"Name[es]": "Mostrar composición",
"Name[eu]": "Erakutsi konposatzea",

View file

@ -2,6 +2,7 @@
"KPlugin": {
"Category": "Accessibility",
"Description": "Provides the bell",
"Description[bg]": "Предоставя системна сигнализация",
"Description[ca@valencia]": "Proporciona el timbre",
"Description[ca]": "Proporciona el timbre",
"Description[eo]": "Provizas la pepon",
@ -26,6 +27,7 @@
"EnabledByDefault": true,
"License": "GPL",
"Name": "System Bell",
"Name[bg]": "Системна сигнализация",
"Name[ca@valencia]": "Timbre del sistema",
"Name[ca]": "Timbre del sistema",
"Name[eo]": "Sistempepo",