Merge branch 'stable'

Conflicts:
	ishtar_common/locale/fr/LC_MESSAGES/django.po

1 files changed, 142 insertions, 126 deletions

diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 92e30b96a..48c5cd2b1 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-20 00:35+0200\n"
+"POT-Creation-Date: 2015-06-02 01:17+0200\n"
 "PO-Revision-Date: 2015-01-25\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -139,7 +139,7 @@ msgstr "\"%(value)s\" n'est pas dans %(values)s"
 msgid "Enter a valid name consisting of letters, spaces and hyphens."
 msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
 
-#: forms.py:76 forms_common.py:377
+#: forms.py:76 forms_common.py:379
 msgid "Confirm"
 msgstr "Confirmation"
 
@@ -167,8 +167,8 @@ msgstr "Ajouter un nouvel élément"
 msgid "Template"
 msgstr "Patron"
 
-#: forms_common.py:43 forms_common.py:57 forms_common.py:159
-#: forms_common.py:247 forms_common.py:252 models.py:914 models.py:1798
+#: forms_common.py:43 forms_common.py:57 forms_common.py:161
+#: forms_common.py:249 forms_common.py:254 models.py:914 models.py:1805
 #: templates/blocks/JQueryAdvancedTown.html:19
 #: templates/ishtar/sheet_organization.html:17
 #: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
@@ -193,70 +193,70 @@ msgstr ""
 "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
 "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
 
-#: forms_common.py:65 forms_common.py:565 ishtar_menu.py:40 models.py:1559
-#: models.py:1660 models.py:1700 templates/ishtar/sheet_person.html:6
+#: forms_common.py:65 forms_common.py:567 ishtar_menu.py:40 models.py:1566
+#: models.py:1667 models.py:1707 templates/ishtar/sheet_person.html:6
 msgid "Person"
 msgstr "Individu"
 
-#: forms_common.py:147 forms_common.py:214 ishtar_menu.py:58 models.py:1497
+#: forms_common.py:149 forms_common.py:216 ishtar_menu.py:58 models.py:1504
 #: templates/ishtar/sheet_organization.html:6
 msgid "Organization"
 msgstr "Organisation"
 
-#: forms_common.py:149 forms_common.py:185 forms_common.py:210
-#: forms_common.py:239 models.py:850 models.py:1018 models.py:1176
-#: models.py:1492 models.py:1549 models.py:1784
+#: forms_common.py:151 forms_common.py:187 forms_common.py:212
+#: forms_common.py:241 models.py:850 models.py:1018 models.py:1176
+#: models.py:1499 models.py:1556 models.py:1791
 #: templates/ishtar/sheet_organization.html:12
 #: templates/ishtar/sheet_organization.html:25
 #: templates/ishtar/sheet_person.html:12 templates/ishtar/sheet_person.html:26
 msgid "Name"
 msgstr "Nom"
 
-#: forms_common.py:151 models.py:978 models.py:1255
+#: forms_common.py:153 models.py:978 models.py:1257
 msgid "Organization type"
 msgstr "Type d'organisation"
 
-#: forms_common.py:153 forms_common.py:241 models.py:909
+#: forms_common.py:155 forms_common.py:243 models.py:909
 #: templates/ishtar/sheet_organization.html:14
 #: templates/ishtar/sheet_person.html:17 templates/ishtar/sheet_person.html:27
 msgid "Address"
 msgstr "Adresse"
 
-#: forms_common.py:155 forms_common.py:243 models.py:910
+#: forms_common.py:157 forms_common.py:245 models.py:910
 #: templates/ishtar/sheet_organization.html:15
 #: templates/ishtar/sheet_person.html:18 templates/ishtar/sheet_person.html:28
 msgid "Address complement"
 msgstr "Complément d'adresse"
 
-#: forms_common.py:157 forms_common.py:245 models.py:912
+#: forms_common.py:159 forms_common.py:247 models.py:912
 #: templates/ishtar/sheet_organization.html:16
 #: templates/ishtar/sheet_person.html:19 templates/ishtar/sheet_person.html:29
 msgid "Postal code"
 msgstr "Code postal"
 
-#: forms_common.py:160 forms_common.py:248 models.py:915
+#: forms_common.py:162 forms_common.py:250 models.py:915
 msgid "Country"
 msgstr "Pays"
 
-#: forms_common.py:162 forms_common.py:212 forms_common.py:250
-#: forms_common.py:335 models.py:920 templates/ishtar/sheet_person.html:15
+#: forms_common.py:164 forms_common.py:214 forms_common.py:252
+#: forms_common.py:337 models.py:920 templates/ishtar/sheet_person.html:15
 msgid "Email"
 msgstr "Courriel"
 
