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-06-07 02:37:32 +00:00
parent 784f36affa
commit 7349ba41f9

View file

@ -9,6 +9,7 @@
"Name[bg]": "Chris Holland",
"Name[ca@valencia]": "Chris Holland",
"Name[ca]": "Chris Holland",
"Name[cs]": "Chris Holland",
"Name[de]": "Chris Holland",
"Name[en_GB]": "Chris Holland",
"Name[es]": "Chris Holland",
@ -33,6 +34,7 @@
"Description[bg]": "Оформление на превключвател на прозорци, използващ решетка от миниатюри",
"Description[ca@valencia]": "Una disposició del commutador de finestres que utilitza una quadrícula xicoteta de miniatures",
"Description[ca]": "Una disposició del commutador de finestres que utilitza una quadrícula petita de miniatures",
"Description[cs]": "Přepínač oken používající malou mřížku náhledů",
"Description[de]": "Ein Fensterwechsler-Layout, das ein Raster von kleinen Vorschaubildern verwendet",
"Description[en_GB]": "A window switcher layout using a small grid of thumbnails",
"Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas",
@ -56,6 +58,7 @@
"Name[bg]": "Миниатюри в решетка",
"Name[ca@valencia]": "Quadrícula de miniatures",
"Name[ca]": "Quadrícula de miniatures",
"Name[cs]": "Mřížka náhledů",
"Name[de]": "Vorschaubilder-Raster",
"Name[en_GB]": "Thumbnail Grid",
"Name[es]": "Cuadrícula de miniaturas",