Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

conf/app.ini

@@ -298,7 +298,7 @@ ARGS =
 
 [i18n]
 LANGS = en-US,zh-CN,zh-HK,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT
-NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本语,Español,Português,Polski,български,Italiano
+NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português,Polski,български,Italiano
 
 ; Used for datetimepicker
 [i18n.datelang]