From ddf256a1bd56350e23ea8f418e5b939d64bffc81 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Nov 2016 04:23:27 +0100 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 1ee25729..6578e18f 100644 --- a/kdecoration/breeze.json +++ b/kdecoration/breeze.json @@ -10,6 +10,7 @@ "Description[es]": "Decoración de ventanas que usa el estilo visual Brisa para el escritorio Plasma", "Description[et]": "Plasma töölaua akende dekoratsioon Breeze'i visuaalse stiiliga", "Description[fi]": "Breeze-tyyliä käyttävä ikkunan kehys Plasma-työpöydälle", + "Description[fr]": "Décorations de fenêtres utilisant le style visuel Brise pour le bureau Plasma", "Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.", "Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma", "Description[ko]": "Plasma 데스크톱의 Breeze 시각 스타일을 사용하는 창 장식", @@ -36,6 +37,7 @@ "Name[ca@valencia]": "Brisa", "Name[ca]": "Brisa", "Name[es]": "Brisa", + "Name[fr]": "Brise", "Name[it]": "Brezza", "Name[pl]": "Bryza", "Name[pt]": "Brisa",