From 1f9d24a8db422a1eb2bfe5b4dc0bed5a830f006f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 5 Mar 2022 02:50: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" --- wallpapers/image/imagepackage/setaswallpaper.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/image/imagepackage/setaswallpaper.desktop.in b/wallpapers/image/imagepackage/setaswallpaper.desktop.in index ab0b7aee5..3c39802f8 100644 --- a/wallpapers/image/imagepackage/setaswallpaper.desktop.in +++ b/wallpapers/image/imagepackage/setaswallpaper.desktop.in @@ -11,6 +11,7 @@ Name[ar]=عين كخلفية Name[az]=Divar Kağızı təyin edin Name[ca]=Estableix com a fons de pantalla Name[ca@valencia]=Estableix com a fons de pantalla +Name[cs]=Nastavit jako tapetu Name[de]=Als Hintergrundbild festlegen Name[en_GB]=Set as Wallpaper Name[es]=Definir como fondo del escritorio