From d53f4947a461d98f59991c0c550d2d4355cdb050 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 May 2020 09:55:19 +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" --- src/backends/python/pythonbackend.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backends/python/pythonbackend.json b/src/backends/python/pythonbackend.json index 8e2d3e46..8810b3fe 100644 --- a/src/backends/python/pythonbackend.json +++ b/src/backends/python/pythonbackend.json @@ -7,6 +7,7 @@ "Description[en_GB]": "Backend for Python Scientific Programming", "Description[es]": "Motor para programación científica en Python", "Description[et]": "Pythoni teadusliku programmeerimise taustaprogramm", + "Description[fr]": "Moteur pour la programmation scientifique Python", "Description[nl]": "Backend voor wetenschappelijk programmeren in Python", "Description[pt]": "Infra-Estrutura de Programação Científica com Python", "Description[pt_BR]": "Infraestrutura de programação científica Python", @@ -23,6 +24,7 @@ "Name[en_GB]": "Python", "Name[es]": "Python", "Name[et]": "Python", + "Name[fr]": "Python", "Name[nl]": "Python", "Name[pt]": "Python", "Name[pt_BR]": "Python", -- GitLab