Commit ec53e395 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 76dc7252
......@@ -49,6 +49,7 @@ Comment[pl]=Nasza piękna kula ziemska jako twoja tapeta
Comment[pt]=O nosso bonito globo como papel de parede
Comment[pt_BR]=Nosso lindo globo como seu papel de parede
Comment[sk]=Naša krásna zemeguľa ako tapeta
Comment[sl]=Naš lep globus kot vaša tapeta
Comment[sv]=Vår vackra planet som skrivbordsunderlägg
Comment[uk]=Наша чудова планета на шпалерах вашої стільниці
Comment[x-test]=xxOur beautiful globe as your wallpaperxx
......
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