Commit 32aefe5b 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 c9eac356
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Horizontal Bars Name=Horizontal Bars
Name[ca]=Barres horitzontals Name[ca]=Barres horitzontals
Name[cs]=Vodorovné pruhy Name[cs]=Vodorovné pruhy
Name[en_GB]=Horizontal Bars
Name[es]=Barras horizontales Name[es]=Barras horizontales
Name[fi]=Vaakapylväät Name[fi]=Vaakapylväät
Name[fr]=Barres horizontales Name[fr]=Barres horizontales
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