Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jim-parry
jim-parry committed Jan 13, 2018
2 parents d55fad2 + c9c1ec9 commit 11ecb63
Show file tree
Hide file tree
Showing 531 changed files with 546 additions and 535 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2017 B.C. Institute of Technology
Copyright (c) 2014-2018 B.C. Institute of Technology

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ italian 3.1.5 ster Stefano Mazzega
japanese 3.1.6 ??? N/A
khmer 3.1.5 Chanthoeun Chanthoeun Kim
latvian 3.1.5 DavisMiculis Davis Miculis
lithuanian 3.1.5 dgvirtual Donatas Glodenis
lithuanian 3.1.7 dgvirtual Donatas Glodenis
korean 3.1.6 KwonLatte HyeongJoo Kwon ???
norwegian 3.1.5 yhoiseth Yngve Hoiseth
persian 3.1.5 MSDehghan Mohammad Sadegh
polish 3.1.5 michalsn Michał Śniatała
portuguese 3.1.6 j38600 Júlio Sebastião
portuguese-brazilian 3.1.6 mateusfbi Mateus Brandão
portuguese-brazilian 3.1.7 mateusfbi Mateus Brandão
romanian 3.1.5 CodefishRo Cristian Robert Chiribuc
russian 3.1.5 vadimyer Vadim Yermolin
serbian 3.1.5 novakurosevic Novak Urosevic ???
Expand Down
11 changes: 11 additions & 0 deletions changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@ Release Date: Unreleased
- New Translations

- Updated Translations


Version 3.1.7
=============

Release Date: Jan 13, 2018

- Updated Translations

- lithuanian
- portugese-brazilian

Version 3.1.6
=============
Expand Down
4 changes: 2 additions & 2 deletions core/MY_Lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014 - 2017, British Columbia Institute of Technology
* Copyright (c) 2014-2018, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -30,7 +30,7 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/calendar_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/date_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/db_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/email_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/form_validation_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/ftp_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/imglib_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/migration_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/number_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/pagination_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/profiler_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/unit_test_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/arabic/upload_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/calendar_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/date_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/db_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/email_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/form_validation_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/ftp_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/imglib_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/migration_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/number_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/pagination_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/profiler_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/unit_test_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/armenian/upload_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/calendar_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/date_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/db_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/email_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/form_validation_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/ftp_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/imglib_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/migration_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/number_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/pagination_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
2 changes: 1 addition & 1 deletion language/azerbaijani/profiler_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* System messages translation for CodeIgniter(tm)
*
* @author CodeIgniter community
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
*/
Expand Down
Loading

0 comments on commit 11ecb63

Please sign in to comment.