Commit 96d35c0d 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 c927d1ab
Pipeline #35821 skipped
......@@ -4,6 +4,7 @@
"Description": "A panel for working with files inside Cantor",
"Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor",
"Description[de]": "Eine Kontrollleiste zur Verwaltung von Dateien in Cantor",
"Description[en_GB]": "A panel for working with files inside Cantor",
"Description[es]": "Un panel para trabajar con archivos dentro de Cantor",
"Description[fr]": "Un panneau pour travailler avec les fichiers à l'intérieur de Cantor",
"Description[it]": "Un pannello per lavorare con i file dentro Cantor",
......@@ -22,6 +23,7 @@
"Name": "File Browser",
"Name[ca]": "Navegador de fitxers",
"Name[de]": "Dateibrowser",
"Name[en_GB]": "File Browser",
"Name[es]": "Navegador de archivos",
"Name[fr]": "Navigateur de fichiers",
"Name[it]": "Navigatore dei file",
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