Fix #854 French censuses

32 files changed, 563 insertions, 157 deletions

diff --git a/app/Census/AbstractCensusColumnCondition.php b/app/Census/AbstractCensusColumnCondition.php
new file mode 100644
index 0000000000..0fa9028272
--- /dev/null
+++ b/app/Census/AbstractCensusColumnCondition.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * Marital status.
+ */
+abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implements CensusColumnInterface {
+	/* Text to display for married individuals */
+	protected $husband = '';
+	protected $wife    = '';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = '';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = '';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = '';
+	protected $divorcee = '';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = '';
+
+	/* At what age is this individual recorded as an adult */
+	protected $age_adult = 15;
+
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual      $individual
+	 * @param Individual|null $head
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual, Individual $head = null) {
+		$family = $this->spouseFamily($individual);
+		$sex    = $individual->getSex();
+
+		if ($family === null || count($family->getFacts('_NMR')) > 0) {
+			if ($this->isChild($individual)) {
+				return $this->conditionChild($sex);
+			} else {
+				return $this->conditionSingle($sex);
+			}
+		} elseif (count($family->getFacts('DIV')) > 0) {
+			return $this->conditionDivorced($sex);
+		} else {
+			return $this->conditionMarried($sex);
+		}
+	}
+
+	/**
+	 * How is this condition written in a census column.
+	 *
+	 * @param $sex
+	 *
+	 * @return string
+	 */
+	private function conditionChild($sex) {
+		if ($sex === 'F') {
+			return $this->girl;
+		} else {
+			return $this->boy;
+		}
+	}
+
+	/**
+	 * How is this condition written in a census column.
+	 *
+	 * @param $sex
+	 *
+	 * @return string
+	 */
+	private function conditionDivorced($sex) {
+		if ($sex === 'F') {
+			return $this->divorcee;
+		} else {
+			return $this->divorce;
+		}
+	}
+
+	/**
+	 * How is this condition written in a census column.
+	 *
+	 * @param $sex
+	 *
+	 * @return string
+	 */
+	private function conditionMarried($sex) {
+		if ($sex === 'F') {
+			return $this->wife;
+		} else {
+			return $this->husband;
+		}
+	}
+
+	/**
+	 * How is this condition written in a census column.
+	 *
+	 * @param $sex
+	 *
+	 * @return string
+	 */
+	private function conditionSingle($sex) {
+		if ($sex === 'F') {
+			return $this->spinster;
+		} else {
+			return $this->bachelor;
+		}
+	}
+
+	/**
+	 * Is the individual a child.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return bool
+	 */
+	private function isChild(Individual $individual) {
+		$age = (int) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+
+		return $age < $this->age_adult;
+	}
+}
diff --git a/app/Census/CensusColumnConditionDanish.php b/app/Census/CensusColumnConditionDanish.php
index 65da0b69dc..beb2daa5b2 100644
--- a/app/Census/CensusColumnConditionDanish.php
+++ b/app/Census/CensusColumnConditionDanish.php
@@ -20,14 +20,18 @@ namespace Fisharebest\Webtrees\Census;
  */
 class CensusColumnConditionDanish extends CensusColumnConditionEnglish {
 	/* Text to display for married individuals */
-	protected $married = 'Gift';
+	protected $husband = 'Gift';
+	protected $wife    = 'Gift';
 
 	/* Text to display for unmarried individuals */
-	protected $unmarried = 'Ugift';
+	protected $bachelor = 'Ugift';
+	protected $spinster = 'Ugift';
 
 	/* Text to display for divorced individuals */
-	protected $divorced = 'Skilt';
+	protected $divorce  = 'Skilt';
+	protected $divorcee = 'Skilt';
 
 	/* Text to display for widowed individuals (not yet implemented) */
-	protected $wid = 'Wid';
+	protected $widower = '';
+	protected $widow   = '';
 }
