fixing merge issues for comment tweaks

application/language/nl/pagination.php

@@ -16,4 +16,4 @@ return array(
 	'previous' => '« Vorige',
 	'next'     => 'Volgende »',
 
-);
+);

application/language/nl/validation.php

@@ -4,63 +4,54 @@ return array(
 
 	/*
 	|--------------------------------------------------------------------------
-	| Validation Language Lines
+	| Dutch validation language file
 	|--------------------------------------------------------------------------
 	|
-	| The following language lines contain the default error messages used
-	| by the validator class. Some of the rules contain multiple versions,
-	| such as the size (max, min, between) rules. These versions are used
-	| for different input types such as strings and files.
-	|
-	| These language lines may be easily changed to provide custom error
-	| messages in your application. Error messages for custom validation
-	| rules may also be added to this file.
-	|
 	*/
 
-	"accepted"       => "De :attribute moet worden geaccepteerd.",
-	"active_url"     => "De :attribute is geen geldige URL.",
-	"after"          => "De :attribute moet een datum zijn na :date.",
-	"alpha"          => "De :attribute mag alleen letters bevatten.",
-	"alpha_dash"     => "De :attribute mag alleen letters, nummers, en strepen bevatten.",
-	"alpha_num"      => "De :attribute mag alleen letters en nummers bevatten",
-	"before"         => "De :attribute moet een datim zijn voor :date.",
+	"accepted"       => "Het :attribute moet geaccepteerd zijn.",
+	"active_url"     => "Het :attribute is geen geldig URL.",
+	"after"          => "Het :attribute moet een datum na :date zijn.",
+	"alpha"          => "Het :attribute mag alleen letters bevatten.",
+	"alpha_dash"     => "Het :attribute mag alleen letters, nummers, onderstreep(_) en strepen(-) bevatten.",
+	"alpha_num"      => "Het :attribute mag alleen letters en nummers",
+	"before"         => "Het :attribute moet een datum voor :date zijn.",
 	"between"        => array(
-		"numeric" => "De :attribute moet tussen :min - :max zijn.",
-		"file"    => "De :attribute moet tussen :min - :max kilobytes zijn.",
-		"string"  => "De :attribute moet tussen :min - :max karakters zijn.",
+		"numeric" => "Het :attribute moet tussen :min en :max zijn.",
+		"file"    => "Het :attribute moet tussen :min en :max kilobytes zijn.",
+		"string"  => "Het :attribute moet tussen :min en :max tekens zijn.",
 	),
-	"confirmed"      => "De :attribute bevestiging komt niet overeen.",
-	"different"      => "De :attribute en :other moeten verschillen van elkaar.",
-	"email"          => "De :attribute is ongeldig.",
-	"exists"         => "De geselecteerde :attribute is ongeldig.",
-	"image"          => "De :attribute moet een plaatje zijn.",
-	"in"             => "De geselecteerde :attribute is ongeldig.",
-	"integer"        => "De :attribute moet een heel getal zijn.",
-	"ip"             => "De :attribute moet een geldig IP-adres zijn.",
-	"match"          => "De :attribute formaat is ongeldig.",
+	"confirmed"      => "Het :attribute bevestiging komt niet overeen.",
+	"different"      => "Het :attribute en :other moeten verschillend zijn.",
+	"email"          => "Het :attribute formaat is ongeldig.",
+	"exists"         => "Het gekozen :attribute is al ingebruik.",
+	"image"          => "Het :attribute moet een afbeelding zijn.",
+	"in"             => "Het gekozen :attribute is ongeldig.",
+	"integer"        => "Het :attribute moet een getal zijn.",
+	"ip"             => "Het :attribute moet een geldig IP adres bevatten.",
+	"match"          => "Het :attribute formaat is ongeldig.",
 	"max"            => array(
-		"numeric" => "De :attribute moet minder zijn als :max.",
-		"file"    => "De :attribute moet kleiner zijn als :max kilobytes.",
-		"string"  => "De :attribute moet korter zijn dan :max karakters.",
+		"numeric" => "Het :attribute moet minder dan :max zijn.",
+		"file"    => "Het :attribute moet minder dan :max kilobytes zijn.",
+		"string"  => "Het :attribute moet minder dan :max tekens zijn.",
 	),
-	"mimes"          => "De :attribute moet een van de volgende bestandsformaten :values bevatten",
+	"mimes"          => "Het :attribute moet een bestand zijn van het bestandstype :values.",
 	"min"            => array(
-		"numeric" => "De :attribute moet meer zijn als :min.",
-		"file"    => "De :attribute moet groter zijn als :min kilobytes.",
-		"string"  => "De :attribute moet langer zijn dan :min karakters.",
+		"numeric" => "Het :attribute moet minimaal :min zijn.",
+		"file"    => "Het :attribute moet minimaal :min kilobytes zijn.",
+		"string"  => "Het :attribute moet minimaal :min characters zijn.",
 	),
-	"not_in"         => "De geselecteerde :attribute is ongeldig.",
-	"numeric"        => "De :attribute moet een nummer zijn.",
-	"required"       => "De :attribute veld is vereist.",
-	"same"           => "De :attribute en :other moeten overeen komen.",
+	"not_in"         => "Het :attribute formaat is ongeldig.",
+	"numeric"        => "Het :attribute moet een nummer zijn.",
+	"required"       => "Het :attribute veld is verplicht.",
+	"same"           => "Het :attribute en :other moeten overeenkomen.",
 	"size"           => array(
-		"numeric" => "De :attribute moet :size groot zijn.",
-		"file"    => "De :attribute moet :size kilobytes groot zijn.",
-		"string"  => "De :attribute moet :size karakters bevatten.",
+		"numeric" => "Het :attribute moet :size zijn.",
+		"file"    => "Het :attribute moet :size kilobyte zijn.",
+		"string"  => "Het :attribute moet :size characters zijn.",
 	),
-	"unique"         => "De :attribute bestaat al.",
-	"url"            => "De :attribute formaat is ongeldig.",
+	"unique"         => "Het :attribute is al in gebruik.",
+	"url"            => "Het :attribute formaat is ongeldig.",
 
 	/*
 	|--------------------------------------------------------------------------
@@ -96,4 +87,4 @@ return array(
 
 	'attributes' => array(),
 
-);
+);

laravel/cli/command.php

@@ -100,7 +100,7 @@ class Command {
 	 *		// Resolve an instance of a task
 	 *		$task = Command::resolve('application', 'migrate');
 	 *
-	 *		// Resolve an instance of a task wtihin a bundle
+	 *		// Resolve an instance of a task within a bundle
 	 *		$task = Command::resolve('bundle', 'foo');
 	 * </code>
 	 *

laravel/cookie.php

@@ -77,7 +77,7 @@ class Cookie {
 
 		// If the secure option is set to true, yet the request is not over HTTPS
 		// we'll throw an exception to let the developer know that they are
-		// attempting to send a secure cookie over the unsecured HTTP.
+		// attempting to send a secure cookie over the insecure HTTP.
 		if ($secure and ! Request::secure())
 		{
 			throw new \Exception("Attempting to set secure cookie over HTTP.");
@@ -120,4 +120,4 @@ class Cookie {
 		return static::put($name, null, -2000, $path, $domain, $secure);
 	}
 
-}
+}

laravel/database/query.php

@@ -167,7 +167,7 @@ class Query {
 		}
 
 		// If the column is just a string, we can assume that the join just
-		// has a simple "ON" clause, and we'll create the join instance and
+		// has a simple on clause, and we'll create the join instance and
 		// add the clause automatically for the developer.
 		else
 		{

laravel/documentation/bundles.md

@@ -21,7 +21,7 @@ Bundles are the heart of the improvements that were made in Laravel 3.0. They ar
 <a name="creating-and-registering"></a>
 ## Creating Bundles
 
-The first step in creating a bundle is to create a folder for the bundle within your **bundles** directory. For this example, let's create an "admin" bundle, which could house the administrator back-end to our application. The **application/start.php** file provides some basic configuration that helps to define how our application will run. Likewise we'll create a **start.php** file within our new bundle folder for the same purpose. It is run everytime the bundle is loaded. Let's create it:
+The first step in creating a bundle is to create a folder for the bundle within your **bundles** directory. For this example, let's create an "admin" bundle, which could house the administrator back-end to our application. The **application/start.php** file provides some basic configuration that helps to define how our application will run. Likewise we'll create a **start.php** file within our new bundle folder for the same purpose. It is run every time the bundle is loaded. Let's create it:
 
 #### Creating a bundle start.php file:
 

laravel/documentation/database/eloquent.md

@@ -224,7 +224,7 @@ Want to join on a different foreign key? No problem. Just pass it in the second
 
 	return $this->has_many('Comment', 'my_foreign_key');
 
-You may be wondering: _If the dynamic properties return the relationship and require less keystokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
+You may be wondering: _If the dynamic properties return the relationship and require less keystrokes, why would I ever use the relationship methods?_ Actually, relationship methods are very powerful. They allow you to continue to chain query methods before retrieving the relationship. Check this out:
 
 	echo Post::find(1)->comments()->order_by('votes', 'desc')->take(10)->get();
 

laravel/documentation/database/fluent.md

@@ -169,7 +169,7 @@ You may also specify multiple conditions for an **ON** clause by passing a Closu
 			$join->on('users.id', '=', 'phone.user_id');
 			$join->or_on('users.id', '=', 'phone.contact_id');
 		})
-		->get(array('users.email', 'phone.numer'));
+		->get(array('users.email', 'phone.number'));
 
 <a name="ordering"></a>
 ## Ordering Results

laravel/documentation/database/schema.md

@@ -13,7 +13,7 @@
 <a name="the-basics"></a>
 ## The Basics
 
-The Schema Bulder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
+The Schema Builder provides methods for creating and modifying your database tables. Using a fluent syntax, you can work with your tables without using any vendor specific SQL.
 
 *Further Reading:*
 

laravel/documentation/ioc.md

@@ -24,7 +24,7 @@ IoC containers help make your application more flexible and testable. Since you
 	});
 
 
-Great! Now we have registered a resolver for SwiftMailer in our container. But, what if we don't want the container to create a new mailer instance every time we need one? Maybe we just want the container to return the same instance after the intial instance is created. Just tell the container the object should be a singleton:
+Great! Now we have registered a resolver for SwiftMailer in our container. But, what if we don't want the container to create a new mailer instance every time we need one? Maybe we just want the container to return the same instance after the initial instance is created. Just tell the container the object should be a singleton:
 
 #### Registering a singleton in the container:
 

laravel/documentation/localization.md

@@ -55,7 +55,7 @@ Need to retrieve the line in a language other than your default? Not a problem.
 <a name="replace"></a>
 ## Place Holders & Replacements
 
-Now, let's work on our welcome message. "Welcome to our website!" is a pretty generic message. It would be helpful to be able to specify the name of the person we are welcoming. But, creating a language line for each user of our application would be time-consuming and ridiculous. Thankfully, you don't have to. You can specify "place-holders" within your language lines. Place-holders are preceeded by a colon:
+Now, let's work on our welcome message. "Welcome to our website!" is a pretty generic message. It would be helpful to be able to specify the name of the person we are welcoming. But, creating a language line for each user of our application would be time-consuming and ridiculous. Thankfully, you don't have to. You can specify "place-holders" within your language lines. Place-holders are preceded by a colon:
 
 #### Creating a language line with place-holders:
 

laravel/documentation/logging.md

@@ -24,7 +24,7 @@ The **detail** option indicates if the framework should display the error messag
 
 To enable logging, set the **log** option in the error configuration to "true". When enabled, the Closure defined by the **logger** configuration item will be executed when an error occurs. This gives you total flexibility in how the error should be logged. You can even e-mail the errors to your development team!
 
-By default, logs are stored in the **storage/logs** direcetory, and a new log file is created for each day. This keeps your log files from getting crowded with too many messages.
+By default, logs are stored in the **storage/logs** directory, and a new log file is created for each day. This keeps your log files from getting crowded with too many messages.
 
 <a name="the-logger-class"></a>
 ## The Logger Class

laravel/documentation/requests.md

@@ -62,7 +62,7 @@ Sometimes you may need to determine if the current URI is a given string, or beg
 		// This request is over HTTPS!
 	}
 
-#### Determing if the current request is an AJAX request:
+#### Determining if the current request is an AJAX request:
 
 	if (Request::ajax())
 	{

laravel/documentation/routing.md

@@ -99,14 +99,14 @@ If a request enters your application but does not match any existing route, the
 
 You are free to change this to fit the needs of your application!
 
-*Futher Reading:*
+*Further Reading:*
 
 - *[Events](/docs/events)*
 
 <a name="filters"></a>
 ## Filters
 
-Route filters may be run before or after a route is executed. If a "before" filter returns a value, that value is considered the response to the request and the route is not executed, which is conveniont when implementing authentication filters, etc. Filters are typically defined in **application/routes.php**.
+Route filters may be run before or after a route is executed. If a "before" filter returns a value, that value is considered the response to the request and the route is not executed, which is convenient when implementing authentication filters, etc. Filters are typically defined in **application/routes.php**.
 
 #### Registering a filter:
 

laravel/documentation/validation.md

@@ -366,7 +366,7 @@ In the example above, the custom required message will be used for the email att
 
 However, if you are using many custom error messages, specifying inline may become cumbersome and messy. For that reason, you can specify your custom messages in the **custom** array within the validation language file:
 
-#### Adding custom error messages to the validation langauge file:
+#### Adding custom error messages to the validation language file:
 
 	'custom' => array(
 		'email_required' => 'We need to know your e-mail address!',

laravel/documentation/views/html.md

@@ -15,7 +15,7 @@
 <a name="entities"></a>
 ## Entities
 
-When displaying user input in your Views, it is important to convert all characters which have signifance in HTML to their "entity" representation.
+When displaying user input in your Views, it is important to convert all characters which have significance in HTML to their "entity" representation.
 
 For example, the < symbol should be converted to its entity representation. Converting HTML characters to their entity representation helps protect your application from cross-site scripting:
 

laravel/documentation/views/templating.md

@@ -10,7 +10,7 @@
 <a name="the-basics"></a>
 ## The Basics
 
-Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your develompent much more enjoyable. Here's how to get started:
+Your application probably uses a common layout across most of its pages. Manually creating this layout within every controller action can be a pain. Specifying a controller layout will make your development much more enjoyable. Here's how to get started:
 
 #### Specify a "layout" property on your controller:
 

laravel/error.php

@@ -60,7 +60,7 @@ class Error {
 	{
 		if (error_reporting() === 0) return;
 
-		// For a PHP error, we'll create an ErrorExcepetion and then feed that
+		// For a PHP error, we'll create an ErrorException and then feed that
 		// exception to the exception method, which will create a simple view
 		// of the exception details for the developer.
 		$exception = new \ErrorException($error, $code, 0, $file, $line);

laravel/html.php

@@ -9,13 +9,13 @@ class HTML {
 	 */
 	public static $macros = array();
 
-    /**
-     * Registers a custom macro.
-     *
-     * @param  string   $name
-     * @param  Closure  $input
-     * @return void
-     */
+	/**
+	 * Registers a custom macro.
+	 *
+	 * @param  string   $name
+	 * @param  Closure  $input
+	 * @return void
+	 */
 	public static function macro($name, $macro)
 	{
 		static::$macros[$name] = $macro;

laravel/ioc.php

@@ -179,7 +179,7 @@ class IoC {
 	/**
 	 * Resolve all of the dependencies from the ReflectionParameters.
 	 *
-	 * @param  array  $parameterrs
+	 * @param  array  $parameters
 	 * @return array
 	 */
 	protected static function dependencies($parameters)

laravel/response.php

@@ -106,7 +106,7 @@ class Response {
 	 *		return Response::eloquent($data, 200, array('header' => 'value'));
 	 * </code>
 	 *
-	 * @param  Eloquenet|array  $data
+	 * @param  Eloquent|array   $data
 	 * @param  int              $status
 	 * @param  array            $headers
 	 * @return Response