Merge pull request #1 from anhsaker/patch-1

Merge Patch 1
Laravel-Lang · Feb 28, 2014 · 2962e60 · 2962e60
2 parents 528e054 + 3d6bde9
commit 2962e60
Show file tree

Hide file tree

Showing 78 changed files with 655 additions and 346 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 _site
 /vendor/
+.DS_Store
diff --git a/README.md b/README.md
@@ -16,12 +16,30 @@ You can follow translations in the issue [#73](https://github.com/caouecs/Larave
 Laravel 4.1
 ---
 
+### Password reminder sent
+
 To be ready for the new version of Laravel, we need your help. In `reminders.php` file, a new line has been added :
 
     "sent" => "Password reminder sent!",
 
 You can follow translations in the issue [#137](https://github.com/caouecs/Laravel4-lang/issues/137).
 
+### Required without all
+
+In `validation.php` file, a new line has been added :
+
+    "required_without_all" => "The :attribute field is required when none of :values are present."
+
+You can follow translations in the issue [#172](https://github.com/caouecs/Laravel4-lang/issues/172).
+
+### Validation email
+
+In `validation.php` file, the text for email has beed updated :
+
+    "email" => "The :attribute must be a valid email address."
+
+You can follow translations in the issue [#187](https://github.com/caouecs/Laravel4-lang/issues/187).
+
 How add languages in my app ?
 ---
 
@@ -34,7 +52,7 @@ How add languages in my app ?
 
 ### Installation by Composer
 
- * Add *"caouecs/laravel4-lang": "dev-master"* in your composer.conf in "require" or run *composer require caouecs/laravel4-lang*
+ * Add *"caouecs/laravel4-lang": "dev-master"* in your `composer.json` in "require" or run *composer require caouecs/laravel4-lang*
  * Do "composer update"
  * Files of languages are in "vendor/caouecs/laravel4-lang" directory
  * Copy the folders of languages that you want, in *app/lang* folder of your application Laravel
@@ -51,20 +69,13 @@ How can I add a language in this project ?
 * fork this repository
 * create a directory with the short name of the language (ex: fr for French) from ISO-639-1 ( see [Wikipedia](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) )
 * copy this three files of the english version with your translate
-    * for [Laravel 4.0](https://github.com/laravel/laravel/tree/master/app/lang/en)
-    * for [Laravel 4.1](https://github.com/laravel/laravel/tree/develop/app/lang/en)
-* add a pull request in the branch **_develop_** of this repository, with the name of the language
+    * for [Laravel](https://github.com/laravel/laravel/tree/master/app/lang/en)
+* add a pull request with the name of the language
 
 
 How can I fix a file ?
 ---
 
 * fork this repository
 * update the file
-* add a pull request in the branch **_develop_** of this repository, with the name of the language
-
-Branchs
----
-
-* _master_ : for Laravel 4.0.x
-* _develop_ : for Laravel 4.1.x
+* add a pull request with the name of the language
diff --git a/ar/reminders.php b/ar/reminders.php
@@ -3,20 +3,29 @@
 return array(
 
     /*
-	|--------------------------------------------------------------------------
-	| Password Reminder Language Lines
-	|--------------------------------------------------------------------------
-	|
-	| The following language lines are the default lines which match reasons
-	| that are given by the password broker for a password update attempt
-	| has failed, such as for an invalid token or invalid new password.
-	|
-	*/
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |
+    | عبارات التذكير بكلمة السر
+    |
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    | السطور ادناه هي الافتراضية والتي تتوافق مع احتمالات الخطأ الناتجه من 
+    | المستخدم عند تحديث كلمة السر مثل الخطأ في رمز التاكيد او في كلمة
+    | السر الجديدة.
+    |
+    */
 
-    "password" => "كلمة السر يجب أن تكون 6 محارف وتطابق حقل التأكيد",
+    "password" => "يجب أن لا تقل كلمة السر عن ستة أحرف وتطابق حقل التأكيد",
 
-    "user"     => "لا يمكن العثور على المستخدم المرتبط بهذا البريد الالكتروني",
+    "user"     => "لا نستطيع العثور على المستخدم لهذا البريد الالكتروني",
 
-    "token"    => "كود إعادة تعيين كلمة السر غير صالح.",
+    "token"    => "رمز كلمة السر الذي اخدلته غير صحيح.",
 
-);
+    "sent"     => "تم إرسال تذكير كلمة السر!",
+
+);
diff --git a/ar/validation.php b/ar/validation.php
@@ -2,14 +2,25 @@
 
 return array(
 
-    	/*
-    	|--------------------------------------------------------------------------
+    /*
+    |--------------------------------------------------------------------------
 	| Validation Language Lines
+	|
+	| اسطر التحقق والتصديق للغة العربية
 	|--------------------------------------------------------------------------
 	|
 	| The following language lines contain the default error messages used by
-	| the validator class. Some of these rules have multiple versions such
-	| such as the size rules. Feel free to tweak each of these messages.
+	| the validator class.
+	|
+	| الاسطر ادناه تحتوي علي رسائل الخطأ الافتراضية المستخدمة في فئة التحقق.
+	|
+	| Some of these rules have multiple versions such as the size rules.
+	|
+	| بعض هذه القواعد تحتوي علي عدة نسخ مثل قاعدة الحجم. 
+	| 
+	| Feel free to tweak each of these messages.
+	|
+	| لا تتردد في تعديل اي منها.
 	|
 	*/
 
@@ -20,12 +31,12 @@
     "alpha"            => ":attribute يجب أن يحوي أحرفاً فقط.",
     "alpha_dash"       => ":attribute يجب أن يحوي أحرف وأرقام وإشارة ناقص.",
     "alpha_num"        => ":attribute يجب أن يحوي أحرف وأرقام.",
-    "array"            => "The :attribute must be an array.",
+    "array"            => ":attribute يجب ان تكون مصفوفة.",
     "between"          => array(
         "numeric" => ":attribute يجب أن يكون ؤقمًا بين :min - :max.",
         "file"    => ":attribute يجب أن يكون بين :min - :max كيلو بايت.",
         "string"  => ":attribute يجب أن يكون طوله بين :min - :max من الأحرف.",
-        "array"   => "The :attribute must have between :min - :max items."
+        "array"   => ":attribute يجب ان يحتوي علي :min - :max بنود."
     ),
     "confirmed"        => "تأكيد :attribute لا يتطابق.",
     "date"             => ":attribute ليس تاريخ صحيح.",
@@ -43,14 +54,14 @@
         "numeric" => ":attribute يجب ألا يكون أكبر من :max.",
         "file"    => ":attribute يجب ألا يكون أكبر من :max كيلو بايت.",
         "string"  => ":attribute يجب ألا يكون أكبر من :max محرف.",
-        "array"   => "The :attribute may not have more than :max items."
+        "array"   => ":attribute يجب ان لا يزيد علي :max بنود."
     ),
     "mimes"            => ":attribute يجب أن يكون ملف من نوع: :values.",
     "min"              => array(
         "numeric" => ":attribute يجب أن يكون على الأقل :min.",
         "file"    => ":attribute يجب أن يكون على الأقل :min كيول بايت.",
         "string"  => ":attribute يجب أن يكون طوله على الأقل :min أحرف.",
-        "array"   => "The :attribute must have at least :min items."
+        "array"   => ":attribute يجب ان يحتوي علي الاقل :min بنود."
     ),
     "not_in"           => ":attribute المختار غير صالح.",
     "numeric"          => ":attribute يجب أن يكون رقم.",
@@ -59,24 +70,35 @@
     "required_if"      => ":attribute مطلوب عندما :other يساوي :value.",
     "required_with"    => ":attribute مطلوب عندما يكون :values موجوداً.",
     "required_without" => ":attribute مطلوب عندما لا يكون :values موجوداً.",
+    "required_without_all" => "The :attribute field is required when none of :values are present.",
     "same"             => ":attribute و :other يجب أن يتطابقا.",
     "size"             => array(
         "numeric" => ":attribute يجب أن يكون :size.",
         "file"    => ":attribute يجب أن يكون :size كيلو بايت.",
         "string"  => ":attribute يجب أن يتكون من :size أحرف.",
-        "array"   => "The :attribute must contain :size items."
+        "array"   => ":attribute يجب ان يحتوي على :size بنود."
     ),
     "unique"           => "قيمة :attribute تم استخدامها مسبقاً.",
     "url"              => ":attribute صيغته غير صحيحة.",
 
     /*
 	|--------------------------------------------------------------------------
 	| Custom Validation Language Lines
+	|
+	| اسطر التحقق المخصصه للغة العربية
+	|
 	|--------------------------------------------------------------------------
 	|
 	| Here you may specify custom validation messages for attributes using the
-	| convention "attribute.rule" to name the lines. This makes it quick to
-	| specify a specific custom language line for a given attribute rule.
+	| convention "attribute.rule" to name the lines. 
+	|
+	| من هنا يمكنك تحديد رسائل تحقق مخصصه للسمات باستخدام مجمع "attribute.rule" 
+	| لتسمية السطر.
+	|
+	| his makes it quick to specify a specific custom language line for a given
+	| attribute rule.
+	|
+	| يكون التحديد سريعا عند استخدام سمه معينة للغة المخصصة
 	|
 	*/
 
@@ -85,18 +107,24 @@
 	/*
 	|--------------------------------------------------------------------------
 	| Custom Validation Attributes
+	|
+	| سمات التحقق المخصصه
+	|
 	|--------------------------------------------------------------------------
 	|
 	| The following language lines are used to swap attribute place-holders
 	| with something more reader friendly such as E-Mail Address instead
 	| of "email". This simply helps us make messages a little cleaner.
 	|
+	| الاسطر ادناه تستخدم لتبديل السمات بشكل مقروء اكثر مثل "البريد الالكتروني"
+	| بدلا عن "الايميل". هذه سيساعد في جعل الرسائل اوضح.
+	|
 	*/
 
     'attributes' => array(
         "name" => "الاسم",
         "username" => "اسم المستخدم",
-        "email" => "الإيميل",
+        "email" => "البريد الالكتروني",
         "first_name" => "الاسم الأول",
         "last_name" => "اسم العائلة",
         "password" => "كلمة السر",
@@ -107,7 +135,7 @@
         "mobile" => "الجوال",
         "age" => "العمر",
         "sex" => "الجنس",
-        "gender" => "الجنس",
+        "gender" => "النوع",
         "day" => "اليوم",
         "month" => "الشهر",
         "year" => "السنة",
@@ -117,7 +145,7 @@
         "title" => "العنوان",
         "content" => "المحتوى",
         "description" => "الوصف",
-        "excerpt" => "المختصر",
+        "excerpt" => "الملخص",
         "date" => "التاريخ",
         "time" => "الوقت",
         "available" => "متاح",

diff --git a/bg/reminders.php b/bg/reminders.php
@@ -19,4 +19,6 @@
 
     "token"    => "Този токен за ресет на парола е невалиден.",
 
+    "sent"     => "Изпратено е напомняне за вашата парола!",
+
 );
diff --git a/bg/validation.php b/bg/validation.php
@@ -19,13 +19,13 @@
     "alpha"            => "Полето :attribute трябва да съдържа само букви.",
     "alpha_dash"       => "Полето :attribute трябва да съдържа само букви, цифри, долна черта и тире.",
     "alpha_num"        => "Полето :attribute трябва да съдържа само букви и цифри.",
-    "array"            => "The :attribute must be an array.",
+    "array"            => "Полето :attribute трябва да бъде масив.",
     "before"           => "Полето :attribute трябва да бъде дата преди :date.",
     "between"          => array(
         "numeric" => "Полето :attribute трябва да бъде между :min и :max.",
         "file"    => "Полето :attribute трябва да бъде между :min и :max килобайта.",
         "string"  => "Полето :attribute трябва да бъде между :min и :max знака.",
-        "array"   => "The :attribute must have between :min - :max items."
+        "array"   => "Полето :attribute трябва да има между :min - :max елемента."
     ),
     "confirmed"        => "Полето :attribute не е потвърдено.",
     "date"             => "Полето :attribute не е валидна дата.",
@@ -43,14 +43,14 @@
         "numeric" => "Полето :attribute трябва да бъде по-малко от :max.",
         "file"    => "Полето :attribute трябва да бъде по-малко от :max килобайта.",
         "string"  => "Полето :attribute трябва да бъде по-малко от :max знака.",
-        "array"   => "The :attribute may not have more than :max items."
+        "array"   => "Полето :attribute трябва да има по-малко от :max елемента."
     ),
     "mimes"            => "Полето :attribute трябва да бъде файл от тип: :values.",
     "min"              => array(
         "numeric" => "Полето :attribute трябва да бъде минимум :min.",
         "file"    => "Полето :attribute трябва да бъде минимум :min килобайта.",
         "string"  => "Полето :attribute трябва да бъде минимум :min знака.",
-        "array"   => "The :attribute must have at least :min items."
+        "array"   => "Полето :attribute трябва има минимум :min елемента."
     ),
     "not_in"           => "Избраното поле :attribute е невалидно.",
     "numeric"          => "Полето :attribute трябва да бъде число.",
@@ -59,15 +59,17 @@
     "required_if"      => "Полето :attribute се изисква, когато :other е :value.",
     "required_with"    => "Полето :attribute се изисква, когато :values има стойност.",
     "required_without" => "Полето :attribute се изисква, когато :values няма стойност.",
+    "required_without_all" => "The :attribute field is required when none of :values are present.",
     "same"             => "Полетата :attribute и :other трябва да съвпадат.",
     "size"             => array(
         "numeric" => "Полето :attribute трябва да бъде :size.",
         "file"    => "Полето :attribute трябва да бъде :size килобайта.",
         "string"  => "Полето :attribute трябва да бъде :size знака.",
-        "array"   => "The :attribute must contain :size items."
+        "array"   => "Полето :attribute трябва да има :size елемента."
     ),
     "unique"           => "Полето :attribute вече съществува.",
     "url"              => "Полето :attribute е в невалиден формат.",
+    "recaptcha" => 'Стойността на :attribute е неправилна.',
 
     /*
     |--------------------------------------------------------------------------
@@ -93,6 +95,38 @@
     |
     */
 
-    'attributes' => array(),
+    'attributes' => array(
+            "name" => "Име",
+            "username" => "Потребител",
+            "email" => "E-mail",
+            "first_name" => "Име",
+            "last_name" => "Фамилия",
+            "password" => "Парола",
+            "city" => "Град",
+            "country" => "Държава",
+            "address" => "Адрес",
+            "phone" => "Телефон",
+            "mobile" => "GSM",
+            "age" => "Възраст",
+            "sex" => "Пол",
+            "gender" => "Пол",
+            "day" => "Ден",
+            "month" => "Месец",
+            "year" => "Година",
+            "hour" => "Час",
+            "minute" => "Минута",
+            "second" => "Секунда",
+            "title" => "Заглавие",
+            "content" => "Съдържание",
+            "description" => "Описание",
+            "excerpt" => "Откъс",
+            "date" => "Дата",
+            "time" => "Време",
+            "available" => "Достъпен",
+            "size" => "Размер",
+            "recaptcha_response_field" => "Рекапча",
+            "subject" => "Заглавие",
+            "message" => "Съобщение"
+    ),
 
-);
+);
diff --git a/bs/reminders.php b/bs/reminders.php
@@ -18,4 +18,6 @@
 
     "token" => "Ovaj token za resetovanje lozinke nije ispravan.",
 
+    "sent"     => "Password reminder sent!",
+
 );
diff --git a/bs/validation.php b/bs/validation.php
@@ -57,6 +57,7 @@
     "required_if" => "Polje :attribute je obavezno kada :other je :value.",
     "required_with" => "Polje :attribute je obavezno kada je :values prikazana.",
     "required_without" => "Polje :attribute je obavezno kada :values nije prikazano.",
+    "required_without_all" => "The :attribute field is required when none of :values are present.",
     "same" => "Polja :attribute i :other se moraju poklapati.",
     "size" => array(
         "numeric" => "Polje :attribute mora biti :size.",

diff --git a/ca/reminders.php b/ca/reminders.php
@@ -19,4 +19,6 @@
 
     "token"    => "Aquest token de recuperació de contrasenya és invàlid.",
 
+    "sent"     => "Recordatori de contrasenya enviat!",
+
 );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,6 @@

		"token" => "Този токен за ресет на парола е невалиден.",

		"sent" => "Изпратено е напомняне за вашата парола!",

		);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,6 @@

		"token" => "Ovaj token za resetovanje lozinke nije ispravan.",

		"sent" => "Password reminder sent!",

		);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,6 @@

		"token" => "Aquest token de recuperació de contrasenya és invàlid.",

		"sent" => "Recordatori de contrasenya enviat!",

		);