Commit f9f632a5 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 bf3f6a09
Pipeline #26448 skipped
......@@ -3,6 +3,7 @@
"Dependencies": [],
"Description": "A panel for working with files inside Cantor",
"Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor",
"Description[fr]": "Un panneau pour travailler avec les fichiers à l'intérieur de 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",
......@@ -13,6 +14,7 @@
"License": "GPL",
"Name": "File Browser",
"Name[ca]": "Navegador de fitxers",
"Name[fr]": "Navigateur de fichiers",
"Name[nl]": "Bestanden bladeren",
"Name[pt]": "Gestor de Ficheiros",
"Name[sv]": "Filbläddrare",
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