From c2d1c82e0fe37fc987d15a216819222dfc66b4b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 27 Aug 2015 11:08:58 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index a7926c69..3aec8cb9 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -1,6 +1,9 @@ [Desktop Entry] Comment=Breeze Dark Desktop Design Language by the KDE VDG Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE +Comment[de]=Breeze-Dunkel-Arbeitsflächendesign der KDE VDG +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[nl]=Breeze Dark ontwerptaal van het bureaublad door 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