From 63c8ecde096d5c47de8b4ab338687898057fc441 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Aug 2020 09:09:00 +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 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/backends/python/pythonbackend.json b/src/backends/python/pythonbackend.json index fd48f31d..4ac3423c 100644 --- a/src/backends/python/pythonbackend.json +++ b/src/backends/python/pythonbackend.json @@ -20,6 +20,7 @@ "Description[sv]": "Bakgrundsprogram för Python vetenskaplig programmeringsmiljö", "Description[uk]": "Модуль наукового програмування мовою Python", "Description[x-test]": "xxBackend for Python Scientific Programmingxx", + "Description[zh_CN]": "Python 科学编程环境的后端", "Icon": "pythonbackend", "Id": "Python", "License": "GPL", @@ -43,6 +44,7 @@ "Name[sv]": "Python", "Name[uk]": "Python", "Name[x-test]": "xxPythonxx", + "Name[zh_CN]": "Python", "ServiceTypes": [ "Cantor/Backend" ], diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json index a1553ed9..65c6c442 100644 --- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json +++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json @@ -14,6 +14,7 @@ "Description[sv]": "En panel för att arbeta med filer inne i Cantor", "Description[uk]": "Панель для роботи з файлами у вікні Cantor", "Description[x-test]": "xxA panel for working with files inside Cantorxx", + "Description[zh_CN]": "用于在 Cantor 内处理文件的面板", "Icon": "", "Id": "FileBrowserPanel", "License": "GPL", @@ -30,6 +31,7 @@ "Name[sv]": "Filbläddrare", "Name[uk]": "Навігація файлами", "Name[x-test]": "xxFile Browserxx", + "Name[zh_CN]": "文件浏览器", "ServiceTypes": [ "Cantor/PanelPlugin" ] -- GitLab