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-01-05 02:00:53 +00:00
parent 54e384e68e
commit 8675ee5939
6 changed files with 7 additions and 0 deletions

View file

@ -37,6 +37,7 @@
"Description[bg]": "Избледняване на прозорците на нереагиращи приложения",
"Description[ca@valencia]": "Dessatura les finestres de les aplicacions que no responen (congelades)",
"Description[ca]": "Dessatura les finestres de les aplicacions que no responen (congelades)",
"Description[cs]": "Ztmaví okna nereagujících (zamrzlých) aplikací",
"Description[en_GB]": "Desaturate windows of unresponsive (frozen) applications",
"Description[es]": "Desaturar ventanas de las aplicaciones que no responden (congeladas)",
"Description[et]": "Reageerimisvõimetute (hangunud) rakenduste akende muutmine kahvatuks",
@ -63,6 +64,7 @@
"Name[bg]": "Избледняване на нереагиращи приложения",
"Name[ca@valencia]": "Dessatura les aplicacions que no responen",
"Name[ca]": "Dessatura les aplicacions que no responen",
"Name[cs]": "Ztmavit nereagující aplikace",
"Name[en_GB]": "Desaturate Unresponsive Applications",
"Name[es]": "Desaturar las aplicaciones que no responden",
"Name[et]": "Reageerimisvõimetute rakenduste muutmine kahvatuks",

View file

@ -8,6 +8,7 @@
"Description[bg]": "Плъзгане на прозорците, докато се появяват или изчезват",
"Description[ca@valencia]": "Les finestres llisquen en aparéixer o desaparéixer",
"Description[ca]": "Les finestres llisquen en aparèixer o desaparèixer",
"Description[cs]": "Klouzat okny při jejich objevení nebo zmizení",
"Description[de]": "Fenster beim Erscheinen oder Verschwinden gleiten lassen",
"Description[en_GB]": "Glide windows as they appear or disappear",
"Description[es]": "Deslizar las ventanas a medida que aparecen o desaparecen",

View file

@ -10,6 +10,7 @@
"Name[bg]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[ca@valencia]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[ca]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[cs]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[en_GB]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[es]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",
"Name[et]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin",

View file

@ -10,6 +10,7 @@
"Name[bg]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[ca@valencia]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[ca]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[cs]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[en_GB]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[es]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",
"Name[et]": "Lubos Lunak, Kai Uwe Broulik, Martin Gräßlin, Marco Martin",

View file

@ -8,6 +8,7 @@
"Description[bg]": "Плъзгане настрани на работните плотове при превключване на виртуални работни плотове",
"Description[ca@valencia]": "Llisca els escriptoris en canviar els escriptoris virtuals",
"Description[ca]": "Llisca els escriptoris en canviar els escriptoris virtuals",
"Description[cs]": "Klouzat plochami při přepínání virtuálních ploch",
"Description[de]": "Lässt Fenster beim Wechsel von virtuellen Arbeitsflächen über den Bildschirm gleiten",
"Description[en_GB]": "Slide desktops when switching virtual desktops",
"Description[es]": "Deslizar los escritorios al cambiar de escritorio virtual",

View file

@ -34,6 +34,7 @@
"Description[bg]": "Разпределяне на видео предаването на всички прикачени екрани, за да се създаде видео стена",
"Description[ca@valencia]": "Expandix el reproductor de vídeo a pantalla completa per a totes les pantalles adjuntades per a crear un mur de vídeo",
"Description[ca]": "Expandeix el reproductor de vídeo a pantalla completa per a totes les pantalles adjuntades per a crear un mur de vídeo",
"Description[cs]": "Roztáhne přehrávání videa přes všechny plochy pro vytvoření video zdi",
"Description[en_GB]": "Spans fullscreen video player over all attached screens to create a Video Wall",
"Description[es]": "Amplía el reproductor de video en pantalla completa a todas las pantallas conectadas para crear un muro de vídeo",
"Description[et]": "Täisekraan-videomängija laiendamine kõigile ühendatud ekraanile videoseina loomiseks",