Commit 132ed29d 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 86a308b3
Pipeline #27368 skipped
......@@ -6,6 +6,7 @@
"Description[ca]": "Un plafó per a treballar amb fitxers dins del 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",
"Description[nl]": "Een paneel in Cantor voor het werken met bestanden",
"Description[pt]": "Um painel para lidar com ficheiros dentro do Cantor",
"Description[pt_BR]": "Um painel para trabalhar com arquivos dentro do Cantor",
......@@ -21,6 +22,7 @@
"Name[ca]": "Navegador de fitxers",
"Name[es]": "Navegador de archivos",
"Name[fr]": "Navigateur de fichiers",
"Name[it]": "Navigatore dei file",
"Name[nl]": "Bestanden bladeren",
"Name[pt]": "Gestor de Ficheiros",
"Name[pt_BR]": "Navegador de arquivos",
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