Commit c68f09ea 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 860321b5
Pipeline #193747 passed with stage
in 1 minute and 37 seconds
......@@ -3,7 +3,7 @@ Name=Plasma Nano Toolbox
Name[ast]=Caxa de ferramientes de Plasma Nano
Name[az]=Plasma Nano alətlər qutusu
Name[ca]=Quadre d'eines del Plasma Nano
Name[ca@valencia]=Quadre d'eines de Plasma Nano
Name[ca@valencia]=Quadro d'eines de Plasma Nano
Name[da]=Værktøjskasse til Plasma Nano
Name[el]=Εργαλειοθήκη Plasma Nano
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