From c387884cca76058a192458b7c80063d5221e3380 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Oct 2022 01:57:45 +0000 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" --- quicksettings/screenrotation/package/metadata.json | 1 + 1 file changed, 1 insertion(+) diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 47a624b2..91aad6f1 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -34,6 +34,7 @@ "Description[en_GB]": "Screen rotation quick setting", "Description[es]": "Ajuste rápido de rotación de la pantalla", "Description[eu]": "Pantaila biratzearen ezarpen azkarra", + "Description[fi]": "Näytön kierron pika-asetus", "Description[fr]": "Configuration rapide pour la rotation d'écran", "Description[is]": "Flýtistilling á snúningi skjás", "Description[it]": "Impostazione rapida della rotazione dello schermo",