Commit 5ed1ace6 authored by Script Kiddy's avatar Script Kiddy

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 80322962
......@@ -3,6 +3,7 @@ Name=Normalize Filter
Name[ca]=Filtre de normalització
Name[et]=Normaliseerimisfilter
Name[nl]=Normalisatiefilter
Name[pl]=Filtr normalizacji
Name[pt]=Filtro de Normalização
Name[pt_BR]=Filtro de normalização
Name[sv]=Normaliseringsfilter
......@@ -12,6 +13,7 @@ Comment=Normalize the color channels.
Comment[ca]=Normalitza els canals de color.
Comment[et]=Värvikanalite normaliseerimine.
Comment[nl]=De kleurkanalen normaliseren.
Comment[pl]=Normalizuje kanały barw.
Comment[pt]=Normalizar os canais de cores.
Comment[pt_BR]=Normaliza os canais de cores.
Comment[sv]=Normalisera färgkanalerna.
......
......@@ -3,6 +3,7 @@ Name=Tangent Normal Brush
Name[ca]=Pinzell de tangent normal
Name[et]=Puutuja normaali pintsel
Name[nl]=Rakend normaal penseel
Name[pl]=Styczny normalny pędzel
Name[pt]=Pincel da Normal à Tangente
Name[pt_BR]=Pincel da normal à tangente
Name[sv]=Tangensnormalpensel
......
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