Commit a558641b 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 7297efe2
......@@ -182,6 +182,7 @@ Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;
Keywords[pt_BR]=partição;disco;
Keywords[ru]=раздел;диск;
Keywords[sk]=partícia;disk;
Keywords[sl]=razdelek;particija;disk;
Keywords[sr]=partition;disk;партиција;диск;
Keywords[sr@ijekavian]=partition;disk;партиција;диск;
......
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