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

This commit is contained in:
Unknwon 2015-08-13 23:21:26 +08:00
commit 0ec7d1539b

View file

@ -298,7 +298,7 @@ ARGS =
[i18n] [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 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 ; Used for datetimepicker
[i18n.datelang] [i18n.datelang]