Commit 7d87a612 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 c2ec5710
[Desktop Entry]
Name=Horizontal Bars
Name[ast]=Barres horizontales
Name[ca]=Barres horitzontals
Name[cs]=Vodorovné pruhy
Name[en_GB]=Horizontal Bars
......@@ -10,6 +11,7 @@ Name[fi]=Vaakapylväät
Name[fr]=Barres horizontales
Name[it]=Barre orizzontali
Name[ko]=가로 막대
Name[lt]=Horizontalios juostos
Name[nl]=Horizontale balken
Name[pl]=Słupki w poziomie
Name[pt]=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