diff --git a/app/Census/CensusColumnConditionEnglish.php b/app/Census/CensusColumnConditionEnglish.php
index 01f5750d6b..1e6111f4df 100644
--- a/app/Census/CensusColumnConditionEnglish.php
+++ b/app/Census/CensusColumnConditionEnglish.php
@@ -15,41 +15,26 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Individual;
 
 /**
  * Marital status.
  */
-class CensusColumnConditionEnglish extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnConditionEnglish extends AbstractCensusColumnCondition {
 	/* Text to display for married individuals */
-	protected $married = 'Mar';
+	protected $husband = 'Mar';
+	protected $wife    = 'Mar';
 
 	/* Text to display for unmarried individuals */
-	protected $unmarried = 'Unm';
+	protected $bachelor = 'Unm';
+	protected $spinster = 'Unm';
 
 	/* Text to display for divorced individuals */
-	protected $divorced = 'Div';
+	protected $divorce  = 'Div';
+	protected $divorcee = 'Div';
 
 	/* Text to display for widowed individuals (not yet implemented) */
-	protected $wid = 'Wid';
-
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null) {
-		$family = $this->spouseFamily($individual);
-
-		if ($family === null || count($family->getFacts('_NMR')) > 0) {
-			return $this->unmarried;
-		} elseif (count($family->getFacts('DIV')) > 0) {
-			return $this->divorced;
-		} else {
-			return $this->married;
-		}
-	}
+	protected $widower = 'Wid';
+	protected $widow   = 'Wid';
 }
diff --git a/app/Census/CensusColumnConditionFrenchFemme.php b/app/Census/CensusColumnConditionFrenchFemme.php
new file mode 100644
index 0000000000..7fff20e755
--- /dev/null
+++ b/app/Census/CensusColumnConditionFrenchFemme.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionFrenchFemme extends AbstractCensusColumnCondition {
+	/* Text to display for married individuals */
+	protected $husband = '';
+	protected $wife    = 'X';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = '';
+	protected $spinster = 'X';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = '';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = '';
+	protected $divorcee = 'X';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = '';
+}
diff --git a/app/Census/CensusColumnConditionFrenchFille.php b/app/Census/CensusColumnConditionFrenchFille.php
new file mode 100644
index 0000000000..9a13f5dbbf
--- /dev/null
+++ b/app/Census/CensusColumnConditionFrenchFille.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionFrenchFille extends AbstractCensusColumnCondition {
+	/* Text to display for married individuals */
+	protected $husband = '';
+	protected $wife    = '';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = '';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = 'X';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = '';
+	protected $divorcee = '';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = '';
+}
diff --git a/app/Census/CensusColumnConditionFrenchGarcon.php b/app/Census/CensusColumnConditionFrenchGarcon.php
new file mode 100644
index 0000000000..3e09f770ea
--- /dev/null
+++ b/app/Census/CensusColumnConditionFrenchGarcon.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionFrenchGarcon extends AbstractCensusColumnCondition {
+	/* Text to display for married individuals */
+	protected $husband = '';
+	protected $wife    = '';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = '';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = 'X';
+	protected $girl = '';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = '';
+	protected $divorcee = '';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = '';
+}
diff --git a/app/Census/CensusColumnConditionFrenchHomme.php b/app/Census/CensusColumnConditionFrenchHomme.php
new file mode 100644
index 0000000000..b3ac2b1eb6
--- /dev/null
+++ b/app/Census/CensusColumnConditionFrenchHomme.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition {
+	/* Text to display for married individuals */
+	protected $husband = 'X';
+	protected $wife    = '';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = 'X';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = '';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = 'X';
+	protected $divorcee = '';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = '';
+}
diff --git a/app/Census/CensusColumnConditionFrench.php b/app/Census/CensusColumnConditionFrenchVeuf.php
index 2c1437856a..a7785d4129 100644
--- a/app/Census/CensusColumnConditionFrench.php
+++ b/app/Census/CensusColumnConditionFrenchVeuf.php
@@ -18,16 +18,24 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Marital status.
  */
