Commit 63c8ecde authored by Script Kiddy's avatar Script Kiddy

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"
parent ad795417
Pipeline #29106 skipped
......@@ -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": [
......@@ -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": [
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment