Merge commit 'origin/master' into qt-client

.gitignore

lang/da/da.po

lang/de/de.po

lang/es/es.po

lang/fr/fr.po

lang/it/it.po

lang/ja.po

lang/ko/ko.po

lang/merge-po-with-template.sh

lang/pl/pl.po

lang/pt/pt.po

lang/pt_BR/pt_BR.po

lang/ru/ru.po

lang/sflphone.pot

lang/update-template.sh

lang/update.sh

lang/zh_CN/zh_CN.po

lang/zh_HK/zh_HK.po

lang/zh_TW/zh_TW.po

sflphone-client-gnome/Makefile.am