Commit 2d799261 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 736c714c
Pipeline #75761 skipped
...@@ -3,6 +3,7 @@ Name=Color Lookup Table (LUT) ...@@ -3,6 +3,7 @@ Name=Color Lookup Table (LUT)
Name[az]=Rəng axtarış cədvəli (LUT) Name[az]=Rəng axtarış cədvəli (LUT)
Name[ca]=Taula de consulta del color (LUT) Name[ca]=Taula de consulta del color (LUT)
Name[ca@valencia]=Taula de consulta del color (LUT) Name[ca@valencia]=Taula de consulta del color (LUT)
Name[cs]=Vyhledávací tabulka barev (LUT)
Name[de]=Farb-Nachschlagetabelle (LUT) Name[de]=Farb-Nachschlagetabelle (LUT)
Name[en_GB]=Colour Lookup Table (LUT) Name[en_GB]=Colour Lookup Table (LUT)
Name[es]=Tabla de consulta de colores (LUT) Name[es]=Tabla de consulta de colores (LUT)
......
Supports Markdown
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