Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts: htdocs/install/pgsql/functions/functions.sql
- Loading branch information
Showing
38 changed files
with
7,365 additions
and
7,334 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 47 additions & 47 deletions
94
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,47 @@ | ||
## | ||
## PHPExcel | ||
## | ||
## Copyright (c) 2006 - 2013 PHPExcel | ||
## | ||
## This library is free software; you can redistribute it and/or | ||
## modify it under the terms of the GNU Lesser General Public | ||
## License as published by the Free Software Foundation; either | ||
## version 2.1 of the License, or (at your option) any later version. | ||
## | ||
## This library is distributed in the hope that it will be useful, | ||
## but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
## Lesser General Public License for more details. | ||
## | ||
## You should have received a copy of the GNU Lesser General Public | ||
## License along with this library; if not, write to the Free Software | ||
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
## | ||
## @category PHPExcel | ||
## @package PHPExcel_Settings | ||
## @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel) | ||
## @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL | ||
## @version ##VERSION##, ##DATE## | ||
## | ||
## | ||
ArgumentSeparator = ; | ||
## | ||
## (For future use) | ||
## | ||
currencySymbol = Kč | ||
## | ||
## Excel Error Codes (For future use) | ||
## | ||
NULL = #NULL! | ||
DIV0 = #DIV/0! | ||
VALUE = #HODNOTA! | ||
REF = #REF! | ||
NAME = #NÁZEV? | ||
NUM = #NUM! | ||
NA = #N/A | ||
## | ||
## PHPExcel | ||
## | ||
## Copyright (c) 2006 - 2013 PHPExcel | ||
## | ||
## This library is free software; you can redistribute it and/or | ||
## modify it under the terms of the GNU Lesser General Public | ||
## License as published by the Free Software Foundation; either | ||
## version 2.1 of the License, or (at your option) any later version. | ||
## | ||
## This library is distributed in the hope that it will be useful, | ||
## but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
## Lesser General Public License for more details. | ||
## | ||
## You should have received a copy of the GNU Lesser General Public | ||
## License along with this library; if not, write to the Free Software | ||
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
## | ||
## @category PHPExcel | ||
## @package PHPExcel_Settings | ||
## @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel) | ||
## @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL | ||
## @version ##VERSION##, ##DATE## | ||
## | ||
## | ||
|
||
|
||
ArgumentSeparator = ; | ||
|
||
|
||
## | ||
## (For future use) | ||
## | ||
currencySymbol = Kč | ||
|
||
|
||
## | ||
## Excel Error Codes (For future use) | ||
## | ||
NULL = #NULL! | ||
DIV0 = #DIV/0! | ||
VALUE = #HODNOTA! | ||
REF = #REF! | ||
NAME = #NÁZEV? | ||
NUM = #NUM! | ||
NA = #N/A |
Oops, something went wrong.