Commit 956c4c23 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 30a1fbf0
......@@ -223,7 +223,7 @@ Action=Popup
Name=No Qt Sql modules were found
Name[ar]=لم يُعثر على وحدات Qt Sql
Name[ast]=Nun s'alcontraron módulos SQL de Qt
Name[ast]=Nun s'atoparon módulos SQL de Qt
Name[az]=Qt Sql modulu tapılmadı
Name[bs]=Nema Qt Sql modula
Name[ca]=No s'ha trobat cap mòdul Sql a les Qt
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