Commit efda2dc3 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 ddb0311d
Pipeline #56699 skipped
......@@ -8,6 +8,7 @@ Name[it]=Tabella di ricerca del colore (LUT)
Name[nl]=Opzoektabel van kleur (LUT)
Name[pl]=Tablica wyszukiwania barw (LUT)
Name[pt]=Tabela de Pesquisa de Cores (LUT)
Name[pt_BR]=Tabela de consulta de cores (LUT)
Name[sl]=Barvna iskalna tabela (LUT)
Name[sv]=Färguppslagningstabell (LUT)
Name[uk]=Таблиця пошуку кольорів (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