Commit 74f02648 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 c8997453
...@@ -6,6 +6,7 @@ Name[es]=Barras horizontales ...@@ -6,6 +6,7 @@ Name[es]=Barras horizontales
Name[fi]=Vaakapylväät Name[fi]=Vaakapylväät
Name[fr]=Barres horizontales Name[fr]=Barres horizontales
Name[it]=Barre orizzontali Name[it]=Barre orizzontali
Name[ko]=가로 막대
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
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