Commit 72cdc794 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 c85809b3
......@@ -183,6 +183,7 @@ Keywords[ko]=partition;disk;파티션;디스크;
Keywords[lt]=skaidinys;diskas;
Keywords[nl]=partitie;schijf;
Keywords[nn]=partisjon;disk;
Keywords[pa]=ਪਾਰਟੀਸ਼ਨ;ਡਿਸਕ;
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;
Keywords[pt_BR]=partição;disco;
......
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