Commit 66e94e3c 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 4bc6709e
...@@ -3,6 +3,7 @@ Name=Plasma Themes ...@@ -3,6 +3,7 @@ Name=Plasma Themes
Name[az]=Plasma mövzuları Name[az]=Plasma mövzuları
Name[ca]=Temes del Plasma Name[ca]=Temes del Plasma
Name[cs]=Motivy Plasmy Name[cs]=Motivy Plasmy
Name[en_GB]=Plasma Themes
Name[es]=Temas de Plasma Name[es]=Temas de Plasma
Name[fr]=Thèmes Plasma Name[fr]=Thèmes Plasma
Name[ia]=Themas de Plasma Name[ia]=Themas de Plasma
......
Supports Markdown
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