From b47303f1e4a1500a66c139c57ad604dc0009a602 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 14 Aug 2016 11:54:59 +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 96d7c0c1..4a10d06f 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -21,6 +21,7 @@ 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]=Језик дизајна површи Поветарац тамни од КДЕ‑ВДГ‑а