From 2e9dc7f28aca94e45ce0efb89d8c5edb0066bd94 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 24 Oct 2016 12:07:39 +0000 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" --- plugins/platforms/x11/standalone/x11.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index 0d3c8f9b44..61bddb023d 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -8,6 +8,7 @@ "Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.", "Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s", "Description[fi]": "Alustaliitännäinen itsenäiselle x11:lle kwin_x11:ssä.", + "Description[fr]": "Module de plate-forme pour x11 autonomes, au sein de kwin_x11", "Description[gl]": "Complemento de plataforma para x11 independente en kwin_x11.", "Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_x11.", "Description[ko]": "kwin_x11의 단독 X11 플러그인입니다.",