From 009f0fdf26da151f633f309334cd45c8dc01ccc9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Aug 2019 05:15:24 +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 c89b5e32..776b0e26 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -2,6 +2,7 @@ "KPlugin": { "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", "Description[ar]": "زخرفة نوافذ تستخدم نمط «نسيم» المرئيّ لسطح مكتب «بلازما»", + "Description[ast]": "La decoración de ventanes pal escritoriu de Plasma qu'usa l'estilu visual Breeze", "Description[ca@valencia]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori de Plasma", "Description[ca]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori del Plasma", "Description[cs]": "Dekorace oken pro pracovní plochu Plasma využívající styl Breeze", @@ -44,6 +45,7 @@ "Id": "org.kde.breeze", "Name": "Breeze", "Name[ar]": "نسيم", + "Name[ast]": "Breeze", "Name[ca@valencia]": "Brisa", "Name[ca]": "Brisa", "Name[cs]": "Breeze",