summaryrefslogtreecommitdiffstats
path: root/system/language/english/form_validation_lang.php
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2012-04-15 00:53:30 +0200
committerEric Roberts <eric@cryode.com>2012-04-15 00:53:30 +0200
commitb4a294d1f2d93b70059c0c40cf2d32760d3e4bc4 (patch)
treee861b295cb7bc8509c614447fd4033322fff29f5 /system/language/english/form_validation_lang.php
parent8cefb3ff51de4f023753c0146eb16950f48601a9 (diff)
Fix a merge oopsie in the language file.
Diffstat (limited to 'system/language/english/form_validation_lang.php')
-rw-r--r--system/language/english/form_validation_lang.php28
1 files changed, 0 insertions, 28 deletions
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
index 36de4c36f..703f2e7bf 100644
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -25,7 +25,6 @@
* @filesource
*/
-<<<<<<< HEAD
$lang['required'] = 'The {field} field is required.';
$lang['isset'] = 'The {field} field must have a value.';
$lang['valid_email'] = 'The {field} field must contain a valid email address.';
@@ -49,33 +48,6 @@ $lang['is_natural_no_zero'] = 'The {field} field must contain a number greater t
$lang['decimal'] = 'The {field} field must contain a decimal number.';
$lang['less_than'] = 'The {field} field must contain a number less than {param}.';
$lang['greater_than'] = 'The {field} field must contain a number greater than {param}.';
-=======
-$lang['required'] = "The %s field is required.";
-$lang['isset'] = "The %s field must have a value.";
-$lang['valid_email'] = "The %s field must contain a valid email address.";
-$lang['valid_emails'] = "The %s field must contain all valid email addresses.";
-$lang['valid_url'] = "The %s field must contain a valid URL.";
-$lang['valid_ip'] = "The %s field must contain a valid IP.";
-$lang['min_length'] = "The %s field must be at least %s characters in length.";
-$lang['max_length'] = "The %s field cannot exceed %s characters in length.";
-$lang['exact_length'] = "The %s field must be exactly %s characters in length.";
-$lang['alpha'] = "The %s field may only contain alphabetical characters.";
-$lang['alpha_numeric'] = "The %s field may only contain alpha-numeric characters.";
-$lang['alpha_dash'] = "The %s field may only contain alpha-numeric characters, underscores, and dashes.";
-$lang['numeric'] = "The %s field must contain only numbers.";
-$lang['is_numeric'] = "The %s field must contain only numeric characters.";
-$lang['integer'] = "The %s field must contain an integer.";
-$lang['regex_match'] = "The %s field is not in the correct format.";
-$lang['matches'] = "The %s field does not match the %s field.";
-$lang['is_unique'] = "The %s field must contain a unique value.";
-$lang['is_natural'] = "The %s field must contain only positive numbers.";
-$lang['is_natural_no_zero'] = "The %s field must contain a number greater than zero.";
-$lang['decimal'] = "The %s field must contain a decimal number.";
-$lang['less_than'] = "The %s field must contain a number less than %s.";
-$lang['less_than_equal_to'] = "The %s field must contain a number less than or equal to %s.";
-$lang['greater_than'] = "The %s field must contain a number greater than %s.";
-$lang['greater_than_equal_to'] = "The %s field must contain a number greater than or equal to %s.";
->>>>>>> 0f2211711deceb74157d6811116acc0376d3157d
/* End of file form_validation_lang.php */