diff options
| -rw-r--r-- | archaeological_operations/locale/django.pot | 14 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 165 | ||||
| -rw-r--r-- | translations/de/ishtar_common.po | 145 | ||||
| -rw-r--r-- | translations/fr/archaeological_operations.po | 17 | ||||
| -rw-r--r-- | translations/fr/ishtar_common.po | 147 |
5 files changed, 267 insertions, 221 deletions
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 4a94d000f..f35cb461a 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -1474,6 +1474,20 @@ msgstr "" msgid "This act is indexed!" msgstr "" +#: tests.py:507 +msgid "New objects will be created." +msgstr "" + +#: tests.py:537 +#| msgid "This reference already exists." +msgid "This line have been already imported." +msgstr "" + +#: tests.py:573 +msgid "" +"The following error(s) has been encountered while parsing the source file:" +msgstr "" + #: views.py:246 msgid "New operation" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 9fa0217eb..7a28347cc 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -22,66 +22,66 @@ msgstr "" msgid "Related item" msgstr "" -#: admin.py:68 +#: admin.py:72 msgid "CSV file" msgstr "" -#: admin.py:69 +#: admin.py:73 msgid "Only unicode encoding is managed - convert your file first" msgstr "" -#: admin.py:74 +#: admin.py:78 msgid "Export selected as CSV file" msgstr "" -#: admin.py:197 admin.py:216 models.py:813 +#: admin.py:201 admin.py:220 models.py:813 msgid "Parent" msgstr "" -#: admin.py:204 +#: admin.py:208 msgid "Center" msgstr "" -#: admin.py:206 models.py:2953 +#: admin.py:210 models.py:2953 msgid "Limit" msgstr "" -#: admin.py:209 models.py:2963 +#: admin.py:213 models.py:2963 msgid "Town children" msgstr "" -#: admin.py:217 +#: admin.py:221 msgid "Parents" msgstr "" -#: admin.py:288 +#: admin.py:365 msgid "The CSV file should at least have a slug/txt_idx column" msgstr "" -#: admin.py:345 +#: admin.py:422 #, python-format msgid "%d item(s) created." msgstr "" -#: admin.py:349 +#: admin.py:426 #, python-format msgid "%d item(s) updated." msgstr "" -#: admin.py:353 +#: admin.py:430 msgid "These parents are missing: {}" msgstr "" -#: admin.py:569 models.py:1712 +#: admin.py:646 models.py:1712 msgid "Form" msgstr "" -#: admin.py:571 models.py:1737 models_imports.py:124 +#: admin.py:648 models.py:1737 models_imports.py:124 #: templates/ishtar/dashboards/dashboard_main.html:39 msgid "Users" msgstr "" -#: admin.py:591 models.py:1781 +#: admin.py:668 models.py:1781 msgid "Field" msgstr "" @@ -204,7 +204,7 @@ msgid "" "source file." msgstr "" -#: data_importer.py:1229 +#: data_importer.py:1229 views.py:1987 views.py:1997 msgid "Not imported" msgstr "" @@ -213,7 +213,6 @@ msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" #: data_importer.py:1639 -#| msgid "Created" msgid "* created *" msgstr "" @@ -357,7 +356,7 @@ msgstr "" #: 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:243 +#: templates/ishtar/import_step_by_step.html:248 #: templates/ishtar/import_table.html:27 #: templates/ishtar/sheet_organization.html:23 msgid "Name" @@ -715,7 +714,7 @@ msgstr "" msgid "Current imports" msgstr "" -#: ishtar_menu.py:121 views.py:2183 +#: ishtar_menu.py:121 views.py:2193 msgid "Old imports" msgstr "" @@ -753,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:144 -#: templates/ishtar/import_step_by_step.html:172 -#: templates/ishtar/import_step_by_step.html:184 -#: templates/ishtar/import_step_by_step.html:218 +#: 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 msgid "Key" msgstr "" @@ -1112,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:145 -#: templates/ishtar/import_step_by_step.html:173 -#: templates/ishtar/import_step_by_step.html:219 +#: templates/ishtar/import_step_by_step.html:150 +#: templates/ishtar/import_step_by_step.html:178 +#: templates/ishtar/import_step_by_step.html:224 msgid "Value" msgstr "" @@ -1517,7 +1516,7 @@ msgid "Importer - Default values" msgstr "" #: models_imports.py:359 templates/ishtar/import_step_by_step.html:79 -#: templates/ishtar/import_step_by_step.html:242 +#: templates/ishtar/import_step_by_step.html:247 msgid "Column number" msgstr "" @@ -1847,17 +1846,14 @@ msgid "Remaining seconds" msgstr "" #: models_imports.py:833 -#| msgid "Current items" msgid "Current line" msgstr "" #: models_imports.py:835 -#| msgid "Number" msgid "Number of line" msgstr "" #: models_imports.py:838 -#| msgid "Import in queue" msgid "Imported line numbers" msgstr "" @@ -1878,7 +1874,6 @@ msgid "Launch import" msgstr "" #: models_imports.py:908 models_imports.py:913 -#| msgid "Delete import" msgid "Step by step import" msgstr "" @@ -1948,6 +1943,26 @@ msgstr "" msgid "The %(app_name)s team" msgstr "" +#: templates/admin/change_form.html:19 +#: templates/ishtar/blocks/window_nav.html:5 +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 +msgid "Previous" +msgstr "" + +#: templates/admin/change_form.html:32 templates/admin/change_form.html:35 +#: views.py:1972 views.py:1974 +msgid "Next" +msgstr "" + #: templates/admin/gen_change_list.html:9 #, python-format msgid "Add %(name)s" @@ -2211,10 +2226,6 @@ msgstr "" msgid "Internal ID" msgstr "" -#: templates/ishtar/blocks/window_nav.html:5 -msgid "History" -msgstr "" - #: templates/ishtar/blocks/window_nav.html:17 msgid "" "Are you sure to restore to this version? All changes made since this version " @@ -2346,7 +2357,7 @@ 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:286 +#: templates/ishtar/import_step_by_step.html:291 msgid "Back to import list" msgstr "" @@ -2379,7 +2390,6 @@ msgid "Autorefresh the table (useful when waiting for an import result)" msgstr "" #: templates/ishtar/import_step_by_step.html:12 -#| msgid "Old imports" msgid "Already imported" msgstr "" @@ -2396,12 +2406,10 @@ msgid "Import step by step" msgstr "" #: templates/ishtar/import_step_by_step.html:41 -#| msgid "line" msgid "line " msgstr "" #: templates/ishtar/import_step_by_step.html:45 -#| msgid "This item already exists." msgid "This line have been already imported." msgstr "" @@ -2411,7 +2419,6 @@ msgid "" msgstr "" #: templates/ishtar/import_step_by_step.html:54 -#| msgid "Column number" msgid "Column" msgstr "" @@ -2425,25 +2432,23 @@ msgid "Col." msgstr "" #: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:244 -#| msgid "Raw name" +#: templates/ishtar/import_step_by_step.html:249 msgid "Raw value" msgstr "" #: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:186 -#: templates/ishtar/import_step_by_step.html:246 +#: templates/ishtar/import_step_by_step.html:191 +#: templates/ishtar/import_step_by_step.html:251 msgid "New value" msgstr "" #: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:264 -#| msgid "Source file" +#: templates/ishtar/import_step_by_step.html:269 msgid "Update source file" msgstr "" #: templates/ishtar/import_step_by_step.html:104 -#: templates/ishtar/import_step_by_step.html:278 +#: templates/ishtar/import_step_by_step.html:283 #: templates/ishtar/organization_form.html:40 #: templates/ishtar/organization_person_form.html:35 #: templates/ishtar/person_form.html:46 @@ -2452,67 +2457,65 @@ msgid "Cancel" msgstr "" #: templates/ishtar/import_step_by_step.html:126 -#| msgid "No data for these criteria." msgid "No change for this item." msgstr "" -#: templates/ishtar/import_step_by_step.html:130 +#: templates/ishtar/import_step_by_step.html:131 msgid "Changes will be made for this item" msgstr "" -#: templates/ishtar/import_step_by_step.html:135 +#: templates/ishtar/import_step_by_step.html:134 +#| msgid "Objects to be created" +msgid "New objects will be created." +msgstr "" + +#: templates/ishtar/import_step_by_step.html:140 msgid "Objects to be created" msgstr "" -#: templates/ishtar/import_step_by_step.html:160 -#| msgid "Object type" +#: templates/ishtar/import_step_by_step.html:165 msgid "Objects to be updated" msgstr "" -#: templates/ishtar/import_step_by_step.html:169 -#: templates/ishtar/import_step_by_step.html:215 -#| msgid "Match file" +#: templates/ishtar/import_step_by_step.html:174 +#: templates/ishtar/import_step_by_step.html:220 msgid "Matching values" msgstr "" -#: templates/ishtar/import_step_by_step.html:181 +#: templates/ishtar/import_step_by_step.html:186 msgid "Updated values" msgstr "" -#: templates/ishtar/import_step_by_step.html:185 +#: templates/ishtar/import_step_by_step.html:190 msgid "Old value" msgstr "" -#: templates/ishtar/import_step_by_step.html:187 -#| msgid "Change" +#: templates/ishtar/import_step_by_step.html:192 msgid "Changed" msgstr "" -#: templates/ishtar/import_step_by_step.html:206 +#: templates/ishtar/import_step_by_step.html:211 msgid "Objects matched with no changes" msgstr "" -#: templates/ishtar/import_step_by_step.html:236 +#: templates/ishtar/import_step_by_step.html:241 #: templates/ishtar/import_table.html:47 msgid "Source file" msgstr "" -#: templates/ishtar/import_step_by_step.html:245 -#| msgid "Imported file" +#: templates/ishtar/import_step_by_step.html:250 msgid "Interpreted value" msgstr "" -#: templates/ishtar/import_step_by_step.html:271 -#| msgid "Imported file" +#: templates/ishtar/import_step_by_step.html:276 msgid "Import this line" msgstr "" -#: templates/ishtar/import_step_by_step.html:297 -#| msgid "No town set in the associated file." +#: templates/ishtar/import_step_by_step.html:302 msgid "No modification made to the source file" msgstr "" -#: templates/ishtar/import_step_by_step.html:298 +#: templates/ishtar/import_step_by_step.html:303 msgid "" "Modification to the source file have been made. Save or cancel theses " "modification before import." @@ -3097,47 +3100,39 @@ msgstr "" msgid "Treatments" msgstr "" -#: views.py:1957 views.py:1961 -msgid "Previous" -msgstr "" - -#: views.py:1969 views.py:1971 -msgid "Next" -msgstr "" - -#: views.py:2138 +#: views.py:2148 msgid "Col. " msgstr "" -#: views.py:2144 views.py:2156 +#: views.py:2154 views.py:2166 msgid "* empty *" msgstr "" -#: views.py:2197 +#: views.py:2207 msgid "Link unmatched items" msgstr "" -#: views.py:2218 +#: views.py:2228 msgid "Delete import" msgstr "" -#: views.py:2257 +#: views.py:2267 msgid "Merge persons" msgstr "" -#: views.py:2281 +#: views.py:2291 msgid "Select the main person" msgstr "" -#: views.py:2290 +#: views.py:2300 msgid "Merge organization" msgstr "" -#: views.py:2300 +#: views.py:2310 msgid "Select the main organization" msgstr "" -#: views.py:2340 views.py:2356 +#: views.py:2350 views.py:2366 msgid "Corporation manager" msgstr "" diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index 715604838..a8dbad749 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -24,66 +24,66 @@ msgstr "E-Mail-Adresse" msgid "Related item" msgstr "" -#: admin.py:68 +#: admin.py:72 msgid "CSV file" msgstr "" -#: admin.py:69 +#: admin.py:73 msgid "Only unicode encoding is managed - convert your file first" msgstr "" -#: admin.py:74 +#: admin.py:78 msgid "Export selected as CSV file" msgstr "" -#: admin.py:197 admin.py:216 models.py:813 +#: admin.py:201 admin.py:220 models.py:813 msgid "Parent" msgstr "" -#: admin.py:204 +#: admin.py:208 msgid "Center" msgstr "" -#: admin.py:206 models.py:2953 +#: admin.py:210 models.py:2953 msgid "Limit" msgstr "" -#: admin.py:209 models.py:2963 +#: admin.py:213 models.py:2963 msgid "Town children" msgstr "" -#: admin.py:217 +#: admin.py:221 msgid "Parents" msgstr "" -#: admin.py:288 +#: admin.py:365 msgid "The CSV file should at least have a slug/txt_idx column" msgstr "" -#: admin.py:345 +#: admin.py:422 #, python-format msgid "%d item(s) created." msgstr "" -#: admin.py:349 +#: admin.py:426 #, python-format msgid "%d item(s) updated." msgstr "" -#: admin.py:353 +#: admin.py:430 msgid "These parents are missing: {}" msgstr "" -#: admin.py:569 models.py:1712 +#: admin.py:646 models.py:1712 msgid "Form" msgstr "" -#: admin.py:571 models.py:1737 models_imports.py:124 +#: admin.py:648 models.py:1737 models_imports.py:124 #: templates/ishtar/dashboards/dashboard_main.html:39 msgid "Users" msgstr "" -#: admin.py:591 models.py:1781 +#: admin.py:668 models.py:1781 msgid "Field" msgstr "" @@ -206,7 +206,7 @@ msgid "" "source file." msgstr "" -#: data_importer.py:1229 +#: data_importer.py:1229 views.py:1987 views.py:1997 msgid "Not imported" msgstr "" @@ -358,7 +358,7 @@ msgstr "" #: 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:243 +#: templates/ishtar/import_step_by_step.html:248 #: templates/ishtar/import_table.html:27 #: templates/ishtar/sheet_organization.html:23 msgid "Name" @@ -716,7 +716,7 @@ msgstr "" msgid "Current imports" msgstr "" -#: ishtar_menu.py:121 views.py:2183 +#: ishtar_menu.py:121 views.py:2193 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:144 -#: templates/ishtar/import_step_by_step.html:172 -#: templates/ishtar/import_step_by_step.html:184 -#: templates/ishtar/import_step_by_step.html:218 +#: 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 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:145 -#: templates/ishtar/import_step_by_step.html:173 -#: templates/ishtar/import_step_by_step.html:219 +#: templates/ishtar/import_step_by_step.html:150 +#: templates/ishtar/import_step_by_step.html:178 +#: templates/ishtar/import_step_by_step.html:224 msgid "Value" msgstr "" @@ -1518,7 +1518,7 @@ msgid "Importer - Default values" msgstr "" #: models_imports.py:359 templates/ishtar/import_step_by_step.html:79 -#: templates/ishtar/import_step_by_step.html:242 +#: templates/ishtar/import_step_by_step.html:247 msgid "Column number" msgstr "" @@ -1945,6 +1945,25 @@ msgstr "" msgid "The %(app_name)s team" msgstr "" +#: templates/admin/change_form.html:19 +#: templates/ishtar/blocks/window_nav.html:5 +msgid "History" +msgstr "" + +#: templates/admin/change_form.html:21 +msgid "View on site" +msgstr "" + +#: templates/admin/change_form.html:24 templates/admin/change_form.html:27 +#: views.py:1960 views.py:1964 +msgid "Previous" +msgstr "" + +#: templates/admin/change_form.html:32 templates/admin/change_form.html:35 +#: views.py:1972 views.py:1974 +msgid "Next" +msgstr "" + #: templates/admin/gen_change_list.html:9 #, python-format msgid "Add %(name)s" @@ -2208,10 +2227,6 @@ msgstr "" msgid "Internal ID" msgstr "" -#: templates/ishtar/blocks/window_nav.html:5 -msgid "History" -msgstr "" - #: templates/ishtar/blocks/window_nav.html:17 msgid "" "Are you sure to restore to this version? All changes made since this version " @@ -2343,7 +2358,7 @@ 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:286 +#: templates/ishtar/import_step_by_step.html:291 msgid "Back to import list" msgstr "" @@ -2418,23 +2433,23 @@ msgid "Col." msgstr "" #: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:244 +#: templates/ishtar/import_step_by_step.html:249 msgid "Raw value" msgstr "" #: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:186 -#: templates/ishtar/import_step_by_step.html:246 +#: templates/ishtar/import_step_by_step.html:191 +#: templates/ishtar/import_step_by_step.html:251 msgid "New value" msgstr "" #: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:264 +#: templates/ishtar/import_step_by_step.html:269 msgid "Update source file" msgstr "" #: templates/ishtar/import_step_by_step.html:104 -#: templates/ishtar/import_step_by_step.html:278 +#: templates/ishtar/import_step_by_step.html:283 #: templates/ishtar/organization_form.html:40 #: templates/ishtar/organization_person_form.html:35 #: templates/ishtar/person_form.html:46 @@ -2446,57 +2461,61 @@ msgstr "" msgid "No change for this item." msgstr "" -#: templates/ishtar/import_step_by_step.html:130 +#: templates/ishtar/import_step_by_step.html:131 msgid "Changes will be made for this item" msgstr "" -#: templates/ishtar/import_step_by_step.html:135 +#: templates/ishtar/import_step_by_step.html:134 +msgid "New objects will be created." +msgstr "" + +#: templates/ishtar/import_step_by_step.html:140 msgid "Objects to be created" msgstr "" -#: templates/ishtar/import_step_by_step.html:160 +#: templates/ishtar/import_step_by_step.html:165 msgid "Objects to be updated" msgstr "" -#: templates/ishtar/import_step_by_step.html:169 -#: templates/ishtar/import_step_by_step.html:215 +#: templates/ishtar/import_step_by_step.html:174 +#: templates/ishtar/import_step_by_step.html:220 msgid "Matching values" msgstr "" -#: templates/ishtar/import_step_by_step.html:181 +#: templates/ishtar/import_step_by_step.html:186 msgid "Updated values" msgstr "" -#: templates/ishtar/import_step_by_step.html:185 +#: templates/ishtar/import_step_by_step.html:190 msgid "Old value" msgstr "" -#: templates/ishtar/import_step_by_step.html:187 +#: templates/ishtar/import_step_by_step.html:192 msgid "Changed" msgstr "" -#: templates/ishtar/import_step_by_step.html:206 +#: templates/ishtar/import_step_by_step.html:211 msgid "Objects matched with no changes" msgstr "" -#: templates/ishtar/import_step_by_step.html:236 +#: templates/ishtar/import_step_by_step.html:241 #: templates/ishtar/import_table.html:47 msgid "Source file" msgstr "" -#: templates/ishtar/import_step_by_step.html:245 +#: templates/ishtar/import_step_by_step.html:250 msgid "Interpreted value" msgstr "" -#: templates/ishtar/import_step_by_step.html:271 +#: templates/ishtar/import_step_by_step.html:276 msgid "Import this line" msgstr "" -#: templates/ishtar/import_step_by_step.html:297 +#: templates/ishtar/import_step_by_step.html:302 msgid "No modification made to the source file" msgstr "" -#: templates/ishtar/import_step_by_step.html:298 +#: templates/ishtar/import_step_by_step.html:303 msgid "" "Modification to the source file have been made. Save or cancel theses " "modification before import." @@ -3081,47 +3100,39 @@ msgstr "" msgid "Treatments" msgstr "" -#: views.py:1957 views.py:1961 -msgid "Previous" -msgstr "" - -#: views.py:1969 views.py:1971 -msgid "Next" -msgstr "" - -#: views.py:2138 +#: views.py:2148 msgid "Col. " msgstr "" -#: views.py:2144 views.py:2156 +#: views.py:2154 views.py:2166 msgid "* empty *" msgstr "" -#: views.py:2197 +#: views.py:2207 msgid "Link unmatched items" msgstr "" -#: views.py:2218 +#: views.py:2228 msgid "Delete import" msgstr "" -#: views.py:2257 +#: views.py:2267 msgid "Merge persons" msgstr "" -#: views.py:2281 +#: views.py:2291 msgid "Select the main person" msgstr "" -#: views.py:2290 +#: views.py:2300 msgid "Merge organization" msgstr "" -#: views.py:2300 +#: views.py:2310 msgid "Select the main organization" msgstr "" -#: views.py:2340 views.py:2356 +#: views.py:2350 views.py:2366 msgid "Corporation manager" msgstr "" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index db5f686b7..d43e5f42d 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -11,7 +11,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2018-03-03 07:42-0500\n" +"PO-Revision-Date: 2018-04-04 11:06-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -1496,6 +1496,21 @@ msgstr "Opération associée" msgid "This act is indexed!" msgstr "Cet acte est indexé !" +#: tests.py:507 +msgid "New objects will be created." +msgstr "Des nouveaux objets vont être créés." + +#: tests.py:537 +msgid "This line have been already imported." +msgstr "Cette ligne a été déjà été importée." + +#: tests.py:573 +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 :" + #: views.py:246 msgid "New operation" msgstr "Ajouter une opération" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index d69b7c2bb..1958f62da 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-03-28 05:31-0400\n" +"PO-Revision-Date: 2018-04-04 11:07-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -31,66 +31,66 @@ msgstr "courriel" msgid "Related item" msgstr "Élément associé" -#: admin.py:68 +#: admin.py:72 msgid "CSV file" msgstr "Fichier CSV" -#: admin.py:69 +#: admin.py:73 msgid "Only unicode encoding is managed - convert your file first" msgstr "Seul l'unicode est géré - convertissez votre fichier d'abord" -#: admin.py:74 +#: admin.py:78 msgid "Export selected as CSV file" msgstr "Exporter la sélection en fichier CSV" -#: admin.py:197 admin.py:216 models.py:813 +#: admin.py:201 admin.py:220 models.py:813 msgid "Parent" msgstr "Parent" -#: admin.py:204 +#: admin.py:208 msgid "Center" msgstr "Centre" -#: admin.py:206 models.py:2953 +#: admin.py:210 models.py:2953 msgid "Limit" msgstr "Limite" -#: admin.py:209 models.py:2963 +#: admin.py:213 models.py:2963 msgid "Town children" msgstr "Communes enfants" -#: admin.py:217 +#: admin.py:221 msgid "Parents" msgstr "Parents" -#: admin.py:288 +#: admin.py:365 msgid "The CSV file should at least have a slug/txt_idx column" msgstr "Le fichier CSV doit avoir au minimum une colonne slug/txt_idx" -#: admin.py:345 +#: admin.py:422 #, python-format msgid "%d item(s) created." msgstr "%d élément(s) créés." -#: admin.py:349 +#: admin.py:426 #, python-format msgid "%d item(s) updated." msgstr "%d élément(s) mis à jour." -#: admin.py:353 +#: admin.py:430 msgid "These parents are missing: {}" msgstr "Ces parents sont manquants : {}" -#: admin.py:569 models.py:1712 +#: admin.py:646 models.py:1712 msgid "Form" msgstr "Formulaire" -#: admin.py:571 models.py:1737 models_imports.py:124 +#: admin.py:648 models.py:1737 models_imports.py:124 #: templates/ishtar/dashboards/dashboard_main.html:39 msgid "Users" msgstr "Utilisateurs" -#: admin.py:591 models.py:1781 +#: admin.py:668 models.py:1781 msgid "Field" msgstr "Champ" @@ -222,7 +222,7 @@ 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 +#: data_importer.py:1229 views.py:1987 views.py:1997 msgid "Not imported" msgstr "Non importé" @@ -385,7 +385,7 @@ msgstr "Organisation" #: 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:243 +#: templates/ishtar/import_step_by_step.html:248 #: templates/ishtar/import_table.html:27 #: templates/ishtar/sheet_organization.html:23 msgid "Name" @@ -745,7 +745,7 @@ msgstr "Nouvel import" msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:121 views.py:2183 +#: ishtar_menu.py:121 views.py:2193 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:144 -#: templates/ishtar/import_step_by_step.html:172 -#: templates/ishtar/import_step_by_step.html:184 -#: templates/ishtar/import_step_by_step.html:218 +#: 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 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:145 -#: templates/ishtar/import_step_by_step.html:173 -#: templates/ishtar/import_step_by_step.html:219 +#: templates/ishtar/import_step_by_step.html:150 +#: templates/ishtar/import_step_by_step.html:178 +#: templates/ishtar/import_step_by_step.html:224 msgid "Value" msgstr "Valeur" @@ -1597,7 +1597,7 @@ 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:242 +#: templates/ishtar/import_step_by_step.html:247 msgid "Column number" msgstr "Numéro de colonne" @@ -2028,6 +2028,25 @@ msgstr "Merci pour l'intérêt que vous portez au projet." msgid "The %(app_name)s team" msgstr "L'équipe %(app_name)s" +#: templates/admin/change_form.html:19 +#: templates/ishtar/blocks/window_nav.html:5 +msgid "History" +msgstr "Historique" + +#: templates/admin/change_form.html:21 +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 +msgid "Previous" +msgstr "Précédent" + +#: templates/admin/change_form.html:32 templates/admin/change_form.html:35 +#: views.py:1972 views.py:1974 +msgid "Next" +msgstr "Suivant" + #: templates/admin/gen_change_list.html:9 #, python-format msgid "Add %(name)s" @@ -2302,10 +2321,6 @@ msgstr "Modification" msgid "Internal ID" msgstr "ID interne" -#: templates/ishtar/blocks/window_nav.html:5 -msgid "History" -msgstr "Historique" - #: templates/ishtar/blocks/window_nav.html:17 msgid "" "Are you sure to restore to this version? All changes made since this version " @@ -2441,7 +2456,7 @@ 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:286 +#: templates/ishtar/import_step_by_step.html:291 msgid "Back to import list" msgstr "Retour à la liste des imports" @@ -2520,23 +2535,23 @@ msgid "Col." msgstr "Col." #: templates/ishtar/import_step_by_step.html:81 -#: templates/ishtar/import_step_by_step.html:244 +#: templates/ishtar/import_step_by_step.html:249 msgid "Raw value" msgstr "Valeur brute" #: templates/ishtar/import_step_by_step.html:82 -#: templates/ishtar/import_step_by_step.html:186 -#: templates/ishtar/import_step_by_step.html:246 +#: templates/ishtar/import_step_by_step.html:191 +#: templates/ishtar/import_step_by_step.html:251 msgid "New value" msgstr "Nouvelle valeur" #: templates/ishtar/import_step_by_step.html:98 -#: templates/ishtar/import_step_by_step.html:264 +#: templates/ishtar/import_step_by_step.html:269 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:278 +#: templates/ishtar/import_step_by_step.html:283 #: templates/ishtar/organization_form.html:40 #: templates/ishtar/organization_person_form.html:35 #: templates/ishtar/person_form.html:46 @@ -2548,57 +2563,61 @@ msgstr "Annuler" msgid "No change for this item." msgstr "Pas de changement pour cet élément." -#: templates/ishtar/import_step_by_step.html:130 +#: templates/ishtar/import_step_by_step.html:131 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:135 +#: templates/ishtar/import_step_by_step.html:134 +msgid "New objects will be created." +msgstr "Des nouveaux objets vont être créés." + +#: templates/ishtar/import_step_by_step.html:140 msgid "Objects to be created" msgstr "Objets qui vont être créés" -#: templates/ishtar/import_step_by_step.html:160 +#: templates/ishtar/import_step_by_step.html:165 msgid "Objects to be updated" msgstr "Objets qui vont être mis à jour" -#: templates/ishtar/import_step_by_step.html:169 -#: templates/ishtar/import_step_by_step.html:215 +#: templates/ishtar/import_step_by_step.html:174 +#: templates/ishtar/import_step_by_step.html:220 msgid "Matching values" msgstr "Valeurs correspondantes" -#: templates/ishtar/import_step_by_step.html:181 +#: templates/ishtar/import_step_by_step.html:186 msgid "Updated values" msgstr "Valeurs mises à jour" -#: templates/ishtar/import_step_by_step.html:185 +#: templates/ishtar/import_step_by_step.html:190 msgid "Old value" msgstr "Ancienne valeur" -#: templates/ishtar/import_step_by_step.html:187 +#: templates/ishtar/import_step_by_step.html:192 msgid "Changed" msgstr "Modifié" -#: templates/ishtar/import_step_by_step.html:206 +#: templates/ishtar/import_step_by_step.html:211 msgid "Objects matched with no changes" msgstr "Objets mis en correspondance sans changement" -#: templates/ishtar/import_step_by_step.html:236 +#: templates/ishtar/import_step_by_step.html:241 #: templates/ishtar/import_table.html:47 msgid "Source file" msgstr "Fichier source" -#: templates/ishtar/import_step_by_step.html:245 +#: templates/ishtar/import_step_by_step.html:250 msgid "Interpreted value" msgstr "Valeur interprétée" -#: templates/ishtar/import_step_by_step.html:271 +#: templates/ishtar/import_step_by_step.html:276 msgid "Import this line" msgstr "Importer cette ligne" -#: templates/ishtar/import_step_by_step.html:297 +#: templates/ishtar/import_step_by_step.html:302 msgid "No modification made to the source file" msgstr "Pas de modification faite sur ce fichier source" -#: templates/ishtar/import_step_by_step.html:298 +#: templates/ishtar/import_step_by_step.html:303 msgid "" "Modification to the source file have been made. Save or cancel theses " "modification before import." @@ -3204,47 +3223,39 @@ msgstr "Demandes de traitement" msgid "Treatments" msgstr "Traitements" -#: views.py:1957 views.py:1961 -msgid "Previous" -msgstr "Précédent" - -#: views.py:1969 views.py:1971 -msgid "Next" -msgstr "Suivant" - -#: views.py:2138 +#: views.py:2148 msgid "Col. " msgstr "Col." -#: views.py:2144 views.py:2156 +#: views.py:2154 views.py:2166 msgid "* empty *" msgstr "* vide *" -#: views.py:2197 +#: views.py:2207 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:2218 +#: views.py:2228 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:2257 +#: views.py:2267 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:2281 +#: views.py:2291 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:2290 +#: views.py:2300 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:2300 +#: views.py:2310 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:2340 views.py:2356 +#: views.py:2350 views.py:2366 msgid "Corporation manager" msgstr "Représentant de la personne morale" |