From 102332df00af94234a7ec5c265c183ad84324a4a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Sep 2020 06:27:23 +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 afa3cb9333..826f5fa6a1 100644 --- a/effects/fullscreen/package/metadata.desktop +++ b/effects/fullscreen/package/metadata.desktop @@ -20,6 +20,7 @@ Name[ca]=Pantalla completa Name[cs]=Celá obrazovka Name[es]=Pantalla completa Name[fr]=Plein écran +Name[ia]=Schermo plen Name[it]=Schermo intero Name[ko]=전체 화면 Name[nl]=Volledig scherm