Commit f1540a8b 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 e9397a81
Pipeline #62228 skipped
......@@ -9,6 +9,7 @@ Name[es]=Tabla de consulta de colores (LUT)
Name[eu]=Kolorea bilatzeko taula (LUT «Look Up Table»)
Name[fr]=Table de recherche de couleur (LUT « Look Up Table »)
Name[it]=Tabella di ricerca del colore (LUT)
Name[ko]=색상 찾아보기 테이블(LUT)
Name[nl]=Opzoektabel van kleur (LUT)
Name[pl]=Tablica wyszukiwania barw (LUT)
Name[pt]=Tabela de Pesquisa de Cores (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