Commit e5d2205b 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 27026402
......@@ -16,7 +16,7 @@ Name[gl]=Lixo
Name[he]=אשפה
Name[hu]=Kuka
Name[ia]=Corbe
Name[id]=Sesampahan
Name[id]=Tempat Sampah
Name[is]=Rusl
Name[it]=Cestino
Name[ja]=ごみ箱
......
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