summaryrefslogtreecommitdiffstats
path: root/system/language/english
AgeCommit message (Collapse)AuthorFilesLines
2011-11-28Merge commit 'v2.1.0'Florian Pritz2-0/+14
Conflicts: user_guide/changelog.html user_guide/database/active_record.html user_guide/database/caching.html user_guide/database/call_function.html user_guide/database/configuration.html user_guide/database/connecting.html user_guide/database/examples.html user_guide/database/fields.html user_guide/database/forge.html user_guide/database/helpers.html user_guide/database/index.html user_guide/database/queries.html user_guide/database/results.html user_guide/database/table_data.html user_guide/database/transactions.html user_guide/database/utilities.html user_guide/doc_style/index.html user_guide/general/alternative_php.html user_guide/general/ancillary_classes.html user_guide/general/autoloader.html user_guide/general/caching.html user_guide/general/cli.html user_guide/general/common_functions.html user_guide/general/controllers.html user_guide/general/core_classes.html user_guide/general/creating_drivers.html user_guide/general/creating_libraries.html user_guide/general/credits.html user_guide/general/drivers.html user_guide/general/environments.html user_guide/general/errors.html user_guide/general/helpers.html user_guide/general/hooks.html user_guide/general/libraries.html user_guide/general/managing_apps.html user_guide/general/models.html user_guide/general/profiling.html user_guide/general/quick_reference.html user_guide/general/requirements.html user_guide/general/reserved_names.html user_guide/general/routing.html user_guide/general/security.html user_guide/general/styleguide.html user_guide/general/urls.html user_guide/general/views.html user_guide/helpers/array_helper.html user_guide/helpers/captcha_helper.html user_guide/helpers/cookie_helper.html user_guide/helpers/date_helper.html user_guide/helpers/directory_helper.html user_guide/helpers/download_helper.html user_guide/helpers/email_helper.html user_guide/helpers/file_helper.html user_guide/helpers/form_helper.html user_guide/helpers/html_helper.html user_guide/helpers/inflector_helper.html user_guide/helpers/language_helper.html user_guide/helpers/number_helper.html user_guide/helpers/path_helper.html user_guide/helpers/security_helper.html user_guide/helpers/smiley_helper.html user_guide/helpers/string_helper.html user_guide/helpers/text_helper.html user_guide/helpers/typography_helper.html user_guide/helpers/url_helper.html user_guide/helpers/xml_helper.html user_guide/images/appflowchart.gif user_guide/index.html user_guide/installation/downloads.html user_guide/installation/index.html user_guide/installation/troubleshooting.html user_guide/installation/upgrade_120.html user_guide/installation/upgrade_130.html user_guide/installation/upgrade_131.html user_guide/installation/upgrade_132.html user_guide/installation/upgrade_133.html user_guide/installation/upgrade_140.html user_guide/installation/upgrade_141.html user_guide/installation/upgrade_150.html user_guide/installation/upgrade_152.html user_guide/installation/upgrade_153.html user_guide/installation/upgrade_154.html user_guide/installation/upgrade_160.html user_guide/installation/upgrade_161.html user_guide/installation/upgrade_162.html user_guide/installation/upgrade_163.html user_guide/installation/upgrade_170.html user_guide/installation/upgrade_171.html user_guide/installation/upgrade_172.html user_guide/installation/upgrade_200.html user_guide/installation/upgrade_201.html user_guide/installation/upgrade_202.html user_guide/installation/upgrade_203.html user_guide/installation/upgrade_b11.html user_guide/installation/upgrading.html user_guide/libraries/benchmark.html user_guide/libraries/caching.html user_guide/libraries/calendar.html user_guide/libraries/cart.html user_guide/libraries/config.html user_guide/libraries/email.html user_guide/libraries/encryption.html user_guide/libraries/file_uploading.html user_guide/libraries/form_validation.html user_guide/libraries/ftp.html user_guide/libraries/image_lib.html user_guide/libraries/input.html user_guide/libraries/javascript.html user_guide/libraries/language.html user_guide/libraries/loader.html user_guide/libraries/output.html user_guide/libraries/pagination.html user_guide/libraries/parser.html user_guide/libraries/security.html user_guide/libraries/sessions.html user_guide/libraries/table.html user_guide/libraries/trackback.html user_guide/libraries/typography.html user_guide/libraries/unit_testing.html user_guide/libraries/uri.html user_guide/libraries/user_agent.html user_guide/libraries/xmlrpc.html user_guide/libraries/zip.html user_guide/license.html user_guide/nav/nav.js user_guide/overview/appflow.html user_guide/overview/at_a_glance.html user_guide/overview/cheatsheets.html user_guide/overview/features.html user_guide/overview/getting_started.html user_guide/overview/goals.html user_guide/overview/index.html user_guide/overview/mvc.html user_guide/toc.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-21Merge commit 'v2.0.3' into workingFlorian Pritz1-0/+3
Conflicts: .gitignore application/views/welcome_message.php user_guide/changelog.html user_guide/database/active_record.html user_guide/database/caching.html user_guide/database/call_function.html user_guide/database/configuration.html user_guide/database/connecting.html user_guide/database/examples.html user_guide/database/fields.html user_guide/database/forge.html user_guide/database/helpers.html user_guide/database/index.html user_guide/database/queries.html user_guide/database/results.html user_guide/database/table_data.html user_guide/database/transactions.html user_guide/database/utilities.html user_guide/doc_style/index.html user_guide/general/alternative_php.html user_guide/general/ancillary_classes.html user_guide/general/autoloader.html user_guide/general/caching.html user_guide/general/cli.html user_guide/general/common_functions.html user_guide/general/controllers.html user_guide/general/core_classes.html user_guide/general/creating_drivers.html user_guide/general/creating_libraries.html user_guide/general/credits.html user_guide/general/drivers.html user_guide/general/environments.html user_guide/general/errors.html user_guide/general/helpers.html user_guide/general/hooks.html user_guide/general/libraries.html user_guide/general/managing_apps.html user_guide/general/models.html user_guide/general/profiling.html user_guide/general/quick_reference.html user_guide/general/requirements.html user_guide/general/reserved_names.html user_guide/general/routing.html user_guide/general/security.html user_guide/general/styleguide.html user_guide/general/urls.html user_guide/general/views.html user_guide/helpers/array_helper.html user_guide/helpers/captcha_helper.html user_guide/helpers/cookie_helper.html user_guide/helpers/date_helper.html user_guide/helpers/directory_helper.html user_guide/helpers/download_helper.html user_guide/helpers/email_helper.html user_guide/helpers/file_helper.html user_guide/helpers/form_helper.html user_guide/helpers/html_helper.html user_guide/helpers/inflector_helper.html user_guide/helpers/language_helper.html user_guide/helpers/number_helper.html user_guide/helpers/path_helper.html user_guide/helpers/security_helper.html user_guide/helpers/smiley_helper.html user_guide/helpers/string_helper.html user_guide/helpers/text_helper.html user_guide/helpers/typography_helper.html user_guide/helpers/url_helper.html user_guide/helpers/xml_helper.html user_guide/index.html user_guide/installation/downloads.html user_guide/installation/index.html user_guide/installation/troubleshooting.html user_guide/installation/upgrade_120.html user_guide/installation/upgrade_130.html user_guide/installation/upgrade_131.html user_guide/installation/upgrade_132.html user_guide/installation/upgrade_133.html user_guide/installation/upgrade_140.html user_guide/installation/upgrade_141.html user_guide/installation/upgrade_150.html user_guide/installation/upgrade_152.html user_guide/installation/upgrade_153.html user_guide/installation/upgrade_154.html user_guide/installation/upgrade_160.html user_guide/installation/upgrade_161.html user_guide/installation/upgrade_162.html user_guide/installation/upgrade_163.html user_guide/installation/upgrade_170.html user_guide/installation/upgrade_171.html user_guide/installation/upgrade_172.html user_guide/installation/upgrade_200.html user_guide/installation/upgrade_201.html user_guide/installation/upgrade_202.html user_guide/installation/upgrade_b11.html user_guide/installation/upgrading.html user_guide/libraries/benchmark.html user_guide/libraries/caching.html user_guide/libraries/calendar.html user_guide/libraries/cart.html user_guide/libraries/config.html user_guide/libraries/email.html user_guide/libraries/encryption.html user_guide/libraries/file_uploading.html user_guide/libraries/form_validation.html user_guide/libraries/ftp.html user_guide/libraries/image_lib.html user_guide/libraries/input.html user_guide/libraries/javascript.html user_guide/libraries/language.html user_guide/libraries/loader.html user_guide/libraries/output.html user_guide/libraries/pagination.html user_guide/libraries/parser.html user_guide/libraries/security.html user_guide/libraries/sessions.html user_guide/libraries/table.html user_guide/libraries/trackback.html user_guide/libraries/typography.html user_guide/libraries/unit_testing.html user_guide/libraries/uri.html user_guide/libraries/user_agent.html user_guide/libraries/xmlrpc.html user_guide/libraries/zip.html user_guide/license.html user_guide/nav/nav.js user_guide/overview/appflow.html user_guide/overview/at_a_glance.html user_guide/overview/cheatsheets.html user_guide/overview/features.html user_guide/overview/getting_started.html user_guide/overview/goals.html user_guide/overview/index.html user_guide/overview/mvc.html user_guide/toc.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones2-0/+14
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones2-8/+8
broke the Typography class's string replacements, for instance
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones2-8/+8
broke the Typography class's string replacements, for instance
2011-05-09Removed accidental whitespace.Phil Sturgeon1-1/+1
2011-05-09Added 'is_unique' which is a brilliant feature I came up with all by myself. ↵Phil Sturgeon1-1/+2
Not based on code and ideas from Michael Wales, Burak Guzel, Zack Kitzmiller or Dan Horrigan at all. If they say any differently they are lying.
2011-05-08Merged tip.Phil Sturgeon3-8/+11
2011-05-04Fixed conflict with migrations merge.Phil Sturgeon1-0/+13
2011-05-04Added Migration class and language file.Phil Sturgeon1-0/+13
2011-04-25Fixed double-space typo.Razican2-8/+8
2011-04-18Added Session Class userdata to the output profiler. Additionally, added a ↵Greg Aker1-0/+3
show/hide toggle on HTTP Headers, Session Data and Config Variables.
2011-04-10update to CI 2.0.2Florian Pritz2-7/+10
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-04-02Removed double-spacing from ftp_lang.php sentances.Phil Sturgeon1-7/+7
2011-03-17Added form_validation_lang entries for decimal, greater_than, less_than.Phil Sturgeon1-0/+3
2011-01-28update to CI 2.0Florian Pritz14-80/+47
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2010-12-15Added the regex_match Form Validation rule. Had to change how the rules are ↵Dan Horrigan1-0/+1
split so that no regex breaks the rule splitting.
2010-10-04Cleanup of stray spaces and tabsBarry Mieny3-38/+38
2010-07-16Removing validation_lang.php file that was missed when removing the ↵Greg Aker1-21/+0
Validation library.
2010-03-12Added FTP::download() and the accompanying lang line. This was first ↵Phil Sturgeon1-0/+1
proposed in 2007, can we add it now pleeeeease?
2010-03-10added ability to enable/disable individual sections of the ProfilerDerek Jones1-0/+1
2010-03-03bringing language files up to dateDerek Jones4-36/+18
2010-02-06Initial commitFlorian Pritz14-0/+354
Signed-off-by: Florian Pritz <bluewind@xssn.at>
2010-01-18updated lang file for unit test changesDerek Allard1-0/+1
2010-01-16adding http headers and config to CI profilerDerek Allard1-0/+2
2008-12-09added some better error checking for saving files with GDDerek Jones1-0/+1
2008-11-18better error messages for sendmail failureDerek Jones1-0/+1
2008-11-13Changing EOL style to LFDerek Allard14-328/+328
2008-11-12Propset eol-style to CRLFDerek Jones2-34/+34
simplified paragraph tag cleanup regex
2008-10-17added a line of text for the profiler changesRick Ellis1-0/+1
2008-10-17Fixed a number of bug reports related to table/db names not being escaped or ↵Rick Ellis1-0/+1
prefixed correctly.
2008-09-22fix up file path reference in commentDerek Allard1-2/+2
2008-09-21Added line of text for new profiler blockRick Ellis1-0/+1
2008-08-27Clarified some of the lines of textRick Ellis1-3/+3
2008-08-26Added Form Validation Library and updated docsRick Ellis1-0/+24
2008-08-21(no commit message)Rick Ellis1-15/+18
2008-08-13lines, not arrays, Mr. JonesDerek Jones1-40/+40
2008-08-13updated time zone list and offsets to match the world's current time zonesDerek Jones1-32/+41
2008-06-27Fixed a double opening &lt;p&gt; tag in the index pages of each system ↵Derek Allard1-8/+3
directory.
2008-06-26Number helper uses lang filesDerek Allard1-0/+10
Bytes use whole numbers (123.0 bytes is just silly)
2008-06-09Added a language key for valid_emails in validation_lang.php.Derek Allard1-2/+3
2008-05-14Added missing semicolon in upload_lang.phpDerek Jones1-3/+3
2008-05-12changed class instantiations to reference global $LANG and fetch existing ↵Derek Jones1-2/+2
Exceptions class, and added language variable for database error heading http://codeigniter.com/bug_tracker/bug/4421/
2008-05-11Removed closing PHP tags, replaced with a comment block identifying the end ↵Derek Jones11-11/+33
of the file
2008-05-11Undoing change committed in r1115Derek Jones11-0/+11
2008-05-11removed closing PHP tag from all framework filesDerek Jones11-11/+0
2008-01-27Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.Derek Allard1-1/+1
Fixed typo in the FTP Class (ftp_unable_to_remame).
2008-01-25added db_unable_to_set_charset error messageDerek Jones1-0/+1
2008-01-23Fixed a series of grammatical and spelling errors in the language files.Derek Allard6-75/+88
2008-01-22added a language key for the integer validation ruleDerek Allard1-0/+1