Improve I18N Issues (Based on 2.2.4)#322

alexclassroom wants to merge 2 commits intortCamp:masterrtCamp/nginx-helper:masterfrom

alexclassroom:masteralexclassroom/nginx-helper:masterCopy head branch name to clipboard