-#: forms_common.py:163 forms_common.py:251 models.py:917
+#: forms_common.py:165 forms_common.py:253 models.py:917
 #: templates/ishtar/sheet_organization.html:18
 #: templates/ishtar/sheet_person.html:21 templates/ishtar/sheet_person.html:31
 msgid "Phone"
 msgstr "Téléphone"
 
-#: forms_common.py:164 models.py:918
+#: forms_common.py:166 models.py:918
 #: templates/ishtar/sheet_organization.html:19
 #: templates/ishtar/sheet_person.html:22 templates/ishtar/sheet_person.html:32
 msgid "Mobile phone"
 msgstr "Téléphone portable"
 
-#: forms_common.py:186 forms_common.py:213 models.py:1270 models.py:1494
-#: models.py:1736 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
+#: forms_common.py:188 forms_common.py:215 models.py:1272 models.py:1501
+#: models.py:1743 templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
 #: templates/sheet_ope.html:126 templates/ishtar/import_list.html:13
 #: templates/ishtar/sheet_organization.html:27
 #: templates/ishtar/sheet_person.html:42 templates/ishtar/sheet_person.html:95
@@ -264,121 +264,121 @@ msgstr "Téléphone portable"
 msgid "Type"
 msgstr "Type"
 
-#: forms_common.py:194 views.py:106
+#: forms_common.py:196 views.py:106
 msgid "Organization search"
 msgstr "Recherche d'organisations"
 
-#: forms_common.py:211 forms_common.py:237 models.py:1547
+#: forms_common.py:213 forms_common.py:239 models.py:1554
 #: templates/ishtar/sheet_organization.html:26
 #: templates/ishtar/sheet_person.html:13
 msgid "Surname"
 msgstr "Prénom"
 
-#: forms_common.py:225 views.py:80
+#: forms_common.py:227 views.py:80
 msgid "Person search"
 msgstr "Recherche d'individus"
 
-#: forms_common.py:234
+#: forms_common.py:236
 msgid "Identity"
 msgstr "Identité"
 
-#: forms_common.py:236 forms_common.py:522 models.py:1545 models.py:1733
+#: forms_common.py:238 forms_common.py:524 models.py:1552 models.py:1740
 #: templates/sheet_ope.html:104 templates/ishtar/sheet_person.html:94
 #: templates/ishtar/blocks/window_tables/documents.html:5
 msgid "Title"
 msgstr "Titre"
 
-#: forms_common.py:254
+#: forms_common.py:256
 msgid "Current organization"
 msgstr "Organisation actuelle"
 
-#: forms_common.py:294 forms_common.py:317 forms_common.py:320 models.py:1530
+#: forms_common.py:296 forms_common.py:319 forms_common.py:322 models.py:1537
 msgid "Person type"
 msgstr "Type d'individu"
 
-#: forms_common.py:330 forms_common.py:334
+#: forms_common.py:332 forms_common.py:336
 msgid "Account"
 msgstr "Compte"
 
-#: forms_common.py:337 wizards.py:948
+#: forms_common.py:339 wizards.py:948
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms_common.py:341
+#: forms_common.py:343
 msgid "New password (confirmation)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: forms_common.py:359
+#: forms_common.py:361
 msgid "Your password and confirmation password do not match."
 msgstr "La vérification du mot de passe a échoué."
 
-#: forms_common.py:364
+#: forms_common.py:366
 msgid "You must provide a correct password."
 msgstr "Vous devez fournir un mot de passe correct."
 
-#: forms_common.py:372
+#: forms_common.py:374
 msgid "This username already exists."
 msgstr "Ce nom d'utilisateur existe déjà."
 
-#: forms_common.py:378
+#: forms_common.py:380
 msgid "Send the new password by email?"
 msgstr "Envoyer le nouveau mot de passe par courriel ?"
 
-#: forms_common.py:386 forms_common.py:398 models.py:1799
+#: forms_common.py:388 forms_common.py:400 models.py:1806
 #: templates/ishtar/sheet_person.html:72
 msgid "Towns"
 msgstr "Communes"
 
-#: forms_common.py:395
+#: forms_common.py:397
 msgid "There are identical towns."
 msgstr "Il y a des communes identiques."
 
-#: forms_common.py:474
+#: forms_common.py:476
 msgid "Only one choice can be checked."
 msgstr "Seul un choix peut être coché."
 
-#: forms_common.py:520
+#: forms_common.py:522
 msgid "Documentation informations"
 msgstr "Information sur le document"
 
