diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-04-09 15:48:39 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-04-09 15:48:39 +0200 | 
| commit | 31abc384f812068b3ad5d87568b2ea695c25b8a9 (patch) | |
| tree | 5413b04ec63fc21d1fd93e6abffa52c936f321e5 | |
| parent | a129687cd2a776643770b9ba8f3bd9d8b53944a1 (diff) | |
| download | Ishtar-31abc384f812068b3ad5d87568b2ea695c25b8a9.tar.bz2 Ishtar-31abc384f812068b3ad5d87568b2ea695c25b8a9.zip | |
Update translations
| -rw-r--r-- | archaeological_operations/locale/django.pot | 1 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 287 | ||||
| -rw-r--r-- | translations/de/ishtar_common.po | 275 | ||||
| -rw-r--r-- | translations/fr/ishtar_common.po | 279 | 
4 files changed, 492 insertions, 350 deletions
| diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index f35cb461a..c16b15765 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -1479,7 +1479,6 @@ msgid "New objects will be created."  msgstr ""  #: tests.py:537 -#| msgid "This reference already exists."  msgid "This line have been already imported."  msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 7a28347cc..69f045b3a 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -175,7 +175,7 @@ msgstr ""  msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"  msgstr "" -#: data_importer.py:729 views.py:1941 +#: data_importer.py:729 views.py:1946  msgid "No data provided"  msgstr "" @@ -204,55 +204,55 @@ msgid ""  "source file."  msgstr "" -#: data_importer.py:1229 views.py:1987 views.py:1997 +#: data_importer.py:1234 views.py:2024 views.py:2034  msgid "Not imported"  msgstr "" -#: data_importer.py:1554 +#: data_importer.py:1559  msgid "Importer configuration error: field \"{}\" does not exist for {}."  msgstr "" -#: data_importer.py:1639 +#: data_importer.py:1644  msgid "* created *"  msgstr "" -#: data_importer.py:1695 +#: data_importer.py:1700  msgid "* match not find *"  msgstr "" -#: data_importer.py:1704 +#: data_importer.py:1709  msgid "* the query match more than 10 results*"  msgstr "" -#: data_importer.py:1707 +#: data_importer.py:1712  msgid " or "  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "line"  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "col"  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "error"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "field"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "source"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "result"  msgstr "" -#: data_importer.py:1866 +#: data_importer.py:1871  #, python-format  msgid "\"%(value)s\" not in %(values)s"  msgstr "" @@ -355,8 +355,8 @@ msgstr ""  #: models.py:1538 models.py:1711 models.py:2017 models.py:2329 models.py:2443  #: models.py:2901 models.py:2949 models.py:3148 models_imports.py:95  #: models_imports.py:120 models_imports.py:429 models_imports.py:521 -#: models_imports.py:795 templates/ishtar/import_step_by_step.html:80 -#: templates/ishtar/import_step_by_step.html:248 +#: models_imports.py:807 templates/ishtar/import_step_by_step.html:102 +#: templates/ishtar/import_step_by_step.html:270  #: templates/ishtar/import_table.html:27  #: templates/ishtar/sheet_organization.html:23  msgid "Name" @@ -596,7 +596,7 @@ msgstr ""  msgid "Receipt date"  msgstr "" -#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:827 +#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:839  msgid "Creation date"  msgstr "" @@ -702,7 +702,7 @@ msgstr ""  msgid "Manual merge"  msgstr "" -#: ishtar_menu.py:110 models_imports.py:844 +#: ishtar_menu.py:110 models_imports.py:862  msgid "Imports"  msgstr "" @@ -714,7 +714,7 @@ msgstr ""  msgid "Current imports"  msgstr "" -#: ishtar_menu.py:121 views.py:2193 +#: ishtar_menu.py:121 views.py:2235  msgid "Old imports"  msgstr "" @@ -752,10 +752,10 @@ msgstr ""  #: models.py:828 models.py:980 models_imports.py:547  #: templates/ishtar/formset_import_match.html:21 -#: templates/ishtar/import_step_by_step.html:149 -#: templates/ishtar/import_step_by_step.html:177 -#: templates/ishtar/import_step_by_step.html:189 -#: templates/ishtar/import_step_by_step.html:223 +#: templates/ishtar/import_step_by_step.html:171 +#: templates/ishtar/import_step_by_step.html:199 +#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:245  msgid "Key"  msgstr "" @@ -1111,9 +1111,9 @@ msgstr ""  #: models.py:1792 models_imports.py:548  #: templates/ishtar/formset_import_match.html:22 -#: templates/ishtar/import_step_by_step.html:150 -#: templates/ishtar/import_step_by_step.html:178 -#: templates/ishtar/import_step_by_step.html:224 +#: templates/ishtar/import_step_by_step.html:172 +#: templates/ishtar/import_step_by_step.html:200 +#: templates/ishtar/import_step_by_step.html:246  msgid "Value"  msgstr "" @@ -1148,7 +1148,7 @@ msgstr ""  msgid "Document templates"  msgstr "" -#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:821 +#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:833  msgid "State"  msgstr "" @@ -1412,11 +1412,11 @@ msgstr ""  msgid "In progress"  msgstr "" -#: models.py:3162 models_imports.py:769 +#: models.py:3162 models_imports.py:772  msgid "Finished with errors"  msgstr "" -#: models.py:3163 models_imports.py:770 +#: models.py:3163 models_imports.py:773  msgid "Finished"  msgstr "" @@ -1515,8 +1515,8 @@ msgstr ""  msgid "Importer - Default values"  msgstr "" -#: models_imports.py:359 templates/ishtar/import_step_by_step.html:79 -#: templates/ishtar/import_step_by_step.html:247 +#: models_imports.py:359 templates/ishtar/import_step_by_step.html:101 +#: templates/ishtar/import_step_by_step.html:269  msgid "Column number"  msgstr "" @@ -1764,148 +1764,187 @@ msgstr ""  msgid "Importer - Formater types"  msgstr "" -#: models_imports.py:763 +#: models_imports.py:764  #: templates/ishtar/dashboards/dashboard_main_detail.html:132  msgid "Created"  msgstr "" -#: models_imports.py:764 +#: models_imports.py:765  msgid "Analyse in progress"  msgstr "" -#: models_imports.py:765 +#: models_imports.py:766  msgid "Analysed"  msgstr "" -#: models_imports.py:766 -msgid "Import pending" +#: models_imports.py:767 +msgid "Check modified in queue"  msgstr "" -#: models_imports.py:767 +#: models_imports.py:768  msgid "Import in queue"  msgstr "" -#: models_imports.py:768 +#: models_imports.py:769 +#| msgid "Import in progress" +msgid "Check modified in progress" +msgstr "" + +#: models_imports.py:770  msgid "Import in progress"  msgstr ""  #: models_imports.py:771 +#| msgid "Already imported" +msgid "Partially imported" +msgstr "" + +#: models_imports.py:774  msgid "Archived"  msgstr "" -#: models_imports.py:798 +#: models_imports.py:810  msgid "Imported file"  msgstr "" -#: models_imports.py:800 +#: models_imports.py:812  msgid "Associated images (zip file)"  msgstr "" -#: models_imports.py:804 +#: models_imports.py:816  msgid "If a group is selected, target key saved in this group will be used."  msgstr "" -#: models_imports.py:807 +#: models_imports.py:819  msgid "Encoding"  msgstr "" -#: models_imports.py:810 +#: models_imports.py:822  msgid "Skip lines"  msgstr "" -#: models_imports.py:811 +#: models_imports.py:823  msgid "Number of header lines in your file (can be 0)."  msgstr "" -#: models_imports.py:812 +#: models_imports.py:824  msgid "Error file"  msgstr "" -#: models_imports.py:815 +#: models_imports.py:827  msgid "Result file"  msgstr "" -#: models_imports.py:818 +#: models_imports.py:830  msgid "Match file"  msgstr "" -#: models_imports.py:824 +#: models_imports.py:836  msgid "Conservative import"  msgstr "" -#: models_imports.py:825 +#: models_imports.py:837  msgid "If set to true, do not overload existing values."  msgstr "" -#: models_imports.py:828 +#: models_imports.py:840  msgid "End date"  msgstr "" -#: models_imports.py:831 +#: models_imports.py:843  msgid "Remaining seconds"  msgstr "" -#: models_imports.py:833 +#: models_imports.py:845  msgid "Current line"  msgstr "" -#: models_imports.py:835 +#: models_imports.py:847  msgid "Number of line"  msgstr "" -#: models_imports.py:838 +#: models_imports.py:850  msgid "Imported line numbers"  msgstr "" -#: models_imports.py:843 +#: models_imports.py:853 +msgid "Changed have been checked" +msgstr "" + +#: models_imports.py:856 +#| msgid "Imported line numbers" +msgid "Changed line numbers" +msgstr "" + +#: models_imports.py:861  msgid "Import"  msgstr "" -#: models_imports.py:903 +#: models_imports.py:950  msgid "Analyse"  msgstr "" -#: models_imports.py:905 models_imports.py:910 +#: models_imports.py:952 models_imports.py:961  msgid "Re-analyse"  msgstr "" -#: models_imports.py:906 +#: models_imports.py:953  msgid "Launch import"  msgstr "" -#: models_imports.py:908 models_imports.py:913 +#: models_imports.py:956  msgid "Step by step import"  msgstr "" -#: models_imports.py:911 +#: models_imports.py:957 models_imports.py:966 +#| msgid "Recent changes" +msgid "Re-check for changes" +msgstr "" + +#: models_imports.py:959 models_imports.py:968 +#| msgid "Recent changes" +msgid "Check for changes" +msgstr "" + +#: models_imports.py:962  msgid "Re-import"  msgstr "" -#: models_imports.py:914 +#: models_imports.py:965 +#| msgid "Step by step import" +msgid "Step by step re-import" +msgstr "" + +#: models_imports.py:969  msgid "Archive"  msgstr "" -#: models_imports.py:916 +#: models_imports.py:971  msgid "Unarchive"  msgstr "" -#: models_imports.py:917 templates/ishtar/form_delete.html:11 widgets.py:258 +#: models_imports.py:972 templates/ishtar/form_delete.html:11 widgets.py:258  msgid "Delete"  msgstr "" -#: models_imports.py:985 +#: models_imports.py:1041 +#| msgid "Import {} added to the queue" +msgid "Modification check {} added to the queue" +msgstr "" + +#: models_imports.py:1111  msgid "Import {} added to the queue"  msgstr "" -#: models_imports.py:1003 +#: models_imports.py:1129  msgid "Error on imported file: {}"  msgstr "" -#: models_imports.py:1032 +#: models_imports.py:1164  msgid "Import {} finished with errors"  msgstr "" -#: models_imports.py:1038 +#: models_imports.py:1173  msgid "Import {} finished with no errors"  msgstr "" @@ -1949,17 +1988,16 @@ msgid "History"  msgstr ""  #: templates/admin/change_form.html:21 -#| msgid "New site"  msgid "View on site"  msgstr ""  #: templates/admin/change_form.html:24 templates/admin/change_form.html:27 -#: views.py:1960 views.py:1964 +#: views.py:2000 views.py:2005  msgid "Previous"  msgstr ""  #: templates/admin/change_form.html:32 templates/admin/change_form.html:35 -#: views.py:1972 views.py:1974 +#: views.py:2008 views.py:2011  msgid "Next"  msgstr "" @@ -2356,8 +2394,9 @@ msgstr ""  #: templates/ishtar/formset_import_match.html:5  #: templates/ishtar/formset_import_match.html:54 -#: templates/ishtar/import_step_by_step.html:112 -#: templates/ishtar/import_step_by_step.html:291 +#: templates/ishtar/import_step_by_step.html:6 +#: templates/ishtar/import_step_by_step.html:134 +#: templates/ishtar/import_step_by_step.html:313  msgid "Back to import list"  msgstr "" @@ -2389,66 +2428,81 @@ msgstr ""  msgid "Autorefresh the table (useful when waiting for an import result)"  msgstr "" -#: templates/ishtar/import_step_by_step.html:12 +#: templates/ishtar/import_step_by_step.html:14 +#| msgid "Add/Modify" +msgid "Add/modified" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:20 +#| msgid "Skip lines" +msgid "All lines" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:33  msgid "Already imported"  msgstr "" -#: templates/ishtar/import_step_by_step.html:24 +#: templates/ishtar/import_step_by_step.html:34 +#| msgid "Recent changes" +msgid "No changes" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:46  msgid "Line"  msgstr "" -#: templates/ishtar/import_step_by_step.html:32 +#: templates/ishtar/import_step_by_step.html:54  msgid "Go"  msgstr "" -#: templates/ishtar/import_step_by_step.html:41 views.py:1845 +#: templates/ishtar/import_step_by_step.html:63 views.py:1850  msgid "Import step by step"  msgstr "" -#: templates/ishtar/import_step_by_step.html:41 +#: templates/ishtar/import_step_by_step.html:63  msgid "line "  msgstr "" -#: templates/ishtar/import_step_by_step.html:45 +#: templates/ishtar/import_step_by_step.html:67  msgid "This line have been already imported."  msgstr "" -#: templates/ishtar/import_step_by_step.html:51 +#: templates/ishtar/import_step_by_step.html:73  msgid ""  "The following error(s) has been encountered while parsing the source file:"  msgstr "" -#: templates/ishtar/import_step_by_step.html:54 +#: templates/ishtar/import_step_by_step.html:76  msgid "Column"  msgstr "" -#: templates/ishtar/import_step_by_step.html:55 +#: templates/ishtar/import_step_by_step.html:77  #: templates/ishtar/import_table.html:34  msgid "Error"  msgstr "" -#: templates/ishtar/import_step_by_step.html:62 +#: templates/ishtar/import_step_by_step.html:84  msgid "Col."  msgstr "" -#: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:249 +#: templates/ishtar/import_step_by_step.html:103 +#: templates/ishtar/import_step_by_step.html:271  msgid "Raw value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:191 -#: templates/ishtar/import_step_by_step.html:251 +#: templates/ishtar/import_step_by_step.html:104 +#: templates/ishtar/import_step_by_step.html:213 +#: templates/ishtar/import_step_by_step.html:273  msgid "New value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:269 +#: templates/ishtar/import_step_by_step.html:120 +#: templates/ishtar/import_step_by_step.html:291  msgid "Update source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:104 -#: templates/ishtar/import_step_by_step.html:283 +#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:305  #: templates/ishtar/organization_form.html:40  #: templates/ishtar/organization_person_form.html:35  #: templates/ishtar/person_form.html:46 @@ -2456,66 +2510,65 @@ msgstr ""  msgid "Cancel"  msgstr "" -#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:148  msgid "No change for this item."  msgstr "" -#: templates/ishtar/import_step_by_step.html:131 +#: templates/ishtar/import_step_by_step.html:153  msgid "Changes will be made for this item"  msgstr "" -#: templates/ishtar/import_step_by_step.html:134 -#| msgid "Objects to be created" +#: templates/ishtar/import_step_by_step.html:156  msgid "New objects will be created."  msgstr "" -#: templates/ishtar/import_step_by_step.html:140 +#: templates/ishtar/import_step_by_step.html:162  msgid "Objects to be created"  msgstr "" -#: templates/ishtar/import_step_by_step.html:165 +#: templates/ishtar/import_step_by_step.html:187  msgid "Objects to be updated"  msgstr "" -#: templates/ishtar/import_step_by_step.html:174 -#: templates/ishtar/import_step_by_step.html:220 +#: templates/ishtar/import_step_by_step.html:196 +#: templates/ishtar/import_step_by_step.html:242  msgid "Matching values"  msgstr "" -#: templates/ishtar/import_step_by_step.html:186 +#: templates/ishtar/import_step_by_step.html:208  msgid "Updated values"  msgstr "" -#: templates/ishtar/import_step_by_step.html:190 +#: templates/ishtar/import_step_by_step.html:212  msgid "Old value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:192 +#: templates/ishtar/import_step_by_step.html:214  msgid "Changed"  msgstr "" -#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:233  msgid "Objects matched with no changes"  msgstr "" -#: templates/ishtar/import_step_by_step.html:241 +#: templates/ishtar/import_step_by_step.html:263  #: templates/ishtar/import_table.html:47  msgid "Source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:250 +#: templates/ishtar/import_step_by_step.html:272  msgid "Interpreted value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:276 +#: templates/ishtar/import_step_by_step.html:298  msgid "Import this line"  msgstr "" -#: templates/ishtar/import_step_by_step.html:302 +#: templates/ishtar/import_step_by_step.html:324  msgid "No modification made to the source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:303 +#: templates/ishtar/import_step_by_step.html:325  msgid ""  "Modification to the source file have been made. Save or cancel theses "  "modification before import." @@ -3100,39 +3153,39 @@ msgstr ""  msgid "Treatments"  msgstr "" -#: views.py:2148 +#: views.py:2190  msgid "Col. "  msgstr "" -#: views.py:2154 views.py:2166 +#: views.py:2196 views.py:2208  msgid "* empty *"  msgstr "" -#: views.py:2207 +#: views.py:2249  msgid "Link unmatched items"  msgstr "" -#: views.py:2228 +#: views.py:2270  msgid "Delete import"  msgstr "" -#: views.py:2267 +#: views.py:2309  msgid "Merge persons"  msgstr "" -#: views.py:2291 +#: views.py:2333  msgid "Select the main person"  msgstr "" -#: views.py:2300 +#: views.py:2342  msgid "Merge organization"  msgstr "" -#: views.py:2310 +#: views.py:2352  msgid "Select the main organization"  msgstr "" -#: views.py:2350 views.py:2366 +#: views.py:2392 views.py:2408  msgid "Corporation manager"  msgstr "" diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index a8dbad749..94a6fcf1e 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -177,7 +177,7 @@ msgstr ""  msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"  msgstr "" -#: data_importer.py:729 views.py:1941 +#: data_importer.py:729 views.py:1946  msgid "No data provided"  msgstr "" @@ -206,55 +206,55 @@ msgid ""  "source file."  msgstr "" -#: data_importer.py:1229 views.py:1987 views.py:1997 +#: data_importer.py:1234 views.py:2024 views.py:2034  msgid "Not imported"  msgstr "" -#: data_importer.py:1554 +#: data_importer.py:1559  msgid "Importer configuration error: field \"{}\" does not exist for {}."  msgstr "" -#: data_importer.py:1639 +#: data_importer.py:1644  msgid "* created *"  msgstr "" -#: data_importer.py:1695 +#: data_importer.py:1700  msgid "* match not find *"  msgstr "" -#: data_importer.py:1704 +#: data_importer.py:1709  msgid "* the query match more than 10 results*"  msgstr "" -#: data_importer.py:1707 +#: data_importer.py:1712  msgid " or "  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "line"  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "col"  msgstr "" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "error"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "field"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "source"  msgstr "" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "result"  msgstr "" -#: data_importer.py:1866 +#: data_importer.py:1871  #, python-format  msgid "\"%(value)s\" not in %(values)s"  msgstr "" @@ -357,8 +357,8 @@ msgstr ""  #: models.py:1538 models.py:1711 models.py:2017 models.py:2329 models.py:2443  #: models.py:2901 models.py:2949 models.py:3148 models_imports.py:95  #: models_imports.py:120 models_imports.py:429 models_imports.py:521 -#: models_imports.py:795 templates/ishtar/import_step_by_step.html:80 -#: templates/ishtar/import_step_by_step.html:248 +#: models_imports.py:807 templates/ishtar/import_step_by_step.html:102 +#: templates/ishtar/import_step_by_step.html:270  #: templates/ishtar/import_table.html:27  #: templates/ishtar/sheet_organization.html:23  msgid "Name" @@ -598,7 +598,7 @@ msgstr ""  msgid "Receipt date"  msgstr "" -#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:827 +#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:839  msgid "Creation date"  msgstr "Gründungsdatum" @@ -704,7 +704,7 @@ msgstr ""  msgid "Manual merge"  msgstr "" -#: ishtar_menu.py:110 models_imports.py:844 +#: ishtar_menu.py:110 models_imports.py:862  msgid "Imports"  msgstr "" @@ -716,7 +716,7 @@ msgstr ""  msgid "Current imports"  msgstr "" -#: ishtar_menu.py:121 views.py:2193 +#: ishtar_menu.py:121 views.py:2235  msgid "Old imports"  msgstr "" @@ -754,10 +754,10 @@ msgstr ""  #: models.py:828 models.py:980 models_imports.py:547  #: templates/ishtar/formset_import_match.html:21 -#: templates/ishtar/import_step_by_step.html:149 -#: templates/ishtar/import_step_by_step.html:177 -#: templates/ishtar/import_step_by_step.html:189 -#: templates/ishtar/import_step_by_step.html:223 +#: templates/ishtar/import_step_by_step.html:171 +#: templates/ishtar/import_step_by_step.html:199 +#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:245  msgid "Key"  msgstr "" @@ -1112,9 +1112,9 @@ msgstr ""  #: models.py:1792 models_imports.py:548  #: templates/ishtar/formset_import_match.html:22 -#: templates/ishtar/import_step_by_step.html:150 -#: templates/ishtar/import_step_by_step.html:178 -#: templates/ishtar/import_step_by_step.html:224 +#: templates/ishtar/import_step_by_step.html:172 +#: templates/ishtar/import_step_by_step.html:200 +#: templates/ishtar/import_step_by_step.html:246  msgid "Value"  msgstr "" @@ -1149,7 +1149,7 @@ msgstr ""  msgid "Document templates"  msgstr "" -#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:821 +#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:833  msgid "State"  msgstr "" @@ -1414,11 +1414,11 @@ msgstr ""  msgid "In progress"  msgstr "" -#: models.py:3162 models_imports.py:769 +#: models.py:3162 models_imports.py:772  msgid "Finished with errors"  msgstr "" -#: models.py:3163 models_imports.py:770 +#: models.py:3163 models_imports.py:773  msgid "Finished"  msgstr "" @@ -1517,8 +1517,8 @@ msgstr ""  msgid "Importer - Default values"  msgstr "" -#: models_imports.py:359 templates/ishtar/import_step_by_step.html:79 -#: templates/ishtar/import_step_by_step.html:247 +#: models_imports.py:359 templates/ishtar/import_step_by_step.html:101 +#: templates/ishtar/import_step_by_step.html:269  msgid "Column number"  msgstr "" @@ -1766,148 +1766,180 @@ msgstr ""  msgid "Importer - Formater types"  msgstr "" -#: models_imports.py:763 +#: models_imports.py:764  #: templates/ishtar/dashboards/dashboard_main_detail.html:132  msgid "Created"  msgstr "" -#: models_imports.py:764 +#: models_imports.py:765  msgid "Analyse in progress"  msgstr "" -#: models_imports.py:765 +#: models_imports.py:766  msgid "Analysed"  msgstr "" -#: models_imports.py:766 -msgid "Import pending" +#: models_imports.py:767 +msgid "Check modified in queue"  msgstr "" -#: models_imports.py:767 +#: models_imports.py:768  msgid "Import in queue"  msgstr "" -#: models_imports.py:768 +#: models_imports.py:769 +msgid "Check modified in progress" +msgstr "" + +#: models_imports.py:770  msgid "Import in progress"  msgstr ""  #: models_imports.py:771 +msgid "Partially imported" +msgstr "" + +#: models_imports.py:774  msgid "Archived"  msgstr "" -#: models_imports.py:798 +#: models_imports.py:810  msgid "Imported file"  msgstr "" -#: models_imports.py:800 +#: models_imports.py:812  msgid "Associated images (zip file)"  msgstr "" -#: models_imports.py:804 +#: models_imports.py:816  msgid "If a group is selected, target key saved in this group will be used."  msgstr "" -#: models_imports.py:807 +#: models_imports.py:819  msgid "Encoding"  msgstr "" -#: models_imports.py:810 +#: models_imports.py:822  msgid "Skip lines"  msgstr "" -#: models_imports.py:811 +#: models_imports.py:823  msgid "Number of header lines in your file (can be 0)."  msgstr "" -#: models_imports.py:812 +#: models_imports.py:824  msgid "Error file"  msgstr "" -#: models_imports.py:815 +#: models_imports.py:827  msgid "Result file"  msgstr "" -#: models_imports.py:818 +#: models_imports.py:830  msgid "Match file"  msgstr "" -#: models_imports.py:824 +#: models_imports.py:836  msgid "Conservative import"  msgstr "" -#: models_imports.py:825 +#: models_imports.py:837  msgid "If set to true, do not overload existing values."  msgstr "" -#: models_imports.py:828 +#: models_imports.py:840  msgid "End date"  msgstr "" -#: models_imports.py:831 +#: models_imports.py:843  msgid "Remaining seconds"  msgstr "" -#: models_imports.py:833 +#: models_imports.py:845  msgid "Current line"  msgstr "" -#: models_imports.py:835 +#: models_imports.py:847  msgid "Number of line"  msgstr "" -#: models_imports.py:838 +#: models_imports.py:850  msgid "Imported line numbers"  msgstr "" -#: models_imports.py:843 +#: models_imports.py:853 +msgid "Changed have been checked" +msgstr "" + +#: models_imports.py:856 +msgid "Changed line numbers" +msgstr "" + +#: models_imports.py:861  msgid "Import"  msgstr "" -#: models_imports.py:903 +#: models_imports.py:950  msgid "Analyse"  msgstr "" -#: models_imports.py:905 models_imports.py:910 +#: models_imports.py:952 models_imports.py:961  msgid "Re-analyse"  msgstr "" -#: models_imports.py:906 +#: models_imports.py:953  msgid "Launch import"  msgstr "" -#: models_imports.py:908 models_imports.py:913 +#: models_imports.py:956  msgid "Step by step import"  msgstr "" -#: models_imports.py:911 +#: models_imports.py:957 models_imports.py:966 +msgid "Re-check for changes" +msgstr "" + +#: models_imports.py:959 models_imports.py:968 +msgid "Check for changes" +msgstr "" + +#: models_imports.py:962  msgid "Re-import"  msgstr "" -#: models_imports.py:914 +#: models_imports.py:965 +msgid "Step by step re-import" +msgstr "" + +#: models_imports.py:969  msgid "Archive"  msgstr "" -#: models_imports.py:916 +#: models_imports.py:971  msgid "Unarchive"  msgstr "" -#: models_imports.py:917 templates/ishtar/form_delete.html:11 widgets.py:258 +#: models_imports.py:972 templates/ishtar/form_delete.html:11 widgets.py:258  msgid "Delete"  msgstr "" -#: models_imports.py:985 +#: models_imports.py:1041 +msgid "Modification check {} added to the queue" +msgstr "" + +#: models_imports.py:1111  msgid "Import {} added to the queue"  msgstr "" -#: models_imports.py:1003 +#: models_imports.py:1129  msgid "Error on imported file: {}"  msgstr "" -#: models_imports.py:1032 +#: models_imports.py:1164  msgid "Import {} finished with errors"  msgstr "" -#: models_imports.py:1038 +#: models_imports.py:1173  msgid "Import {} finished with no errors"  msgstr "" @@ -1955,12 +1987,12 @@ msgid "View on site"  msgstr ""  #: templates/admin/change_form.html:24 templates/admin/change_form.html:27 -#: views.py:1960 views.py:1964 +#: views.py:2000 views.py:2005  msgid "Previous"  msgstr ""  #: templates/admin/change_form.html:32 templates/admin/change_form.html:35 -#: views.py:1972 views.py:1974 +#: views.py:2008 views.py:2011  msgid "Next"  msgstr "" @@ -2357,8 +2389,9 @@ msgstr ""  #: templates/ishtar/formset_import_match.html:5  #: templates/ishtar/formset_import_match.html:54 -#: templates/ishtar/import_step_by_step.html:112 -#: templates/ishtar/import_step_by_step.html:291 +#: templates/ishtar/import_step_by_step.html:6 +#: templates/ishtar/import_step_by_step.html:134 +#: templates/ishtar/import_step_by_step.html:313  msgid "Back to import list"  msgstr "" @@ -2390,66 +2423,78 @@ msgstr ""  msgid "Autorefresh the table (useful when waiting for an import result)"  msgstr "" -#: templates/ishtar/import_step_by_step.html:12 +#: templates/ishtar/import_step_by_step.html:14 +msgid "Add/modified" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:20 +msgid "All lines" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:33  msgid "Already imported"  msgstr "" -#: templates/ishtar/import_step_by_step.html:24 +#: templates/ishtar/import_step_by_step.html:34 +msgid "No changes" +msgstr "" + +#: templates/ishtar/import_step_by_step.html:46  msgid "Line"  msgstr "" -#: templates/ishtar/import_step_by_step.html:32 +#: templates/ishtar/import_step_by_step.html:54  msgid "Go"  msgstr "" -#: templates/ishtar/import_step_by_step.html:41 views.py:1845 +#: templates/ishtar/import_step_by_step.html:63 views.py:1850  msgid "Import step by step"  msgstr "" -#: templates/ishtar/import_step_by_step.html:41 +#: templates/ishtar/import_step_by_step.html:63  msgid "line "  msgstr "" -#: templates/ishtar/import_step_by_step.html:45 +#: templates/ishtar/import_step_by_step.html:67  msgid "This line have been already imported."  msgstr "" -#: templates/ishtar/import_step_by_step.html:51 +#: templates/ishtar/import_step_by_step.html:73  msgid ""  "The following error(s) has been encountered while parsing the source file:"  msgstr "" -#: templates/ishtar/import_step_by_step.html:54 +#: templates/ishtar/import_step_by_step.html:76  msgid "Column"  msgstr "" -#: templates/ishtar/import_step_by_step.html:55 +#: templates/ishtar/import_step_by_step.html:77  #: templates/ishtar/import_table.html:34  msgid "Error"  msgstr "" -#: templates/ishtar/import_step_by_step.html:62 +#: templates/ishtar/import_step_by_step.html:84  msgid "Col."  msgstr "" -#: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:249 +#: templates/ishtar/import_step_by_step.html:103 +#: templates/ishtar/import_step_by_step.html:271  msgid "Raw value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:191 -#: templates/ishtar/import_step_by_step.html:251 +#: templates/ishtar/import_step_by_step.html:104 +#: templates/ishtar/import_step_by_step.html:213 +#: templates/ishtar/import_step_by_step.html:273  msgid "New value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:269 +#: templates/ishtar/import_step_by_step.html:120 +#: templates/ishtar/import_step_by_step.html:291  msgid "Update source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:104 -#: templates/ishtar/import_step_by_step.html:283 +#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:305  #: templates/ishtar/organization_form.html:40  #: templates/ishtar/organization_person_form.html:35  #: templates/ishtar/person_form.html:46 @@ -2457,65 +2502,65 @@ msgstr ""  msgid "Cancel"  msgstr "" -#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:148  msgid "No change for this item."  msgstr "" -#: templates/ishtar/import_step_by_step.html:131 +#: templates/ishtar/import_step_by_step.html:153  msgid "Changes will be made for this item"  msgstr "" -#: templates/ishtar/import_step_by_step.html:134 +#: templates/ishtar/import_step_by_step.html:156  msgid "New objects will be created."  msgstr "" -#: templates/ishtar/import_step_by_step.html:140 +#: templates/ishtar/import_step_by_step.html:162  msgid "Objects to be created"  msgstr "" -#: templates/ishtar/import_step_by_step.html:165 +#: templates/ishtar/import_step_by_step.html:187  msgid "Objects to be updated"  msgstr "" -#: templates/ishtar/import_step_by_step.html:174 -#: templates/ishtar/import_step_by_step.html:220 +#: templates/ishtar/import_step_by_step.html:196 +#: templates/ishtar/import_step_by_step.html:242  msgid "Matching values"  msgstr "" -#: templates/ishtar/import_step_by_step.html:186 +#: templates/ishtar/import_step_by_step.html:208  msgid "Updated values"  msgstr "" -#: templates/ishtar/import_step_by_step.html:190 +#: templates/ishtar/import_step_by_step.html:212  msgid "Old value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:192 +#: templates/ishtar/import_step_by_step.html:214  msgid "Changed"  msgstr "" -#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:233  msgid "Objects matched with no changes"  msgstr "" -#: templates/ishtar/import_step_by_step.html:241 +#: templates/ishtar/import_step_by_step.html:263  #: templates/ishtar/import_table.html:47  msgid "Source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:250 +#: templates/ishtar/import_step_by_step.html:272  msgid "Interpreted value"  msgstr "" -#: templates/ishtar/import_step_by_step.html:276 +#: templates/ishtar/import_step_by_step.html:298  msgid "Import this line"  msgstr "" -#: templates/ishtar/import_step_by_step.html:302 +#: templates/ishtar/import_step_by_step.html:324  msgid "No modification made to the source file"  msgstr "" -#: templates/ishtar/import_step_by_step.html:303 +#: templates/ishtar/import_step_by_step.html:325  msgid ""  "Modification to the source file have been made. Save or cancel theses "  "modification before import." @@ -3100,39 +3145,39 @@ msgstr ""  msgid "Treatments"  msgstr "" -#: views.py:2148 +#: views.py:2190  msgid "Col. "  msgstr "" -#: views.py:2154 views.py:2166 +#: views.py:2196 views.py:2208  msgid "* empty *"  msgstr "" -#: views.py:2207 +#: views.py:2249  msgid "Link unmatched items"  msgstr "" -#: views.py:2228 +#: views.py:2270  msgid "Delete import"  msgstr "" -#: views.py:2267 +#: views.py:2309  msgid "Merge persons"  msgstr "" -#: views.py:2291 +#: views.py:2333  msgid "Select the main person"  msgstr "" -#: views.py:2300 +#: views.py:2342  msgid "Merge organization"  msgstr "" -#: views.py:2310 +#: views.py:2352  msgid "Select the main organization"  msgstr "" -#: views.py:2350 views.py:2366 +#: views.py:2392 views.py:2408  msgid "Corporation manager"  msgstr "" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 1958f62da..6db2ae000 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -12,7 +12,7 @@ msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2018-04-04 11:07-0400\n" +"PO-Revision-Date: 2018-04-09 09:47-0400\n"  "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n" @@ -189,7 +189,7 @@ msgstr ""  msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d"  msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: data_importer.py:729 views.py:1941 +#: data_importer.py:729 views.py:1946  msgid "No data provided"  msgstr "Aucune donnée fournie" @@ -222,57 +222,57 @@ msgstr ""  "L'élément {} avec les valeurs {} n'existe pas dans la base de données. Créez-"  "le d'abord ou corrigez votre fichier source." -#: data_importer.py:1229 views.py:1987 views.py:1997 +#: data_importer.py:1234 views.py:2024 views.py:2034  msgid "Not imported"  msgstr "Non importé" -#: data_importer.py:1554 +#: data_importer.py:1559  msgid "Importer configuration error: field \"{}\" does not exist for {}."  msgstr ""  "Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour "  "{}." -#: data_importer.py:1639 +#: data_importer.py:1644  msgid "* created *"  msgstr "* créé *" -#: data_importer.py:1695 +#: data_importer.py:1700  msgid "* match not find *"  msgstr "* correspondance non trouvée *" -#: data_importer.py:1704 +#: data_importer.py:1709  msgid "* the query match more than 10 results*"  msgstr "* la requête correspond à plus de 10 résultats *" -#: data_importer.py:1707 +#: data_importer.py:1712  msgid " or "  msgstr "ou" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "line"  msgstr "ligne" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "col"  msgstr "colonne" -#: data_importer.py:1844 +#: data_importer.py:1849  msgid "error"  msgstr "erreur" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "field"  msgstr "champ" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "source"  msgstr "source" -#: data_importer.py:1850 +#: data_importer.py:1855  msgid "result"  msgstr "résultat" -#: data_importer.py:1866 +#: data_importer.py:1871  #, python-format  msgid "\"%(value)s\" not in %(values)s"  msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -384,8 +384,8 @@ msgstr "Organisation"  #: models.py:1538 models.py:1711 models.py:2017 models.py:2329 models.py:2443  #: models.py:2901 models.py:2949 models.py:3148 models_imports.py:95  #: models_imports.py:120 models_imports.py:429 models_imports.py:521 -#: models_imports.py:795 templates/ishtar/import_step_by_step.html:80 -#: templates/ishtar/import_step_by_step.html:248 +#: models_imports.py:807 templates/ishtar/import_step_by_step.html:102 +#: templates/ishtar/import_step_by_step.html:270  #: templates/ishtar/import_table.html:27  #: templates/ishtar/sheet_organization.html:23  msgid "Name" @@ -627,7 +627,7 @@ msgstr "Ressource numérique (adresse web)"  msgid "Receipt date"  msgstr "Date de réception" -#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:827 +#: forms_common.py:909 models.py:2843 models.py:2913 models_imports.py:839  msgid "Creation date"  msgstr "Date de création" @@ -733,7 +733,7 @@ msgstr "Fusion automatique"  msgid "Manual merge"  msgstr "Fusion manuelle" -#: ishtar_menu.py:110 models_imports.py:844 +#: ishtar_menu.py:110 models_imports.py:862  msgid "Imports"  msgstr "Imports" @@ -745,7 +745,7 @@ msgstr "Nouvel import"  msgid "Current imports"  msgstr "Imports en cours" -#: ishtar_menu.py:121 views.py:2193 +#: ishtar_menu.py:121 views.py:2235  msgid "Old imports"  msgstr "Anciens imports" @@ -786,10 +786,10 @@ msgstr "Disponible"  #: models.py:828 models.py:980 models_imports.py:547  #: templates/ishtar/formset_import_match.html:21 -#: templates/ishtar/import_step_by_step.html:149 -#: templates/ishtar/import_step_by_step.html:177 -#: templates/ishtar/import_step_by_step.html:189 -#: templates/ishtar/import_step_by_step.html:223 +#: templates/ishtar/import_step_by_step.html:171 +#: templates/ishtar/import_step_by_step.html:199 +#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:245  msgid "Key"  msgstr "Clé" @@ -1181,9 +1181,9 @@ msgstr "Description de la variable"  #: models.py:1792 models_imports.py:548  #: templates/ishtar/formset_import_match.html:22 -#: templates/ishtar/import_step_by_step.html:150 -#: templates/ishtar/import_step_by_step.html:178 -#: templates/ishtar/import_step_by_step.html:224 +#: templates/ishtar/import_step_by_step.html:172 +#: templates/ishtar/import_step_by_step.html:200 +#: templates/ishtar/import_step_by_step.html:246  msgid "Value"  msgstr "Valeur" @@ -1218,7 +1218,7 @@ msgstr "Patron de document"  msgid "Document templates"  msgstr "Patrons de document" -#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:821 +#: models.py:2117 models.py:2130 models.py:3171 models_imports.py:833  msgid "State"  msgstr "État" @@ -1485,11 +1485,11 @@ msgstr "Planifié"  msgid "In progress"  msgstr "En cours" -#: models.py:3162 models_imports.py:769 +#: models.py:3162 models_imports.py:772  msgid "Finished with errors"  msgstr "Terminé avec des erreurs" -#: models.py:3163 models_imports.py:770 +#: models.py:3163 models_imports.py:773  msgid "Finished"  msgstr "Terminé" @@ -1596,8 +1596,8 @@ msgstr "Importeur - Valeur par défaut"  msgid "Importer - Default values"  msgstr "Importeur - Valeurs par défaut" -#: models_imports.py:359 templates/ishtar/import_step_by_step.html:79 -#: templates/ishtar/import_step_by_step.html:247 +#: models_imports.py:359 templates/ishtar/import_step_by_step.html:101 +#: templates/ishtar/import_step_by_step.html:269  msgid "Column number"  msgstr "Numéro de colonne" @@ -1847,150 +1847,182 @@ msgstr "Importeur - Type de mise en forme"  msgid "Importer - Formater types"  msgstr "Importeur - Types de mise en forme" -#: models_imports.py:763 +#: models_imports.py:764  #: templates/ishtar/dashboards/dashboard_main_detail.html:132  msgid "Created"  msgstr "Créé" -#: models_imports.py:764 +#: models_imports.py:765  msgid "Analyse in progress"  msgstr "Analyse en cours" -#: models_imports.py:765 +#: models_imports.py:766  msgid "Analysed"  msgstr "Analysé" -#: models_imports.py:766 -msgid "Import pending" -msgstr "Import en attente" -  #: models_imports.py:767 +msgid "Check modified in queue" +msgstr "Vérification des modifications dans la file" + +#: models_imports.py:768  msgid "Import in queue"  msgstr "Import en file d'attente" -#: models_imports.py:768 +#: models_imports.py:769 +msgid "Check modified in progress" +msgstr "Vérification des modifications en cours" + +#: models_imports.py:770  msgid "Import in progress"  msgstr "Import en cours"  #: models_imports.py:771 +msgid "Partially imported" +msgstr "Importé partiellement" + +#: models_imports.py:774  msgid "Archived"  msgstr "Archivé" -#: models_imports.py:798 +#: models_imports.py:810  msgid "Imported file"  msgstr "Fichier importé" -#: models_imports.py:800 +#: models_imports.py:812  msgid "Associated images (zip file)"  msgstr "Images associées (fichier zip)" -#: models_imports.py:804 +#: models_imports.py:816  msgid "If a group is selected, target key saved in this group will be used."  msgstr ""  "Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce "  "groupe sont utilisées." -#: models_imports.py:807 +#: models_imports.py:819  msgid "Encoding"  msgstr "Codage" -#: models_imports.py:810 +#: models_imports.py:822  msgid "Skip lines"  msgstr "Nombre de lignes d'entête" -#: models_imports.py:811 +#: models_imports.py:823  msgid "Number of header lines in your file (can be 0)."  msgstr "Nombre de ligne d'entête dans votre fichier (peut être égal à zéro)" -#: models_imports.py:812 +#: models_imports.py:824  msgid "Error file"  msgstr "Fichier erreur" -#: models_imports.py:815 +#: models_imports.py:827  msgid "Result file"  msgstr "Fichier résultant" -#: models_imports.py:818 +#: models_imports.py:830  msgid "Match file"  msgstr "Fichier de correspondance" -#: models_imports.py:824 +#: models_imports.py:836  msgid "Conservative import"  msgstr "Import conservateur" -#: models_imports.py:825 +#: models_imports.py:837  msgid "If set to true, do not overload existing values."  msgstr "Si coché, ne surchargera pas les valeurs existantes." -#: models_imports.py:828 +#: models_imports.py:840  msgid "End date"  msgstr "Date de fin" -#: models_imports.py:831 +#: models_imports.py:843  msgid "Remaining seconds"  msgstr "Secondes restantes" -#: models_imports.py:833 +#: models_imports.py:845  msgid "Current line"  msgstr "Ligne actuelle" -#: models_imports.py:835 +#: models_imports.py:847  msgid "Number of line"  msgstr "Nombre de ligne" -#: models_imports.py:838 +#: models_imports.py:850  msgid "Imported line numbers"  msgstr "Numéros des lignes importées" -#: models_imports.py:843 +#: models_imports.py:853 +msgid "Changed have been checked" +msgstr "Les changements ont été vérifiés" + +#: models_imports.py:856 +msgid "Changed line numbers" +msgstr "Numéro des lignes modifiées" + +#: models_imports.py:861  msgid "Import"  msgstr "Import" -#: models_imports.py:903 +#: models_imports.py:950  msgid "Analyse"  msgstr "Analyser" -#: models_imports.py:905 models_imports.py:910 +#: models_imports.py:952 models_imports.py:961  msgid "Re-analyse"  msgstr "Analyser de nouveau " -#: models_imports.py:906 +#: models_imports.py:953  msgid "Launch import"  msgstr "Lancer l'import" -#: models_imports.py:908 models_imports.py:913 +#: models_imports.py:956  msgid "Step by step import"  msgstr "Import pas à pas" -#: models_imports.py:911 +#: models_imports.py:957 models_imports.py:966 +msgid "Re-check for changes" +msgstr "Re-vérifier les changements" + +#: models_imports.py:959 models_imports.py:968 +msgid "Check for changes" +msgstr "Vérifier les changements" + +#: models_imports.py:962  msgid "Re-import"  msgstr "Ré-importer" -#: models_imports.py:914 +#: models_imports.py:965 +msgid "Step by step re-import" +msgstr "Ré-import pas à pas" + +#: models_imports.py:969  msgid "Archive"  msgstr "Archiver" -#: models_imports.py:916 +#: models_imports.py:971  msgid "Unarchive"  msgstr "Désarchiver" -#: models_imports.py:917 templates/ishtar/form_delete.html:11 widgets.py:258 +#: models_imports.py:972 templates/ishtar/form_delete.html:11 widgets.py:258  msgid "Delete"  msgstr "Supprimer" -#: models_imports.py:985 +#: models_imports.py:1041 +msgid "Modification check {} added to the queue" +msgstr "Vérification des changements {} ajouté à la file" + +#: models_imports.py:1111  msgid "Import {} added to the queue"  msgstr "Import {} ajouté à la file d'attente" -#: models_imports.py:1003 +#: models_imports.py:1129  msgid "Error on imported file: {}"  msgstr "Erreur sur le fichier d'import : {}" -#: models_imports.py:1032 +#: models_imports.py:1164  msgid "Import {} finished with errors"  msgstr "Import {} fini avec des erreurs" -#: models_imports.py:1038 +#: models_imports.py:1173  msgid "Import {} finished with no errors"  msgstr "Import {} fini avec aucune erreur" @@ -2038,12 +2070,12 @@ msgid "View on site"  msgstr "Voir sur le site"  #: templates/admin/change_form.html:24 templates/admin/change_form.html:27 -#: views.py:1960 views.py:1964 +#: views.py:2000 views.py:2005  msgid "Previous"  msgstr "Précédent"  #: templates/admin/change_form.html:32 templates/admin/change_form.html:35 -#: views.py:1972 views.py:1974 +#: views.py:2008 views.py:2011  msgid "Next"  msgstr "Suivant" @@ -2455,8 +2487,9 @@ msgstr "Rechercher et sélectionner un élément dans le tableau"  #: templates/ishtar/formset_import_match.html:5  #: templates/ishtar/formset_import_match.html:54 -#: templates/ishtar/import_step_by_step.html:112 -#: templates/ishtar/import_step_by_step.html:291 +#: templates/ishtar/import_step_by_step.html:6 +#: templates/ishtar/import_step_by_step.html:134 +#: templates/ishtar/import_step_by_step.html:313  msgid "Back to import list"  msgstr "Retour à la liste des imports" @@ -2490,68 +2523,80 @@ msgstr ""  "Rafraîchissement automatique de la table (utile lorsque l'on est en attente "  "d'un résultat d'import)" -#: templates/ishtar/import_step_by_step.html:12 +#: templates/ishtar/import_step_by_step.html:14 +msgid "Add/modified" +msgstr "Ajout/modification" + +#: templates/ishtar/import_step_by_step.html:20 +msgid "All lines" +msgstr "Toutes les lignes" + +#: templates/ishtar/import_step_by_step.html:33  msgid "Already imported"  msgstr "Déjà importé" -#: templates/ishtar/import_step_by_step.html:24 +#: templates/ishtar/import_step_by_step.html:34 +msgid "No changes" +msgstr "Pas de changement" + +#: templates/ishtar/import_step_by_step.html:46  msgid "Line"  msgstr "Ligne" -#: templates/ishtar/import_step_by_step.html:32 +#: templates/ishtar/import_step_by_step.html:54  msgid "Go"  msgstr "Aller" -#: templates/ishtar/import_step_by_step.html:41 views.py:1845 +#: templates/ishtar/import_step_by_step.html:63 views.py:1850  msgid "Import step by step"  msgstr "Import pas à pas" -#: templates/ishtar/import_step_by_step.html:41 +#: templates/ishtar/import_step_by_step.html:63  msgid "line "  msgstr "ligne" -#: templates/ishtar/import_step_by_step.html:45 +#: templates/ishtar/import_step_by_step.html:67  msgid "This line have been already imported."  msgstr "Cette ligne a déjà été importée" -#: templates/ishtar/import_step_by_step.html:51 +#: templates/ishtar/import_step_by_step.html:73  msgid ""  "The following error(s) has been encountered while parsing the source file:"  msgstr ""  "Le(s) erreur(s) suivante(s) ont été rencontrées lors de l'analyse du fichier "  "source :" -#: templates/ishtar/import_step_by_step.html:54 +#: templates/ishtar/import_step_by_step.html:76  msgid "Column"  msgstr "Colonne" -#: templates/ishtar/import_step_by_step.html:55 +#: templates/ishtar/import_step_by_step.html:77  #: templates/ishtar/import_table.html:34  msgid "Error"  msgstr "Erreur" -#: templates/ishtar/import_step_by_step.html:62 +#: templates/ishtar/import_step_by_step.html:84  msgid "Col."  msgstr "Col." -#: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:249 +#: templates/ishtar/import_step_by_step.html:103 +#: templates/ishtar/import_step_by_step.html:271  msgid "Raw value"  msgstr "Valeur brute" -#: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:191 -#: templates/ishtar/import_step_by_step.html:251 +#: templates/ishtar/import_step_by_step.html:104 +#: templates/ishtar/import_step_by_step.html:213 +#: templates/ishtar/import_step_by_step.html:273  msgid "New value"  msgstr "Nouvelle valeur" -#: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:269 +#: templates/ishtar/import_step_by_step.html:120 +#: templates/ishtar/import_step_by_step.html:291  msgid "Update source file"  msgstr "Mettre à jour le fichier source" -#: templates/ishtar/import_step_by_step.html:104 -#: templates/ishtar/import_step_by_step.html:283 +#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:305  #: templates/ishtar/organization_form.html:40  #: templates/ishtar/organization_person_form.html:35  #: templates/ishtar/person_form.html:46 @@ -2559,65 +2604,65 @@ msgstr "Mettre à jour le fichier source"  msgid "Cancel"  msgstr "Annuler" -#: templates/ishtar/import_step_by_step.html:126 +#: templates/ishtar/import_step_by_step.html:148  msgid "No change for this item."  msgstr "Pas de changement pour cet élément." -#: templates/ishtar/import_step_by_step.html:131 +#: templates/ishtar/import_step_by_step.html:153  msgid "Changes will be made for this item"  msgstr "Des changements vont être fait pour cet élément" -#: templates/ishtar/import_step_by_step.html:134 +#: templates/ishtar/import_step_by_step.html:156  msgid "New objects will be created."  msgstr "Des nouveaux objets vont être créés." -#: templates/ishtar/import_step_by_step.html:140 +#: templates/ishtar/import_step_by_step.html:162  msgid "Objects to be created"  msgstr "Objets qui vont être créés" -#: templates/ishtar/import_step_by_step.html:165 +#: templates/ishtar/import_step_by_step.html:187  msgid "Objects to be updated"  msgstr "Objets qui vont être mis à jour" -#: templates/ishtar/import_step_by_step.html:174 -#: templates/ishtar/import_step_by_step.html:220 +#: templates/ishtar/import_step_by_step.html:196 +#: templates/ishtar/import_step_by_step.html:242  msgid "Matching values"  msgstr "Valeurs correspondantes" -#: templates/ishtar/import_step_by_step.html:186 +#: templates/ishtar/import_step_by_step.html:208  msgid "Updated values"  msgstr "Valeurs mises à jour" -#: templates/ishtar/import_step_by_step.html:190 +#: templates/ishtar/import_step_by_step.html:212  msgid "Old value"  msgstr "Ancienne valeur" -#: templates/ishtar/import_step_by_step.html:192 +#: templates/ishtar/import_step_by_step.html:214  msgid "Changed"  msgstr "Modifié" -#: templates/ishtar/import_step_by_step.html:211 +#: templates/ishtar/import_step_by_step.html:233  msgid "Objects matched with no changes"  msgstr "Objets mis en correspondance sans changement" -#: templates/ishtar/import_step_by_step.html:241 +#: templates/ishtar/import_step_by_step.html:263  #: templates/ishtar/import_table.html:47  msgid "Source file"  msgstr "Fichier source" -#: templates/ishtar/import_step_by_step.html:250 +#: templates/ishtar/import_step_by_step.html:272  msgid "Interpreted value"  msgstr "Valeur interprétée" -#: templates/ishtar/import_step_by_step.html:276 +#: templates/ishtar/import_step_by_step.html:298  msgid "Import this line"  msgstr "Importer cette ligne" -#: templates/ishtar/import_step_by_step.html:302 +#: templates/ishtar/import_step_by_step.html:324  msgid "No modification made to the source file"  msgstr "Pas de modification faite sur ce fichier source" -#: templates/ishtar/import_step_by_step.html:303 +#: templates/ishtar/import_step_by_step.html:325  msgid ""  "Modification to the source file have been made. Save or cancel theses "  "modification before import." @@ -3223,39 +3268,39 @@ msgstr "Demandes de traitement"  msgid "Treatments"  msgstr "Traitements" -#: views.py:2148 +#: views.py:2190  msgid "Col. "  msgstr "Col." -#: views.py:2154 views.py:2166 +#: views.py:2196 views.py:2208  msgid "* empty *"  msgstr "* vide *" -#: views.py:2207 +#: views.py:2249  msgid "Link unmatched items"  msgstr "Associer les éléments non rapprochés" -#: views.py:2228 +#: views.py:2270  msgid "Delete import"  msgstr "Supprimer un import" -#: views.py:2267 +#: views.py:2309  msgid "Merge persons"  msgstr "Fusionner des personnes" -#: views.py:2291 +#: views.py:2333  msgid "Select the main person"  msgstr "Choisir la personne principale" -#: views.py:2300 +#: views.py:2342  msgid "Merge organization"  msgstr "Fusionner des organisations" -#: views.py:2310 +#: views.py:2352  msgid "Select the main organization"  msgstr "Sélectionner l'organisation principale" -#: views.py:2350 views.py:2366 +#: views.py:2392 views.py:2408  msgid "Corporation manager"  msgstr "Représentant de la personne morale" | 
