From 16e38fe07bcbecdf279a1c39abbf1326dd080c53 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Oct 2021 01:19:47 +0000 Subject: [PATCH] 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" --- src/effects/sessionquit/package/metadata.desktop | 2 +- src/scripts/videowall/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/effects/sessionquit/package/metadata.desktop b/src/effects/sessionquit/package/metadata.desktop index 86f6af9a88..3af257b6cb 100644 --- a/src/effects/sessionquit/package/metadata.desktop +++ b/src/effects/sessionquit/package/metadata.desktop @@ -35,7 +35,7 @@ Name[zh_TW]=離開工作階段 Icon=preferences-system-windows-effect-logout Comment=Keep the desktop background alive during logout until the end Comment[az]=Seansdan çıxışda sona qədər İş Masası fon şəklinin saxlanılması -Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final +Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins al final Comment[da]=Hold skrivebordsbaggrunden i live under log ud helt til sidst Comment[de]=Beim Abmelden den Hintergrund der Arbeitsfläche bis zum Schluss behalten Comment[en_GB]=Keep the desktop background alive during logout until the end diff --git a/src/scripts/videowall/metadata.desktop b/src/scripts/videowall/metadata.desktop index 2174caaaec..40ee6659bb 100644 --- a/src/scripts/videowall/metadata.desktop +++ b/src/scripts/videowall/metadata.desktop @@ -53,7 +53,7 @@ Name[zh_TW]=影像牆 Comment=Spans fullscreen video player over all attached screens to create a Video Wall Comment[az]=Ekranda fon şəkili əvəzinə seçilmiş videonu tam ekran göstərir. Comment[bs]=Proteže punog zaslona gledanje videa nad svim priloženim ekranima stvoriti video zidu -Comment[ca]=Expandeix el reproductor de vídeo a pantalla completa per a totes les pantalles adjuntades per a crear un mur de vídeo. +Comment[ca]=Expandeix el reproductor de vídeo a pantalla completa per a totes les pantalles adjuntades per a crear un mur de vídeo Comment[ca@valencia]=Expandeix el reproductor de vídeo a pantalla completa per a totes les pantalles adjuntades per a crear un mur de vídeo. Comment[da]=Udfolder videoafspiller i fuldskærm over alle tilsluttede skærme og danner derved en videovæg Comment[de]=Erweitert einen Videospieler im Vollbildmodus über alle Bildschirme, um eine Video-Wand zu erzeugen