Commit d08de510 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 3f9d8e8e
...@@ -15,7 +15,7 @@ Name[en_GB]=Accessible ...@@ -15,7 +15,7 @@ Name[en_GB]=Accessible
Name[eo]=Atingebla Name[eo]=Atingebla
Name[es]=Accesible Name[es]=Accesible
Name[et]=Juurdepääsuga Name[et]=Juurdepääsuga
Name[eu]=Irisgarri Name[eu]=Eskuragarri
Name[fi]=Saatavilla Name[fi]=Saatavilla
Name[fr]=Accessible Name[fr]=Accessible
Name[fy]=Tagonklik Name[fy]=Tagonklik
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