From c07f685ceda59907982fe690a63a3a59a2aa0d87 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Sep 2019 09:01:00 +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" --- kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index ac55284c4c..e896ae0723 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -68,6 +68,7 @@ Comment[es]=Configurar las preferencias del compositor para los efectos del escr Comment[gl]=Configurar o compositor para os efectos de escritorio Comment[it]=Configura impostazioni del compositore per gli effetti del desktop Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten +Comment[nn]=Samansetjarinnstillingar for skrivebordseffektar Comment[pl]=Ustawienia kompozytora dla efektów pulpitu Comment[pt]=Configuração do compositor para os efeitos do ecrã Comment[pt_BR]=Defina as configurações do compositor para os efeitos da área de trabalho