From 9f7210554d89d88c63dd3eb8a34af1d555509cc9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 30 Jan 2022 02:50:41 +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"
---
 colors/BreezeClassic.colors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors
index c66e4a8c..3ef61c09 100644
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@@ -127,6 +127,7 @@ Name[nn]=Breeze klassisk
 Name[pl]=Klasyczna Bryza
 Name[pt]=Brisa Clássica
 Name[pt_BR]=Breeze Classic
+Name[ru]=Breeze, классический вариант
 Name[sk]=Klasický vánok
 Name[sl]=Sapica, klasična
 Name[sv]=Breeze klassisk