Commit 3c9956b4 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 4b1ff759
Pipeline #26155 skipped
......@@ -2,10 +2,22 @@
"KPlugin": {
"Dependencies": [],
"Description": "A panel for working with files inside Cantor",
"Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor",
"Description[nl]": "Een paneel in Cantor voor het werken met bestanden",
"Description[pt]": "Um painel para lidar com ficheiros dentro do Cantor",
"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",
"Icon": "",
"Id": "FileBrowserPanel",
"License": "GPL",
"Name": "File Browser",
"Name[ca]": "Navegador de fitxers",
"Name[nl]": "Bestanden bladeren",
"Name[pt]": "Gestor de Ficheiros",
"Name[sv]": "Filbläddrare",
"Name[uk]": "Навігація файлами",
"Name[x-test]": "xxFile Browserxx",
"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