From 3836e048810e64c787f56b5512262129da6df8c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Mar 2017 05:00:58 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 15938fd4f4..12acb8fceb 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -2,6 +2,7 @@ Name=eye On Screen Name[ca]=Ull a la pantalla Name[ca@valencia]=Ull a la pantalla +Name[cs]=oko na obrazovce Name[da]=øjet på skærmen Name[de]=Ansicht der Arbeitsfläche Name[el]=μάτι Στην Οθόνη