From e912450c67e59163c4986beb286aaaffd2752234 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 25 Apr 2017 10:04:12 +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/breeze.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kdecoration/breeze.json b/kdecoration/breeze.json index 0ef7dfc8..a0af20b2 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -29,6 +29,7 @@ "Description[sr@latin]": "Dekoracija prozora sa Povetarcem kao vizuelnim stilom za plasma površ.", "Description[sr]": "Декорација прозора са Поветарцем као визуелним стилом за плазма површ.", "Description[sv]": "Fönsterdekoration med den visuella stilen Breeze för Plasma skrivbord", + "Description[tr]": "Breeze görsel biçemini Plasma Masaüstü için kullanan pencere dekorasyonu", "Description[uk]": "Обрамлення вікон з використанням візуального стилю Breeze для стільничного середовища Плазми", "Description[x-test]": "xxWindow decoration using the Breeze visual style for the Plasma Desktopxx", "Description[zh_CN]": "窗口装饰使用等离子桌面微风视觉主题", @@ -50,6 +51,7 @@ "Name[sr@ijekavianlatin]": "Povetarac", "Name[sr@latin]": "Povetarac", "Name[sr]": "Поветарац", + "Name[tr]": "Esinti", "Name[x-test]": "xxBreezexx", "Name[zh_CN]": "微风", "ServiceTypes": [