Merge pull request #2 from qgis/master

Forked source update request
Merge pull request #3 from qgis/master

Merge pull request #2 from qgis/master for Korean trans
Korean translation updated
Disable return to run field calc til 2.6. Disable button on invalid expression
[TRANSUP] es by Carlos

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Merge pull request #1469 from Qgis-Tr-kr/master

[TRANSUP] Korean
update translation ja
Merge pull request #1470 from qgis-jp/pullreq_2_4

update translation ja
[TRANSUP] forgot to add italian to transifex - sorry

Signed-off-by: Werner Macho <werner.macho@gmail.com>