From 1ddcf8645f3c9e0bba4b60886ab7871c6041cd3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 Jan 2017 06:10:12 +0100 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/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + 2 files changed, 2 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 4468932968..be799f313e 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -8,6 +8,7 @@ Name[es]=Efectos del gestor de ventanas Name[ia]=Gerente de effectos de fenestra Name[it]=Effetti del gestore delle finestre Name[nl]=Effecten van vensterbeheerder +Name[nn]=Effektar for vindaugshandsamar Name[pl]=Efekty zarządzania oknami Name[pt]=Efeitos do Gestor de Janelas Name[sk]=Efekty správcu okien diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 9ffeacbb8e..06face6c16 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -8,6 +8,7 @@ Name[es]=Guiones del gestor de ventanas Name[ia]=Gerente de scripts de fenestra Name[it]=Script del gestore delle finestre Name[nl]=Scripts van vensterbeheerder +Name[nn]=Skript for vindaugshandsamar Name[pl]=Skrypty zarządzania oknami Name[pt]=Programas do Gestor de Janelas Name[sk]=Skripty správcu okien