From fd68cf3ff49138344d45af43b37dbc67c310f6ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Mar 2021 07:03:02 +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" --- src/effects/eyeonscreen/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/effects/eyeonscreen/package/metadata.desktop b/src/effects/eyeonscreen/package/metadata.desktop index 9b0c6b03e4..2d2625ca43 100644 --- a/src/effects/eyeonscreen/package/metadata.desktop +++ b/src/effects/eyeonscreen/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Eye on Screen Name[az]=Pəncərənin ekranın mərkəzinə çəkilməsi Name[ca]=Ull a la pantalla Name[cs]=Oko na obrazovce +Name[de]=Ansicht der Arbeitsfläche Name[en_GB]=Eye on Screen Name[es]=Ojo a la pantalla Name[et]=Eye on Screen