From 9d161448d2fe501972a2d9d8ae633c5a6efad9c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Oct 2017 06:45:52 +0200 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" --- kdecoration/config/breezedecorationconfig.desktop | 1 + kstyle/config/breezestyleconfig.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 3d118977..e07a9797 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -21,6 +21,7 @@ Name[it]=Decorazione delle finestre di Brezza Name[nl]=Breeze vensterdecoratie Name[pl]=Wygląd okien Bryzy Name[pt]=Decoração de Janelas Brisa +Name[ru]=Оформление окон Breeze Name[sr]=Поветарчева декорација прозора Name[sr@ijekavian]=Поветарчева декорација прозора Name[sr@ijekavianlatin]=Povetarčeva dekoracija prozora diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 47c0495c..057de710 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -21,6 +21,7 @@ Name[it]=Stile degli oggetti di Brezza Name[nl]=Breeze widgetstijl Name[pl]=Wygląd interfejsu Bryzy Name[pt]=Estilo Gráfico Brisa +Name[ru]=Стиль интерфейса Breeze Name[sr]=Поветарчев стил виџета̂ Name[sr@ijekavian]=Поветарчев стил виџета̂ Name[sr@ijekavianlatin]=Povetarčev stil vidžetâ̂