Commit ba17222d authored by Script Kiddy's avatar Script Kiddy

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 0f68d6ef
......@@ -10,7 +10,7 @@ Name[es]=Aplicación KDE Connect
Name[et]=KDE Connecti rakendus
Name[fi]=KDE Connect -sovellus
Name[fr]=Application KDE Connect
Name[gl]=Programa de KDE Connect
Name[gl]=Aplicativo de KDE Connect
Name[hu]=KDE Connect alkalmazás
Name[it]=Applicazione KDE Connect
Name[ko]=KDE Connect 프로그램
......
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