-class CensusColumnConditionFrench extends CensusColumnConditionEnglish {
+class CensusColumnConditionFrenchVeuf extends AbstractCensusColumnCondition {
 	/* Text to display for married individuals */
-	protected $married = 'Marié';
+	protected $husband = '';
+	protected $wife    = '';
 
 	/* Text to display for unmarried individuals */
-	protected $unmarried = 'Célibataire';
+	protected $bachelor = '';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = '';
 
 	/* Text to display for divorced individuals */
-	protected $divorced = 'Divorcé';
+	protected $divorce  = '';
+	protected $divorcee = '';
 
 	/* Text to display for widowed individuals (not yet implemented) */
-	protected $wid = 'Wid';
+	protected $widower = 'X';
+	protected $widow   = '';
 }
diff --git a/app/Census/CensusColumnConditionFrenchVeuve.php b/app/Census/CensusColumnConditionFrenchVeuve.php
new file mode 100644
index 0000000000..614a3a3d09
--- /dev/null
+++ b/app/Census/CensusColumnConditionFrenchVeuve.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionFrenchVeuve extends AbstractCensusColumnCondition {
+	/* Text to display for married individuals */
+	protected $husband = '';
+	protected $wife    = '';
+
+	/* Text to display for unmarried individuals */
+	protected $bachelor = '';
+	protected $spinster = '';
+
+	/* Text to display for children */
+	protected $boy  = '';
+	protected $girl = '';
+
+	/* Text to display for divorced individuals */
+	protected $divorce  = '';
+	protected $divorcee = '';
+
+	/* Text to display for widowed individuals (not yet implemented) */
+	protected $widower = '';
+	protected $widow   = 'X';
+}
diff --git a/app/Census/CensusColumnConditionUs.php b/app/Census/CensusColumnConditionUs.php
index 76d1b5744c..3bfb7dacc2 100644
--- a/app/Census/CensusColumnConditionUs.php
+++ b/app/Census/CensusColumnConditionUs.php
@@ -20,14 +20,22 @@ namespace Fisharebest\Webtrees\Census;
  */
 class CensusColumnConditionUs extends CensusColumnConditionEnglish {
 	/* Text to display for married individuals */
-	protected $married = 'M';
+	protected $husband = 'M';
+	protected $wife    = 'M';
 
 	/* Text to display for unmarried individuals */
-	protected $unmarried = 'S';
+	protected $bachelor = 'S';
+	protected $spinster = 'S';
+
+	/* Text to display for children */
+	protected $boy = 'S';
+	protected $girl = 'S';
 
 	/* Text to display for divorced individuals */
-	protected $divorced = 'D';
+	protected $divorce  = 'D';
+	protected $divorcee = 'D';
 
 	/* Text to display for widowed individuals (not yet implemented) */
-	protected $wid = 'W';
+	protected $widower = 'W';
+	protected $widow   = 'W';
 }
diff --git a/app/Census/CensusOfFrance1831.php b/app/Census/CensusOfFrance1831.php
index 643461e42f..47152219e9 100644
--- a/app/Census/CensusOfFrance1831.php
+++ b/app/Census/CensusOfFrance1831.php
@@ -35,11 +35,16 @@ class CensusOfFrance1831 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
-			new CensusColumnConditionFrench($this, 'Situation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1836.php b/app/Census/CensusOfFrance1836.php
index eac6393178..7d997666ee 100644
--- a/app/Census/CensusOfFrance1836.php
+++ b/app/Census/CensusOfFrance1836.php
@@ -35,11 +35,16 @@ class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1841.php b/app/Census/CensusOfFrance1841.php
index 358fbc118a..7006c202b8 100644
--- a/app/Census/CensusOfFrance1841.php
+++ b/app/Census/CensusOfFrance1841.php
@@ -35,10 +35,15 @@ class CensusOfFrance1841 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1846.php b/app/Census/CensusOfFrance1846.php
index 0f9a0af30a..e44a0b4030 100644
--- a/app/Census/CensusOfFrance1846.php
+++ b/app/Census/CensusOfFrance1846.php
@@ -35,11 +35,16 @@ class CensusOfFrance1846 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1851.php b/app/Census/CensusOfFrance1851.php
index 656c3d978c..7e722f99cc 100644
--- a/app/Census/CensusOfFrance1851.php
+++ b/app/Census/CensusOfFrance1851.php
@@ -35,14 +35,19 @@ class CensusOfFrance1851 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Professions', ''),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
 			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),
-			new CensusColumnNull($this, 'Religion', 'Religion'),
-			new CensusColumnNull($this, 'Maladies', 'Infirmités et maladies'),
+			new CensusColumnNull($this, 'Fr', 'Français d’origine'),
+			new CensusColumnNull($this, 'Nat', 'Naturalisés français'),
+			new CensusColumnNull($this, 'Etr', 'Étrangers (indiquer leur pays d’origine)'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1856.php b/app/Census/CensusOfFrance1856.php
index 5e9c5de404..ab9c92e186 100644
--- a/app/Census/CensusOfFrance1856.php
+++ b/app/Census/CensusOfFrance1856.php
@@ -35,11 +35,16 @@ class CensusOfFrance1856 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1861.php b/app/Census/CensusOfFrance1861.php
index 6e585ef05c..e278cda8d5 100644
--- a/app/Census/CensusOfFrance1861.php
+++ b/app/Census/CensusOfFrance1861.php
@@ -35,11 +35,16 @@ class CensusOfFrance1861 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1866.php b/app/Census/CensusOfFrance1866.php
index e6451442ef..39a8856774 100644
--- a/app/Census/CensusOfFrance1866.php
+++ b/app/Census/CensusOfFrance1866.php
@@ -35,11 +35,16 @@ class CensusOfFrance1866 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1872.php b/app/Census/CensusOfFrance1872.php
index dadbd5ac43..0672a72fc5 100644
--- a/app/Census/CensusOfFrance1872.php
+++ b/app/Census/CensusOfFrance1872.php
@@ -35,13 +35,17 @@ class CensusOfFrance1872 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),
-			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1876.php b/app/Census/CensusOfFrance1876.php
index 6b36edebdc..ba1495b2d6 100644
--- a/app/Census/CensusOfFrance1876.php
+++ b/app/Census/CensusOfFrance1876.php
@@ -35,13 +35,17 @@ class CensusOfFrance1876 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnConditionFrench($this, 'Situtation pers.', 'Situation personnelle (marié, veuf…)'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),
-			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'),
+			new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''),
+			new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'),
+			new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''),
+			new CensusColumnConditionFrenchFille($this, 'Filles', ''),
+			new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'),
+			new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnBirthPlace($this, 'Nationalité', 'Nationalité - Lieu de naissance'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1881.php b/app/Census/CensusOfFrance1881.php
index 44af8409c8..2915177d11 100644
--- a/app/Census/CensusOfFrance1881.php
+++ b/app/Census/CensusOfFrance1881.php
@@ -35,10 +35,10 @@ class CensusOfFrance1881 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
 		);
 	}
