Commit 5a2e9e04 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 cbec56c2
......@@ -20,7 +20,7 @@ Comment[hu]=PolicyKit hitelesítési párbeszédablak
Comment[ia]=Dialogo de Authentication de PolicyKit
Comment[id]=Dialog kewenangan PolicyKit
Comment[it]=Finestra di autenticazione di PolicyKit
Comment[ko]=PolicyKit 인증 대화상자
Comment[ko]=PolicyKit 인증 대화 상자
Comment[lt]=PolicyKit tapatybės nustatymo dialogas
Comment[nb]=PolicyKit autentiseringsdialog
Comment[nl]=Authenticatiedialoog van PolicyKit
......
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