Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2017-08-02 22:31:05 +02:00
commit 92d45a9dc0

View File

@ -8,19 +8,19 @@ FONTFORPDF=freemono
FONTSIZEFORPDF=8
SeparatorDecimal=,
SeparatorThousand=None
FormatDateShort=%d.%м.%Г
FormatDateShortInput=%d.%м.%Г
FormatDateShortJava=ММ/дд/гггг
FormatDateShortJavaInput=ММ/дд/гггг
FormatDateShortJQuery=мм/дд/гг
FormatDateShortJQueryInput=мм/дд/гг
FormatDateShort=%d.%m.%Y
FormatDateShortInput=%d.%m.%Y
FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
FormatHourShortJQuery=ЧЧ:ММ
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d.%m.%Y %H:%M
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourSecShort=%d.%m.%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
DatabaseConnection=Подключение к базе данных