Commit e2590f2b 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 f717ff8d
Pipeline #57169 skipped
......@@ -3,6 +3,7 @@ Name=Color Lookup Table (LUT)
Name[ca]=Taula de consulta del color (LUT)
Name[ca@valencia]=Taula de consulta del color (LUT)
Name[en_GB]=Colour Lookup Table (LUT)
Name[es]=Tabla de consulta de colores (LUT)
Name[fr]=Table de recherche de couleur (LUT « Look Up Table »)
Name[it]=Tabella di ricerca del colore (LUT)
Name[nl]=Opzoektabel van kleur (LUT)
......
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