Commit 6dbd0444 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 80cd2889
...@@ -9,6 +9,7 @@ Name[it]=Barre orizzontali ...@@ -9,6 +9,7 @@ Name[it]=Barre orizzontali
Name[nl]=Horizontale balken Name[nl]=Horizontale balken
Name[pt]=Barras Horizontais Name[pt]=Barras Horizontais
Name[pt_BR]=Barras horizontais Name[pt_BR]=Barras horizontais
Name[sk]=Vodorovné pruhy
Name[sl]=Vodoravni stolpci Name[sl]=Vodoravni stolpci
Name[sv]=Horisontella staplar Name[sv]=Horisontella staplar
Name[uk]=Горизонтальні смуги Name[uk]=Горизонтальні смуги
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