-#: forms_common.py:524 forms_common.py:543 models.py:1256 models.py:1719
+#: forms_common.py:526 forms_common.py:545 models.py:1258 models.py:1726
 msgid "Source type"
 msgstr "Type de source"
 
-#: forms_common.py:526 models.py:1746
+#: forms_common.py:528 models.py:1753
 msgid "Numerical ressource (web address)"
 msgstr "Ressource numérique (adresse web)"
 
-#: forms_common.py:527 models.py:1748
+#: forms_common.py:529 models.py:1755
 msgid "Receipt date"
 msgstr "Date de réception"
 
-#: forms_common.py:529 models.py:1366 models.py:1750
+#: forms_common.py:531 models.py:1368 models.py:1757
 msgid "Creation date"
 msgstr "Date de création"
 
-#: forms_common.py:540 forms_common.py:559 forms_common.py:590 models.py:1705
+#: forms_common.py:542 forms_common.py:561 forms_common.py:592 models.py:1712
 #: templates/ishtar/wizard/wizard_person_deletion.html:124
 msgid "Author"
 msgstr "Auteur"
 
-#: forms_common.py:552
+#: forms_common.py:554
 msgid "Would you like to delete this documentation?"
 msgstr "Voulez-vous supprimer ce document ?"
 
-#: forms_common.py:566 models.py:1257 models.py:1696 models.py:1702
+#: forms_common.py:568 models.py:1259 models.py:1703 models.py:1709
 msgid "Author type"
 msgstr "Type d'auteur"
 
-#: forms_common.py:584
+#: forms_common.py:586
 msgid "Author selection"
 msgstr "Sélection d'auteur"
 
-#: forms_common.py:596
+#: forms_common.py:598
 msgid "There are identical authors."
 msgstr "Il y a des auteurs identiques."
 
-#: forms_common.py:600 models.py:1706 models.py:1743
+#: forms_common.py:602 models.py:1713 models.py:1750
 #: templates/sheet_ope.html:106
 #: templates/ishtar/blocks/window_tables/documents.html:7
 msgid "Authors"
@@ -416,11 +416,11 @@ msgstr "Modification"
 msgid "Merge"
 msgstr "Fusion"
 
-#: ishtar_menu.py:54 ishtar_menu.py:75 models.py:1396 widgets.py:108
+#: ishtar_menu.py:54 ishtar_menu.py:75 models.py:1402 widgets.py:108
 msgid "Delete"
 msgstr "Suppression"
 
-#: ishtar_menu.py:82 models.py:1374
+#: ishtar_menu.py:82 models.py:1376
 msgid "Imports"
 msgstr "Imports"
 
@@ -456,7 +456,7 @@ msgstr "Libellé"
 msgid "Textual ID"
 msgstr "Identifiant textuel"
 
-#: models.py:242 models.py:1757
+#: models.py:242 models.py:1764
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -522,7 +522,7 @@ msgstr "Patron de document"
 msgid "Document templates"
 msgstr "Patrons de documents"
 
-#: models.py:888 models.py:897 models.py:1364
+#: models.py:888 models.py:897 models.py:1366
 msgid "State"
 msgstr "État"
 
@@ -558,7 +558,7 @@ msgstr "Dossiers archéologiques"
 msgid "Context records"
 msgstr "Unité d'Enregistrement"
 
-#: models.py:1020 models.py:1177 models.py:1756 templates/sheet_ope.html:128
+#: models.py:1020 models.py:1177 models.py:1763 templates/sheet_ope.html:128
 msgid "Description"
 msgstr "Description"
 
@@ -650,295 +650,311 @@ msgstr "Importeur - Cibles"
 msgid "Is set"
 msgstr "Est défini"
 
-#: models.py:1258 models.py:1729 models.py:1739
+#: models.py:1226
+msgid "Importer - Target key"
+msgstr "Importeur - Rapprochement"
+
+#: models.py:1227
+msgid "Importer - Targets keys"
+msgstr "Importeur - Rapprochements"
+
+#: models.py:1260 models.py:1736 models.py:1746
 msgid "Format"
 msgstr "Format"
 
-#: models.py:1259
+#: models.py:1261
 msgid "Operation type"
 msgstr "Type d'opération"
 
-#: models.py:1260
+#: models.py:1262
 msgid "Period"
 msgstr "Périodes"
 
-#: models.py:1266
+#: models.py:1268
 msgid "Integer"
 msgstr "Entier"
 
-#: models.py:1267
+#: models.py:1269
 msgid "Float"
 msgstr "Nombre à virgule"
 
