From 5e157112bc35fb8ae5455aa68b2f0bb426992f5f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Aug 2015 10:52:21 +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" --- lookandfeel.dark/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 91a0502f..058e9b01 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -6,6 +6,7 @@ Comment[es]=Lenguaje de diseño del escritorio Breeze Dark, por el VDG de KDE Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark do KDE VDG Comment[nb]=Breeze Dark-språk for skrivebordsutforming fra KDE-gruppa for visuell design Comment[nl]=Breeze Dark ontwerptaal van het bureaublad door KDE VDG +Comment[pl]=Język Projektowania Ciemnego Pulpitu Bryzy przez KDE VDG Comment[pt]=Linguagem de Desenho do Ecrã Brisa Escuro, da VDG do KDE Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze Dark por KDE VDG Comment[sl]=Sapica (temna), oblikovalni jezik namizja avtorjev KDE VDG