From c3cafe43290e312239096344cce4d8b506906bfd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 Oct 2017 04:37:27 +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 273eb08c..c8a1af45 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -24,6 +24,7 @@ Name[pl]=Wygląd okien Bryzy Name[pt]=Decoração de Janelas Brisa Name[pt_BR]=Decorações da janela Breeze Name[ru]=Оформление окон Breeze +Name[sk]=Dekorácie okien 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 62b02a78..64b8754a 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -24,6 +24,7 @@ Name[pl]=Wygląd interfejsu Bryzy Name[pt]=Estilo Gráfico Brisa Name[pt_BR]=Estilo dos widgets Breeze Name[ru]=Стиль интерфейса Breeze +Name[sk]=Štýl prvkov Breeze Name[sr]=Поветарчев стил виџета̂ Name[sr@ijekavian]=Поветарчев стил виџета̂ Name[sr@ijekavianlatin]=Povetarčev stil vidžetâ̂