-#: models.py:1268
+#: models.py:1270
 msgid "String"
 msgstr "Chaine de caractères"
 
-#: models.py:1269 templates/sheet_ope.html:86
+#: models.py:1271 templates/sheet_ope.html:86
 msgid "Date"
 msgstr "Date"
 
-#: models.py:1271 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:1273 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
 #: templates/ishtar/sheet_person.html:39 templates/ishtar/sheet_person.html:68
 #: templates/ishtar/sheet_person.html:93
 #: templates/ishtar/dashboards/dashboard_main_detail.html:120
 msgid "Year"
 msgstr "Année"
 
-#: models.py:1284
+#: models.py:1286
 msgid "4 digit year. e.g.: \"2015\""
 msgstr "Année à 4 chiffres. Exemple : « 2015 »"
 
-#: models.py:1285
+#: models.py:1287
 msgid "4 digit year/month/day. e.g.: \"2015/02/04\""
 msgstr "Année à 4 chiffres/mois/jour. Exemple : « 2015/02/04 »"
 
-#: models.py:1286
+#: models.py:1288
 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\""
 msgstr "Jour/mois/année à 4 chiffres. Exemple : « 04/02/2015 »"
 
-#: models.py:1295
+#: models.py:1297
 msgid "Options"
 msgstr "Options"
 
-#: models.py:1297
+#: models.py:1299
 msgid "Split character(s)"
 msgstr "Caractère de séparation"
 
-#: models.py:1300
+#: models.py:1302
 msgid "Importer - Formater type"
 msgstr "Importeur - Type de mise en forme"
 
-#: models.py:1301
+#: models.py:1303
 msgid "Importer - Formater types"
 msgstr "Importeur - Types de mise en forme"
 
-#: models.py:1340 templates/ishtar/dashboards/dashboard_main_detail.html:61
+#: models.py:1342 templates/ishtar/dashboards/dashboard_main_detail.html:61
 msgid "Created"
 msgstr "Créé"
 
-#: models.py:1341
+#: models.py:1343
 msgid "Analyse in progress"
 msgstr "Analyse en cours"
 
-#: models.py:1342
+#: models.py:1344
 msgid "Analysed"
 msgstr "Analysé"
 
-#: models.py:1343
+#: models.py:1345
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: models.py:1344
+#: models.py:1346
 msgid "Import in progress"
 msgstr "Import en cours"
 
-#: models.py:1345
+#: models.py:1347
 msgid "Finished with errors"
 msgstr "Finis avec des erreurs"
 
-#: models.py:1346
+#: models.py:1348
 msgid "Finished"
 msgstr "Terminé"
 
-#: models.py:1347
+#: models.py:1349
 msgid "Archived"
 msgstr "Archivé"
 
-#: models.py:1355
+#: models.py:1357
 msgid "Imported file"
 msgstr "Fichier importé"
 
-#: models.py:1357
+#: models.py:1359
 msgid "Skip lines"
 msgstr "Nombre de lignes d'entête"
 
-#: models.py:1358 templates/ishtar/import_list.html:47
+#: models.py:1360 templates/ishtar/import_list.html:47
 msgid "Error file"
 msgstr "Fichier erreur"
 
-#: models.py:1361
+#: models.py:1363
 msgid "Result file"
 msgstr "Fichier résultant"
 
-#: models.py:1368
+#: models.py:1370
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:1370
+#: models.py:1372
 msgid "Seconds remaining"
 msgstr "Secondes restantes"
 
-#: models.py:1373
+#: models.py:1375
 msgid "Import"
 msgstr "Import"
 
-#: models.py:1390
+#: models.py:1392
 msgid "Analyse"
 msgstr "Analyser"
 
-#: models.py:1392
+#: models.py:1394 models.py:1397
 msgid "Re-analyse"
 msgstr "Analyser de nouveau "
 
-#: models.py:1393
+#: models.py:1395
 msgid "Launch import"
 msgstr "Lancer l'import"
 
-#: models.py:1395
+#: models.py:1398
+msgid "Re-import"
+msgstr "re-import"
+
+#: models.py:1399
 msgid "Archive"
 msgstr "Archiver"
 
-#: models.py:1498
+#: models.py:1401
+msgid "Unarchive"
+msgstr "Dé-archiver"
+
+#: models.py:1505
 msgid "Organizations"
 msgstr "Organisations"
 
-#: models.py:1500
+#: models.py:1507
 msgid "Can view all Organization"
 msgstr "Peut voir toutes les Organisations"
 
