From cd9acd2e4162b401966030e005e941b189ee73ed Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Sep 2020 06:08:11 +0200 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/fullscreen/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/fullscreen/package/metadata.desktop b/effects/fullscreen/package/metadata.desktop index 3c564881a..c9246a0af 100644 --- a/effects/fullscreen/package/metadata.desktop +++ b/effects/fullscreen/package/metadata.desktop @@ -19,6 +19,7 @@ Icon=preferences-system-windows-effect-fullscreen Name=Full Screen Name[ca]=Pantalla completa Name[cs]=Celá obrazovka +Name[de]=Vollbild Name[en_GB]=Full Screen Name[es]=Pantalla completa Name[fr]=Plein écran