From 6a77b8a1eb187bfa54408ed5cc6b27ce08b5d47d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2017 08:49:40 +0100 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" --- effects/eyeonscreen/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index e09d55a22d..69fb3e6234 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -38,7 +38,7 @@ Name[zh_TW]=螢幕之眼 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into desktop to show the latter. This might remind you of something. Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom. -Comment[ca@valencia]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom. +Comment[ca@valencia]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos alguna cosa. Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det dig om noget. Comment[de]=Saugt Fenster in die Arbeitsfläche, um sie anzuzeigen. Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.