-#: models.py:1501
+#: models.py:1508
 msgid "Can view own Organization"
 msgstr "Peut voir sa propre Organisation"
 
-#: models.py:1502
+#: models.py:1509
 msgid "Can add own Organization"
 msgstr "Peut ajouter sa propre Organisation"
 
-#: models.py:1503
+#: models.py:1510
 msgid "Can change own Organization"
 msgstr "Peut changer sa propre Organisation"
 
-#: models.py:1504
+#: models.py:1511
 msgid "Can delete own Organization"
 msgstr "Peut supprimer sa propre Organisation"
 
-#: models.py:1527
+#: models.py:1534
 msgid "Groups"
 msgstr "Groupes"
 
-#: models.py:1531
+#: models.py:1538
 msgid "Person types"
 msgstr "Types d'individu"
 
-#: models.py:1537
+#: models.py:1544
 msgid "Mr"
 msgstr "M."
 
-#: models.py:1538
+#: models.py:1545
 msgid "Miss"
 msgstr "Mlle"
 
-#: models.py:1539
+#: models.py:1546
 msgid "Mr and Miss"
 msgstr "M. et Mme"
 
-#: models.py:1540
+#: models.py:1547
 msgid "Mrs"
 msgstr "Mme"
 
-#: models.py:1541
+#: models.py:1548
 msgid "Doctor"
 msgstr "Dr."
 
-#: models.py:1551
+#: models.py:1558
 msgid "Raw name"
 msgstr "Nom brut"
 
-#: models.py:1553 models.py:1593
+#: models.py:1560 models.py:1600
 msgid "Types"
 msgstr "Types"
 
-#: models.py:1556
+#: models.py:1563
 msgid "Is attached to"
 msgstr "Est rattaché à"
 
-#: models.py:1560
+#: models.py:1567
 msgid "Persons"
 msgstr "Individus"
 
-#: models.py:1562
+#: models.py:1569
 msgid "Can view all Person"
 msgstr "Peut voir toutes les Personnes"
 
-#: models.py:1563
+#: models.py:1570
 msgid "Can view own Person"
 msgstr "Peut voir sa propre Personne"
 
-#: models.py:1564
+#: models.py:1571
 msgid "Can add own Person"
 msgstr "Peut ajouter sa propre Personne"
 
-#: models.py:1565
+#: models.py:1572
 msgid "Can change own Person"
 msgstr "Peut changer sa propre Personne"
 
-#: models.py:1566
+#: models.py:1573
 msgid "Can delete own Person"
 msgstr "Peut supprimer sa propre Personne"
 
-#: models.py:1664
+#: models.py:1671
 msgid "Ishtar user"
 msgstr "Utilisateur d'Ishtar"
 
-#: models.py:1665
+#: models.py:1672
 msgid "Ishtar users"
 msgstr "Utilisateurs d'Ishtar"
 
-#: models.py:1697
+#: models.py:1704
 msgid "Author types"
 msgstr "Types d'auteur"
 
-#: models.py:1720
+#: models.py:1727
 msgid "Source types"
 msgstr "Types de source"
 
-#: models.py:1724
+#: models.py:1731
 msgid "Support type"
 msgstr "Type de support"
 
-#: models.py:1725
+#: models.py:1732
 msgid "Support types"
 msgstr "Types de support"
 
-#: models.py:1730
+#: models.py:1737
 msgid "Formats"
 msgstr "Formats"
 
-#: models.py:1734
+#: models.py:1741
 msgid "External ID"
 msgstr "Identifiant extern"
 
-#: models.py:1737
+#: models.py:1744
 msgid "Support"
 msgstr "Support"
 
-#: models.py:1741
+#: models.py:1748
 msgid "Scale"
 msgstr "Échelle"
 
-#: models.py:1751
+#: models.py:1758
 msgid "Item number"
 msgstr "Numéro d'élément"
 
-#: models.py:1752 templates/ishtar/sheet_person.html:40
+#: models.py:1759 templates/ishtar/sheet_person.html:40
 #: templates/ishtar/sheet_person.html:67
 msgid "Ref."
 msgstr "Réf."
 
-#: models.py:1754
+#: models.py:1761
 msgid "Internal reference"
 msgstr "Référence interne"
 
-#: models.py:1758
+#: models.py:1765
 msgid "Additional information"
 msgstr "Informations supplémentaires"
 
-#: models.py:1785
+#: models.py:1792
 msgid "Surface (m²)"
 msgstr "Surface (m²)"
 
-#: models.py:1786 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:1793 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
 msgid "Localisation"
 msgstr "Localisation"