Merge branch 'stable'

diff --cc main.c
Simple merge

diff --cc po/bg.po
Simple merge

diff --cc po/ca.po
Simple merge

diff --cc po/cs.po
Simple merge

diff --cc po/da.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/el.po
Simple merge

diff --cc po/eo.po
Simple merge

diff --cc po/es.po
Simple merge

diff --cc po/et.po
Simple merge

diff --cc po/eu.po
Simple merge

diff --cc po/fr.po
Simple merge

diff --cc po/ga.po
Simple merge

diff --cc po/gl.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/id.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/ko.po
Simple merge

diff --cc po/lt.po
Simple merge

diff --cc po/nl.po
Simple merge

diff --cc po/pt_BR.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sk.po
Simple merge

diff --cc po/sv.po
Simple merge

diff --cc po/tr.po
Simple merge

diff --cc po/uk.po
Simple merge

diff --cc po/zh_CN.po
Simple merge

diff --cc po/zh_TW.po
Simple merge