lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.9' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-31 21:28:14 +01:00
commit c54ebfebb5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian/copyright
View File

@ -159,7 +159,7 @@ Comments:
Those files are not shipped in the binary package as we Those files are not shipped in the binary package as we
configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core". configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
Files: docs/images/* Files: doc/images/*
Copyright: Laurent Destailleur Copyright: Laurent Destailleur
License: CC-BY-SA-3.0 License: CC-BY-SA-3.0
You are free: You are free:
@ -176,7 +176,7 @@ License: CC-BY-SA-3.0
. .
For more information, see http://creativecommons.org/licenses/by-sa/3.0/ For more information, see http://creativecommons.org/licenses/by-sa/3.0/
Files: htdocs/includes/fpdi/* Files: htdocs/includes/fpdfi/*
Copyright: 2004-2011 Setasign - Jan Slabon Copyright: 2004-2011 Setasign - Jan Slabon
License: GPL-2+ License: GPL-2+
This program is free software; you can redistribute it This program is free software; you can redistribute it

1
htdocs/langs/en_US/languages.lang
View File

@ -32,6 +32,7 @@ Language_es_MX=Spanish (Mexico)
Language_es_PY=Spanish (Paraguay) Language_es_PY=Spanish (Paraguay)
Language_es_PE=Spanish (Peru) Language_es_PE=Spanish (Peru)
Language_es_PR=Spanish (Puerto Rico) Language_es_PR=Spanish (Puerto Rico)
Language_es_VE=Spanish (Venezuela)
Language_et_EE=Estonian Language_et_EE=Estonian
Language_eu_ES=Basque Language_eu_ES=Basque
Language_fa_IR=Persian Language_fa_IR=Persian