Merge branch 'master' into develop

2013-01-05 14:05:21 -06:00
parent 912f4e5e72 731cec2475
commit 423be0495b
3 changed files with 7 additions and 6 deletions
--- a/application/language/id/pagination.php
+++ b/application/language/id/pagination.php
@@ -14,6 +14,6 @@ return array(
 	*/

 	'previous' => '&laquo; Sebelumnya',
-	'next'     => 'Selanjutnya &raquo;',
+	'next'     => 'Berikutnya &raquo;',

-);
+);
--- a/application/language/pt/validation.php
+++ b/application/language/pt/validation.php
@@ -18,7 +18,7 @@ return array(
 	|
 	*/

-	"accepted"       => "O :attribute deve ser aceito.",
+	"accepted"       => "O :attribute deve ser aceite.",
 	"active_url"     => "O :attribute não é uma URL válida.",
 	"after"          => "O :attribute deve ser uma data após :date.",
 	"alpha"          => "O :attribute só pode conter letras.",