Merge and clean

app_languages.php

@@ -1,56 +1,56 @@
-<?php
-
-	//SQL Query
-
-		$text['title-sql_query']['en-us'] = "SQL Query";
-		$text['title-sql_query']['fr-fr'] = "Requête SQL";
-		$text['title-databases']['en-us'] = "Databases";
-		$text['title-databases']['fr-fr'] = "Bases de données";
-
-		$text['header-sql_query']['en-us'] = "SQL Query";
-		$text['header-sql_query']['fr-fr'] = "Requêtes SQL";
-		$text['header-databases']['en-us'] = "Databases";
-		$text['header-databases']['fr-fr'] = "Bases de données";
-
-		$text['description-databases']['en-us'] = "Select the database to use with SQL Query.";
-		$text['description-databases']['fr-fr'] = "Choisir la base de données utilisée par la requête SQL.";
-
-		$text['label-sql_query']['en-us'] = "SQL Query";
-		$text['label-sql_query']['fr-fr'] = "Requête SQL";
-		$text['label-table']['en-us'] = "Table";
-		$text['label-table']['fr-fr'] = "Table";
-		$text['label-result_type']['en-us'] = "Result";
-		$text['label-result_type']['fr-fr'] = "Résultat";
-		$text['label-results']['en-us'] = "Results";
-		$text['label-results']['fr-fr'] = "Résultats";
-		$text['label-error']['en-us'] = "Error";
-		$text['label-error']['fr-fr'] = "Erreur";
-		$text['label-type']['en-us'] = "Type";
-		$text['label-type']['fr-fr'] = "Type";
-		$text['label-host']['en-us'] = "Host";
-		$text['label-host']['fr-fr'] = "Hôte";
-		$text['label-name']['en-us'] = "Name";
-		$text['label-name']['fr-fr'] = "Nom";
-		$text['label-description']['en-us'] = "Description";
-		$text['label-description']['fr-fr'] = "Description";
-
-		$text['option-result_type_view']['en-us'] = "View";
-		$text['option-result_type_view']['fr-fr'] = "Voir";
-		$text['option-result_type_csv']['en-us'] = "CSV Download";
-		$text['option-result_type_csv']['fr-fr'] = "Télécharger le CSV";
-		$text['option-result_type_insert']['en-us'] = "SQL Inserts";
-		$text['option-result_type_insert']['fr-fr'] = "Insertion SQL";
-
-		$text['button-edit']['en-us'] = "Edit";
-		$text['button-edit']['fr-fr'] = "Editer";
-		$text['button-backup']['en-us'] = "Backup";
-		$text['button-backup']['fr-fr'] = "Sauvegarder";
-		$text['button-select_database']['en-us'] = "Select Database";
-		$text['button-select_database']['fr-fr'] = "Choisir la Base de données";
-		$text['button-back']['en-us'] = "Back";
-		$text['button-back']['fr-fr'] = "Retour";
-		$text['button-execute']['en-us'] = "Execute";
-		$text['button-execute']['fr-fr'] = "Exécuter";
-		$text['button-manage']['en-us'] = "Manage";
-		$text['button-manage']['fr-fr'] = "Gérer";
-?>
+<?php
+
+	//SQL Query
+
+		$text['title-sql_query']['en-us'] = "SQL Query";
+		$text['title-sql_query']['fr-fr'] = "Requête SQL";
+		$text['title-databases']['en-us'] = "Databases";
+		$text['title-databases']['fr-fr'] = "Bases de données";
+
+		$text['header-sql_query']['en-us'] = "SQL Query";
+		$text['header-sql_query']['fr-fr'] = "Requêtes SQL";
+		$text['header-databases']['en-us'] = "Databases";
+		$text['header-databases']['fr-fr'] = "Bases de données";
+
+		$text['description-databases']['en-us'] = "Select the database to use with SQL Query.";
+		$text['description-databases']['fr-fr'] = "Choisir la base de données utilisée par la requête SQL.";
+
+		$text['label-sql_query']['en-us'] = "SQL Query";
+		$text['label-sql_query']['fr-fr'] = "Requête SQL";
+		$text['label-table']['en-us'] = "Table";
+		$text['label-table']['fr-fr'] = "Table";
+		$text['label-result_type']['en-us'] = "Result";
+		$text['label-result_type']['fr-fr'] = "Résultat";
+		$text['label-results']['en-us'] = "Results";
+		$text['label-results']['fr-fr'] = "Résultats";
+		$text['label-error']['en-us'] = "Error";
+		$text['label-error']['fr-fr'] = "Erreur";
+		$text['label-type']['en-us'] = "Type";
+		$text['label-type']['fr-fr'] = "Type";
+		$text['label-host']['en-us'] = "Host";
+		$text['label-host']['fr-fr'] = "Hôte";
+		$text['label-name']['en-us'] = "Name";
+		$text['label-name']['fr-fr'] = "Nom";
+		$text['label-description']['en-us'] = "Description";
+		$text['label-description']['fr-fr'] = "Description";
+
+		$text['option-result_type_view']['en-us'] = "View";
+		$text['option-result_type_view']['fr-fr'] = "Voir";
+		$text['option-result_type_csv']['en-us'] = "CSV Download";
+		$text['option-result_type_csv']['fr-fr'] = "Télécharger le CSV";
+		$text['option-result_type_insert']['en-us'] = "SQL Inserts";
+		$text['option-result_type_insert']['fr-fr'] = "Insertion SQL";
+
+		$text['button-edit']['en-us'] = "Edit";
+		$text['button-edit']['fr-fr'] = "Editer";
+		$text['button-backup']['en-us'] = "Backup";
+		$text['button-backup']['fr-fr'] = "Sauvegarder";
+		$text['button-select_database']['en-us'] = "Select Database";
+		$text['button-select_database']['fr-fr'] = "Choisir la Base de données";
+		$text['button-back']['en-us'] = "Back";
+		$text['button-back']['fr-fr'] = "Retour";
+		$text['button-execute']['en-us'] = "Execute";
+		$text['button-execute']['fr-fr'] = "Exécuter";
+		$text['button-manage']['en-us'] = "Manage";
+		$text['button-manage']['fr-fr'] = "Gérer";
+?>