Commit 89af8664 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 53601c72
......@@ -60,7 +60,7 @@ Description[fi]=Pystypilarien pari, joka tukee tasaista pintaa
Description[fr]=Un couple de piliers verticaux soutenant une surface plane
Description[gl]=Un par de piares verticais sostendo a superficie dun piso
Description[hu]=Oszlopokon nyugvó sima felület
Description[id]=Beberapa pilar tegak lurus menyangga permukaan datar
Description[id]=Beberapa pilar menegak lurus menyangga permukaan datar
Description[it]=Una coppia di pilastri verticali che sorreggono un ripiano
Description[kk]=Жалпақ бетті тіреген тік ұстындар
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