Commit d33ea41c 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 8046f8bb
......@@ -26,6 +26,7 @@ Keywords[nn]=backup;reservekopi;tryggleikskopi;arkivering;
Keywords[pl]=kopia zapasowa;archiwizowanie;
Keywords[pt]=cópia de segurança;arquivo;
Keywords[pt_BR]=backup;arquivamento;cópia de segurança;
Keywords[ru]=backup;archiving;резервная копия;архивирование;резервирование
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