mirror of https://github.com/doccano/doccano.git
Browse Source
Merge branch 'master' into #f1175
Merge branch 'master' into #f1175
# Conflicts: # frontend/rules/index.jspull/1175/head
9 changed files with 97 additions and 22 deletions
Split View
Diff Options
-
5app/api/tests/test_api.py
-
40app/api/utils.py
-
14app/api/views.py
-
39frontend/components/organisms/documents/DocumentUploadForm.vue
-
2frontend/i18n/en/projects/dataset.js
-
2frontend/i18n/en/projects/errors.js
-
2frontend/rules/index.js
-
3frontend/services/document.service.js
-
12frontend/store/projects.js
@ -1,5 +1,5 @@ |
|||
export default { |
|||
fileCannotUpload: 'The file could not be uploaded. Maybe invalid format.\n Please check available formats carefully.', |
|||
fileCannotUpload: 'The file(s) could not be uploaded. Maybe invalid format.\n Please check available formats and the following file(s): ', |
|||
labelCannotCreate: 'The label could not be created.\n You cannot use the same label name or shortcut key.', |
|||
invalidUserOrPass: 'Incorrect username or password, or something went wrong.' |
|||
} |
Write
Preview
Loading…
Cancel
Save