From 4ecd5c7f2432f641ca6ebd66ccb5cc92549ddbc3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2017 05:15:58 +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 6447445a..273eb08c 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -29,6 +29,7 @@ Name[sr@ijekavian]=Поветарчева декорација прозора Name[sr@ijekavianlatin]=Povetarčeva dekoracija prozora Name[sr@latin]=Povetarčeva dekoracija prozora Name[sv]=Breeze fönsterdekoration +Name[tr]=Breeze Pencere Dekorasyonu Name[uk]=Декорації вікон Breeze Name[x-test]=xxBreeze Window Decorationxx Name[zh_CN]=微风窗口装饰 diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 5a1c67be..62b02a78 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -29,6 +29,7 @@ Name[sr@ijekavian]=Поветарчев стил виџета̂ Name[sr@ijekavianlatin]=Povetarčev stil vidžetâ̂ Name[sr@latin]=Povetarčev stil vidžetâ̂ Name[sv]=Breeze stil för grafiska komponenter +Name[tr]=Breeze Programcık Biçimi Name[uk]=Стиль віджетів Breeze Name[x-test]=xxBreeze Widget Stylexx Name[zh_CN]=微风小部件样式