diff --git a/app/Census/CensusOfFrance1886.php b/app/Census/CensusOfFrance1886.php
index a975da445a..ea9fdec4ef 100644
--- a/app/Census/CensusOfFrance1886.php
+++ b/app/Census/CensusOfFrance1886.php
@@ -35,12 +35,12 @@ class CensusOfFrance1886 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1891.php b/app/Census/CensusOfFrance1891.php
index 51c0aeea04..eb9c55ce68 100644
--- a/app/Census/CensusOfFrance1891.php
+++ b/app/Census/CensusOfFrance1891.php
@@ -35,11 +35,12 @@ class CensusOfFrance1891 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1896.php b/app/Census/CensusOfFrance1896.php
index 88b1f58747..0f4d97c0ab 100644
--- a/app/Census/CensusOfFrance1896.php
+++ b/app/Census/CensusOfFrance1896.php
@@ -35,12 +35,12 @@ class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1901.php b/app/Census/CensusOfFrance1901.php
index 09d9b6f7b8..989f7be5a4 100644
--- a/app/Census/CensusOfFrance1901.php
+++ b/app/Census/CensusOfFrance1901.php
@@ -35,14 +35,14 @@ class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnAge($this, 'Âge', 'Âge'),
-			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnAge($this, 'Âge', ''),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
-			new CensusColumnNull($this, 'Position sociale', 'Position sociale (patron, ouvrier ou employé)'),
+			new CensusColumnNull($this, 'Empl', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1906.php b/app/Census/CensusOfFrance1906.php
index 7610b678df..374c999ce9 100644
--- a/app/Census/CensusOfFrance1906.php
+++ b/app/Census/CensusOfFrance1906.php
@@ -35,14 +35,14 @@ class CensusOfFrance1906 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
-			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
-			new CensusColumnNull($this, 'Position sociale', 'Position sociale (patron, ouvrier ou employé)'),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnNull($this, 'Empl', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1911.php b/app/Census/CensusOfFrance1911.php
index 08a710d4ba..5108964ae4 100644
--- a/app/Census/CensusOfFrance1911.php
+++ b/app/Census/CensusOfFrance1911.php
@@ -35,14 +35,14 @@ class CensusOfFrance1911 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
-			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
-			new CensusColumnNull($this, 'Position sociale', 'Position sociale (patron, ouvrier ou employé)'),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnNull($this, 'Empl', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1921.php b/app/Census/CensusOfFrance1921.php
index 9b21dfc592..d9c6d294f5 100644
--- a/app/Census/CensusOfFrance1921.php
+++ b/app/Census/CensusOfFrance1921.php
@@ -35,12 +35,14 @@ class CensusOfFrance1921 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
-			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
+			new CensusColumnBirthPlace($this, 'Lieu', 'Lieu de naissance'),
+			new CensusColumnNationality($this, 'Nationalité', ''),
+			new CensusColumnRelationToHead($this, 'Situation', 'Situation par rapport au chef de ménage'),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnNull($this, 'Empl', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1926.php b/app/Census/CensusOfFrance1926.php
index 7e4e8c2b83..886dbad092 100644
--- a/app/Census/CensusOfFrance1926.php
+++ b/app/Census/CensusOfFrance1926.php
@@ -35,12 +35,12 @@ class CensusOfFrance1926 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnNationality($this, 'Nationalité', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1931.php b/app/Census/CensusOfFrance1931.php
index 23a948802d..2334eaab89 100644
--- a/app/Census/CensusOfFrance1931.php
+++ b/app/Census/CensusOfFrance1931.php
@@ -35,12 +35,12 @@ class CensusOfFrance1931 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnNationality($this, 'Nationalité', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1936.php b/app/Census/CensusOfFrance1936.php
index e8ca64f31f..6f5a330f30 100644
--- a/app/Census/CensusOfFrance1936.php
+++ b/app/Census/CensusOfFrance1936.php
@@ -35,12 +35,12 @@ class CensusOfFrance1936 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
-			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),	
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
+			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),	
+			new CensusColumnNationality($this, 'Nationalité', ''),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1946.php b/app/Census/CensusOfFrance1946.php
index daf0759d6d..905616c178 100644
--- a/app/Census/CensusOfFrance1946.php
+++ b/app/Census/CensusOfFrance1946.php
@@ -35,12 +35,12 @@ class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnSurname($this, 'Nom', 'Nom de famille'),
-			new CensusColumnGivenNames($this, 'Prénom', 'Prénom'),
-			new CensusColumnOccupation($this, 'Profession', 'Profession'),
+			new CensusColumnSurname($this, 'Noms', 'Noms de famille'),
+			new CensusColumnGivenNames($this, 'Prénoms', ''),
+			new CensusColumnOccupation($this, 'Profession', ''),
 			new CensusColumnBirthYear($this, 'Année', 'Année de naissance'),
 			new CensusColumnRelationToHead($this, 'Position', 'Position dans le ménage'),
-			new CensusColumnNationality($this, 'Nationalité', 'Nationalité'),
+			new CensusColumnNationality($this, 'Nationalité', ''),
 		);
 	}
 }