From cbcfa9fd7f92be206bcad83e629ac4aa71f654fa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 4 Oct 2022 01:51:11 +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 a5b34e92..3e734c84 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -37,6 +37,7 @@ "Description[fr]": "Configuration rapide pour la rotation d'écran", "Description[it]": "Impostazione rapida della rotazione dello schermo", "Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება", + "Description[ko]": "화면 회전 빠른 설정", "Description[nl]": "Snelle instelling van schermrotatie", "Description[pl]": "Szybkie ustawienie obracania ekranu", "Description[pt]": "Configuração rápida da rotação do ecrã",