From 076843b51d99a45168db787a95c66f22d7984bfe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Sep 2020 10:00:17 +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 ++ src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json | 1 + 2 files changed, 3 insertions(+) diff --git a/src/backends/python/pythonbackend.json b/src/backends/python/pythonbackend.json index 4ac3423c..c814758c 100644 --- a/src/backends/python/pythonbackend.json +++ b/src/backends/python/pythonbackend.json @@ -4,6 +4,7 @@ "Description": "Backend for Python Scientific Programming", "Description[ca@valencia]": "Dorsal per a la programació científica en Python", "Description[ca]": "Dorsal per a la programació científica en Python", + "Description[de]": "Modul für die wissenschaftliche Programmierumgebung Python ", "Description[el]": "Σύστημα υποστήριξης για το Python Scientific Programming", "Description[en_GB]": "Backend for Python Scientific Programming", "Description[es]": "Motor para programación científica en Python", @@ -28,6 +29,7 @@ "Name[ca@valencia]": "Python", "Name[ca]": "Python", "Name[cs]": "Python", + "Name[de]": "Python", "Name[el]": "Python", "Name[en_GB]": "Python", "Name[es]": "Python", diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json index 65c6c442..fcc94d7f 100644 --- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json +++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json @@ -20,6 +20,7 @@ "License": "GPL", "Name": "File Browser", "Name[ca]": "Navegador de fitxers", + "Name[de]": "Dateibrowser", "Name[es]": "Navegador de archivos", "Name[fr]": "Navigateur de fichiers", "Name[it]": "Navigatore dei file", -- GitLab