Commit c927d1ab 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 076843b5
Pipeline #34358 skipped
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"Dependencies": [], "Dependencies": [],
"Description": "A panel for working with files inside Cantor", "Description": "A panel for working with files inside Cantor",
"Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor", "Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor",
"Description[de]": "Eine Kontrollleiste zur Verwaltung von Dateien in Cantor",
"Description[es]": "Un panel para trabajar con archivos dentro de 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[fr]": "Un panneau pour travailler avec les fichiers à l'intérieur de Cantor",
"Description[it]": "Un pannello per lavorare con i file dentro Cantor", "Description[it]": "Un pannello per lavorare con i file dentro Cantor",
......
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