Commit 70bdc462 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 5e62ea45
Pipeline #66510 skipped
......@@ -2,6 +2,7 @@
Name=GermanIbanBicDatabase
Name[ca]=Basededades_alemanya_IbanBic
Name[ca@valencia]=Basededades_alemanya_IbanBic
Name[cs]=GermanIbanBicDatabase
Name[en_GB]=GermanIbanBicDatabase
Name[es]=GermanIbanBicDatabase
Name[fi]=GermanIbanBicDatabase
......
......@@ -2,6 +2,7 @@
Name=Target2Participants
Name[ca]=Objectiu2Participants
Name[ca@valencia]=Objectiu2Participants
Name[cs]=Target2Participants
Name[en_GB]=Target2Participants
Name[es]=Target2Participants
Name[fi]=Target2Participants
......
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