From f79266d148f1d14fd09e1a2285705e021ba0e1b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Aug 2016 09:40:09 +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 deletion(-) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index a688dd47..910083e3 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -21,7 +21,6 @@ Comment[nn]=Breeze Dark-designspråk av 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[ru]=Тёмный вариант оформления рабочей среды Breeze от KDE VDG Comment[sk]=Breeze, tmavý dizajn pracovnej plochy od KDE VDG Comment[sl]=Sapica (temna), oblikovalni jezik namizja avtorjev KDE VDG Comment[sr]=Језик дизајна површи Поветарац тамни од КДЕ‑ВДГ‑а