From c748394ff069167a15dcb4b34bc117928a601b02 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Tue, 1 Mar 2022 14:09:09 -0800 Subject: [PATCH 1/9] Update docs, yml to -ngx --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- docker/docker-entrypoint.sh | 2 +- docs/advanced_usage.rst | 2 +- docs/faq.rst | 2 +- docs/index.rst | 20 +++++++++----------- docs/scanners.rst | 2 +- docs/setup.rst | 14 +++++++------- paperless.conf.example | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 848c949bc..70f58d4fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ To test your code, execute `pytest` in the src/ directory. This also generates a ## More info: -... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html +... is available in the documentation. https://paperless-ngx.readthedocs.io/en/latest/extending.html # Merging PRs diff --git a/README.md b/README.md index 243249967..5ca4e5eb2 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ A demo is available at [demo.paperless-ngx.com](https://demo.paperless-ngx.com) * When adding documents from mail, paperless can move these mail to a new folder, mark them as read, flag them as important or delete them. * Machine learning powered document matching. * Paperless-ngx learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless. -* Optimized for multi core systems: Paperless-ng consumes multiple documents in parallel. +* Optimized for multi core systems: Paperless-ngx consumes multiple documents in parallel. * The integrated sanity checker makes sure that your document archive is in good health. * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). @@ -65,7 +65,7 @@ The easiest way to deploy paperless is docker-compose. The files in the [`/docke If you'd like to jump right in, you can configure a docker-compose environment with our install script: ```bash -bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ng.sh)" +bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ngx.sh)" ``` Alternatively, you can install the dependencies and setup apache and a database server yourself. The [documentation](https://paperless-ngx.readthedocs.io/en/latest/setup.html#installation) has a step by step guide on how to do it. diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index e494eac75..e1bca5e4e 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -74,7 +74,7 @@ install_languages() { done } -echo "Paperless-ng docker container starting..." +echo "Paperless-ngx docker container starting..." # Install additional languages if specified if [[ ! -z "$PAPERLESS_OCR_LANGUAGES" ]]; then diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst index a872fed40..2363ec62a 100644 --- a/docs/advanced_usage.rst +++ b/docs/advanced_usage.rst @@ -57,7 +57,7 @@ automatically tagged with the appropriate data. Automatic matching ================== -Paperless-ng comes with a new matching algorithm called *Auto*. This matching +Paperless-ngx comes with a new matching algorithm called *Auto*. This matching algorithm tries to assign tags, correspondents, and document types to your documents based on how you have already assigned these on existing documents. It uses a neural network under the hood. diff --git a/docs/faq.rst b/docs/faq.rst index e87ba1d4a..88b9cba49 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -5,7 +5,7 @@ Frequently asked questions **Q:** *What's the general plan for Paperless-ng?* -**A:** Paperless-ng is already almost feature-complete. This project will remain +**A:** Paperless-ngx is already almost feature-complete. This project will remain as simple as it is right now. It will see improvements to features that are already there. If you need advanced features such as document versions, workflows or multi-user with customizable access to individual files, this is diff --git a/docs/index.rst b/docs/index.rst index 813688fe8..8348d0f92 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,19 +22,21 @@ finding stuff again. I feed documents right from the post box into the scanner and then shred them. Perhaps you might find it useful too. -Paperless-ng -============ +Paperless-ngx +============= -Paperless-ng is a fork of the original paperless project. It changes many -things both on the surface and under the hood. Paperless-ng was created -because I feel that these changes are too big to be pushed into the main -repository right away. +Paperless-ngx is a document management system that transforms your physical +documents into a searchable online archive so you can keep, well, *less paper*. + +Paperless-ngx forked from paperless-ng to continue the great work and +distribute responsibility of supporting and advancing the project among a team +of people. NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ngx. -If you want to learn about what's different in paperless-ngx, check out these +If you want to learn about what's different in paperless-ng from Paperless, check out these resources in the documentation: * :ref:`Some screenshots ` of the new UI are available. @@ -53,10 +55,6 @@ resources in the documentation: * The :ref:`changelog ` contains a detailed list of all changes in paperless-ngx. -It would be great if this project could eventually merge back into the main -repository, but it needs a lot more work before that can happen. - - Contents ======== diff --git a/docs/scanners.rst b/docs/scanners.rst index fb122ce2c..11b57da94 100644 --- a/docs/scanners.rst +++ b/docs/scanners.rst @@ -103,7 +103,7 @@ You can use your phone to "scan" documents. The regular camera app will work, bu | `OCR Scanner - QuickScan`_ | iOS | no | no | no | no | yes | `holzhannes`_ | +-----------------------------+----------------+-----+-----+-----+-------+--------+------------------+ -On Android, you can use these applications in combination with one of the :ref:`Paperless-ng compatible apps ` to "Share" the documents produced by these scanner apps with paperless. On iOS, you can share the scanned documents via iOS-Sharing to other mail, WebDav or FTP apps. +On Android, you can use these applications in combination with one of the :ref:`Paperless-ngx compatible apps ` to "Share" the documents produced by these scanner apps with paperless. On iOS, you can share the scanned documents via iOS-Sharing to other mail, WebDav or FTP apps. .. _Office Lens: https://play.google.com/store/apps/details?id=com.microsoft.office.officelens .. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free diff --git a/docs/setup.rst b/docs/setup.rst index a9caca64c..b6aa0f42c 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -3,8 +3,8 @@ Setup ***** -Overview of Paperless-ng -######################## +Overview of Paperless-ngx +######################### Compared to paperless, paperless-ngx works a little different under the hood and has more moving parts that work together. While this increases the complexity of @@ -110,7 +110,7 @@ performs all the steps described in :ref:`setup-docker_hub` automatically. .. code:: shell-session - $ bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ng.sh)" + $ bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ngx.sh)" .. _setup-docker_hub: @@ -511,7 +511,7 @@ Migration to paperless-ngx is then performed in a few simple steps: .. caution:: - Paperless-ng includes a ``.env`` file. This will set the + Paperless-ngx includes a ``.env`` file. This will set the project name for docker compose to ``paperless``, which will also define the name of the volumes by paperless-ngx. However, if you experience that paperless-ngx is not using your old paperless volumes, verify the names of your volumes with @@ -637,11 +637,11 @@ management commands as below. Moving back to paperless ======================== -Lets say you migrated to Paperless-ng and used it for a while, but decided that +Lets say you migrated to Paperless-ngx and used it for a while, but decided that you don't like it and want to move back (If you do, send me a mail about what part you didn't like!), you can totally do that with a few simple steps. -Paperless-ng modified the database schema slightly, however, these changes can +Paperless-ngx modified the database schema slightly, however, these changes can be reverted while keeping your current data, so that your current data will be compatible with original Paperless. @@ -659,7 +659,7 @@ Or without docker: $ cd /path/to/paperless/src $ python3 manage.py migrate documents 0023 -After that, you need to clear your cookies (Paperless-ng comes with updated +After that, you need to clear your cookies (Paperless-ngx comes with updated dependencies that do cookie-processing differently) and probably your cache as well. diff --git a/paperless.conf.example b/paperless.conf.example index bc8e76e55..bfb4fac7e 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -1,5 +1,5 @@ # Have a look at the docs for documentation. -# https://paperless-ng.readthedocs.io/en/latest/configuration.html +# https://paperless-ngx.readthedocs.io/en/latest/configuration.html # Debug. Only enable this for development. From 49a1c3f8c2f60adfe2787807ddb7dc2dc90cf071 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Tue, 1 Mar 2022 14:15:47 -0800 Subject: [PATCH 2/9] Update maintainer email --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2003e8714..7c456ef60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,4 +127,4 @@ ENTRYPOINT ["/sbin/docker-entrypoint.sh"] EXPOSE 8000 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"] -LABEL maintainer="Jonas Winkler " +LABEL maintainer="paperless-ngx team " From 004375b478185cddbb0139babb01bf9409d5b72a Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Tue, 1 Mar 2022 15:18:12 -0800 Subject: [PATCH 3/9] Add org.opencontainers.image labels --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c456ef60..a2b651317 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,4 +127,8 @@ ENTRYPOINT ["/sbin/docker-entrypoint.sh"] EXPOSE 8000 CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"] -LABEL maintainer="paperless-ngx team " +LABEL org.opencontainers.image.authors="paperless-ngx team " +LABEL org.opencontainers.image.documentation="https://paperless-ngx.readthedocs.io/en/latest/" +LABEL org.opencontainers.image.source="https://github.com/paperless-ngx/paperless-ngx" +LABEL org.opencontainers.image.url="https://github.com/paperless-ngx/paperless-ngx" +LABEL org.opencontainers.image.licenses="GPL-3.0-only" \ No newline at end of file From 43bc42826b061b728a296f61cc624bef4fc56430 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Tue, 1 Mar 2022 15:19:01 -0800 Subject: [PATCH 4/9] Add newline --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a2b651317..afde7dcc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,4 +131,4 @@ LABEL org.opencontainers.image.authors="paperless-ngx team Date: Wed, 2 Mar 2022 10:04:27 -0800 Subject: [PATCH 5/9] Fix some -ngx references, -ngx community support --- docs/faq.rst | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 88b9cba49..f9c22a48c 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -3,17 +3,13 @@ Frequently asked questions ************************** -**Q:** *What's the general plan for Paperless-ng?* +**Q:** *What's the general plan for Paperless-ngx?* -**A:** Paperless-ngx is already almost feature-complete. This project will remain -as simple as it is right now. It will see improvements to features that are already there. -If you need advanced features such as document versions, -workflows or multi-user with customizable access to individual files, this is -not the tool for you. - -Features that *are* planned are some more quality of life extensions for the searching -(i.e., search for similar documents, group results by correspondents with "more from this" -links, etc), bulk editing and hierarchical tags. +**A:** While Paperless-ngx is already considered largely "feature-complete" it is a community-driven +project and development will be guided in this way. New features can be submitted via +GitHub discussions and "up-voted" by the community but this is not a garauntee the feature +will be implemented. This project will always be open to collaboration in the form of PRs, +ideas etc. **Q:** *I'm using docker. Where are my documents?* @@ -33,12 +29,12 @@ is files around manually. This folder is meant to be entirely managed by docker and paperless. -**Q:** *Let's say you don't support this project anymore in a year. Can I easily move to other systems?* +**Q:** *Let's say I want to switch tools in a year. Can I easily move to other systems?* **A:** Your documents are stored as plain files inside the media folder. You can always drag those files out of that folder to use them elsewhere. Here are a couple notes about that. -* Paperless never modifies your original documents. It keeps checksums of all documents and uses a +* Paperless-ngx never modifies your original documents. It keeps checksums of all documents and uses a scheduled sanity checker to check that they remain the same. * By default, paperless uses the internal ID of each document as its filename. This might not be very convenient for export. However, you can adjust the way files are stored in paperless by @@ -55,7 +51,7 @@ out of that folder to use them elsewhere. Here are a couple notes about that. * With the optional Tika integration enabled (see :ref:`Configuration `), Paperless also supports various Office documents (.docx, .doc, odt, .ppt, .pptx, .odp, .xls, .xlsx, .ods). -Paperless determines the type of a file by inspecting its content. The +Paperless-ngx determines the type of a file by inspecting its content. The file extensions do not matter. **Q:** *Will paperless-ngx run on Raspberry Pi?* From f3cda7d55133976a1bef2af66892aad994e36254 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 2 Mar 2022 10:59:54 -0800 Subject: [PATCH 6/9] Fix more -ngx references --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/other.md | 2 +- README.md | 2 +- docs/administration.rst | 2 +- docs/advanced_usage.rst | 10 +++++----- docs/api.rst | 2 +- docs/index.rst | 2 +- docs/setup.rst | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2fc3ccd19..f542d48bf 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -14,7 +14,7 @@ assignees: '' => If you would like to submit a feature request please submit one under https://github.com/paperless-ngx/paperless-ngx/discussions/categories/feature-requests -=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless. +=> If you encounter issues while installing of configuring Paperless-ngx, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless. => Don't remove the [BUG] prefix from the title. --> diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md index 52492c16d..7d084247c 100644 --- a/.github/ISSUE_TEMPLATE/other.md +++ b/.github/ISSUE_TEMPLATE/other.md @@ -13,7 +13,7 @@ assignees: '' => If you would like to submit a feature request please submit one under https://github.com/paperless-ngx/paperless-ngx/discussions/categories/feature-requests -=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless. +=> If you encounter issues while installing of configuring Paperless-ngx, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless. => Don't remove the [Other] prefix from the title. diff --git a/README.md b/README.md index 5ca4e5eb2..8e20aeb73 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ For bugs please [open an issue](https://github.com/paperless-ngx/paperless-ngx/i Paperless has been around a while now, and people are starting to build stuff on top of it. If you're one of those people, we can add your project to this list: -* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless-ngx. Also works with the original Paperless and Paperless-ng. +* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless-ngx. Also works with the original Paperless and Paperless-ngx. * [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents. * [Scan to Paperless](https://github.com/sbrunner/scan-to-paperless): Scan and prepare (crop, deskew, OCR, ...) your documents for Paperless. diff --git a/docs/administration.rst b/docs/administration.rst index e3cd7b188..1a9dfd548 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -468,7 +468,7 @@ Documents can be stored in Paperless using GnuPG encryption. .. danger:: - Encryption is deprecated since paperless-ng 0.9 and doesn't really provide any + Encryption is deprecated since paperless-ngx 0.9 and doesn't really provide any additional security, since you have to store the passphrase in a configuration file on the same system as the encrypted documents for paperless to work. Furthermore, the entire text content of the documents is stored plain in the diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst index 2363ec62a..a727c94f8 100644 --- a/docs/advanced_usage.rst +++ b/docs/advanced_usage.rst @@ -174,7 +174,7 @@ The post consumption script cannot cancel the consumption process. Docker ------ -Assumed you have ``/home/foo/paperless-ng/scripts/post-consumption-example.sh``. +Assumed you have ``/home/foo/paperless-ngx/scripts/post-consumption-example.sh``. You can pass that script into the consumer container via a host mount in your ``docker-compose.yml``. @@ -184,10 +184,10 @@ You can pass that script into the consumer container via a host mount in your `` ... volumes: ... - - /home/paperless-ng/scripts:/path/in/container/scripts/ + - /home/paperless-ngx/scripts:/path/in/container/scripts/ ... -Example (docker-compose.yml): ``- /home/foo/paperless-ng/scripts:/usr/src/paperless/scripts`` +Example (docker-compose.yml): ``- /home/foo/paperless-ngx/scripts:/usr/src/paperless/scripts`` which in turn requires the variable ``PAPERLESS_POST_CONSUME_SCRIPT`` in ``docker-compose.env`` to point to ``/path/in/container/scripts/post-consumption-example.sh``. @@ -195,11 +195,11 @@ Example (docker-compose.env): ``PAPERLESS_POST_CONSUME_SCRIPT=/usr/src/paperless Troubleshooting: -- Monitor the docker-compose log ``cd ~/paperless-ng; docker-compose logs -f`` +- Monitor the docker-compose log ``cd ~/paperless-ngx; docker-compose logs -f`` - Check your script's permission e.g. in case of permission error ``sudo chmod 755 post-consumption-example.sh`` - Pipe your scripts's output to a log file e.g. ``echo "${DOCUMENT_ID}" | tee --append /usr/src/paperless/scripts/post-consumption-example.log`` -.. _post-consumption-example.sh: https://github.com/jonaswinkler/paperless-ng/blob/master/scripts/post-consumption-example.sh +.. _post-consumption-example.sh: https://github.com/jonaswinkler/paperless-ngx/blob/master/scripts/post-consumption-example.sh .. _advanced-file_name_handling: diff --git a/docs/api.rst b/docs/api.rst index 3a9d244c5..1d5b3f1b2 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -255,7 +255,7 @@ process itself is available, since that happens in a different process. API Versioning ############## -The REST API is versioned since Paperless-ng 1.3.0. +The REST API is versioned since Paperless-ngx 1.3.0. * Versioning ensures that changes to the API don't break older clients. * Clients specify the specific version of the API they wish to use with every request and Paperless will handle the request using the specified API version. diff --git a/docs/index.rst b/docs/index.rst index 8348d0f92..ec436b5c1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -36,7 +36,7 @@ NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ngx. -If you want to learn about what's different in paperless-ng from Paperless, check out these +If you want to learn about what's different in paperless-ngx from Paperless, check out these resources in the documentation: * :ref:`Some screenshots ` of the new UI are available. diff --git a/docs/setup.rst b/docs/setup.rst index b6aa0f42c..5ab54fa96 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -117,7 +117,7 @@ performs all the steps described in :ref:`setup-docker_hub` automatically. Install Paperless from Docker Hub ================================= -1. Login with your user and create a folder in your home-directory `mkdir -v ~/paperless-ng` to have a place for your configuration files and consumption directory. +1. Login with your user and create a folder in your home-directory `mkdir -v ~/paperless-ngx` to have a place for your configuration files and consumption directory. 2. Go to the `/docker/compose directory on the project page `_ and download one of the `docker-compose.*.yml` files, depending on which database backend you From 0f804937f74ef5153b1159e838ee808f0a0e63ac Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 2 Mar 2022 11:05:34 -0800 Subject: [PATCH 7/9] Update -ngx in django templates / urls --- src/documents/templates/index.html | 4 ++-- src/documents/templates/registration/logged_out.html | 2 +- src/documents/templates/registration/login.html | 2 +- src/paperless/urls.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index b8f60a9a5..538c0dded 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -6,7 +6,7 @@ - Paperless-ng + Paperless-ngx @@ -19,7 +19,7 @@ - {% translate "Paperless-ng is loading..." %} + {% translate "Paperless-ngx is loading..." %} diff --git a/src/documents/templates/registration/logged_out.html b/src/documents/templates/registration/logged_out.html index cf38a38d2..5a059652a 100644 --- a/src/documents/templates/registration/logged_out.html +++ b/src/documents/templates/registration/logged_out.html @@ -11,7 +11,7 @@ - {% translate "Paperless-ng signed out" %} + {% translate "Paperless-ngx signed out" %} diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html index 443452f2b..d9ff86a78 100644 --- a/src/documents/templates/registration/login.html +++ b/src/documents/templates/registration/login.html @@ -12,7 +12,7 @@ - {% translate "Paperless-ng sign in" %} + {% translate "Paperless-ngx sign in" %} diff --git a/src/paperless/urls.py b/src/paperless/urls.py index a8c1ed645..510e624d1 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -132,8 +132,8 @@ websocket_urlpatterns = [ ] # Text in each page's

(and above login form). -admin.site.site_header = "Paperless-ng" +admin.site.site_header = "Paperless-ngx" # Text at the end of each page's . -admin.site.site_title = "Paperless-ng" +admin.site.site_title = "Paperless-ngx" # Text at the top of the admin index page. -admin.site.index_title = _("Paperless-ng administration") +admin.site.index_title = _("Paperless-ngx administration") From 04c28d41057cc41a35eb9e1cb4a4ff165bd17400 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 2 Mar 2022 11:21:39 -0800 Subject: [PATCH 8/9] Update Angular messages.xlf --- src-ui/messages.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 1efd6f968..68120ee72 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -321,14 +321,14 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> - <context context-type="linenumber">43</context> + <context context-type="linenumber">41</context> </context-group> </trans-unit> <trans-unit id="1218334388194408974" datatype="html"> <source>Before</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/date-dropdown/date-dropdown.component.html</context> - <context context-type="linenumber">38</context> + <context context-type="linenumber">36</context> </context-group> </trans-unit> <trans-unit id="4873149362496451858" datatype="html"> From cd9c46e88e269d8510ef09b380599daf68ad80bc Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 2 Mar 2022 11:27:53 -0800 Subject: [PATCH 9/9] Update django.po --- src/locale/en_US/LC_MESSAGES/django.po | 426 ++++++++++++++----------- 1 file changed, 231 insertions(+), 195 deletions(-) diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index b365ba6ad..9ab97ee3f 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-16 09:38+0000\n" +"POT-Creation-Date: 2022-03-02 11:20-0800\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -45,654 +45,690 @@ msgstr "" msgid "Automatic" msgstr "" -#: documents/models.py:41 documents/models.py:350 paperless_mail/models.py:25 -#: paperless_mail/models.py:117 +#: documents/models.py:40 documents/models.py:314 paperless_mail/models.py:23 +#: paperless_mail/models.py:107 msgid "name" msgstr "" -#: documents/models.py:45 +#: documents/models.py:42 msgid "match" msgstr "" -#: documents/models.py:49 +#: documents/models.py:45 msgid "matching algorithm" msgstr "" -#: documents/models.py:55 +#: documents/models.py:48 msgid "is insensitive" msgstr "" -#: documents/models.py:74 documents/models.py:120 +#: documents/models.py:61 documents/models.py:104 msgid "correspondent" msgstr "" -#: documents/models.py:75 +#: documents/models.py:62 msgid "correspondents" msgstr "" -#: documents/models.py:81 +#: documents/models.py:67 msgid "color" msgstr "" -#: documents/models.py:87 +#: documents/models.py:70 msgid "is inbox tag" msgstr "" -#: documents/models.py:89 -msgid "Marks this tag as an inbox tag: All newly consumed documents will be tagged with inbox tags." +#: documents/models.py:73 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." msgstr "" -#: documents/models.py:94 +#: documents/models.py:79 msgid "tag" msgstr "" -#: documents/models.py:95 documents/models.py:151 +#: documents/models.py:80 documents/models.py:130 msgid "tags" msgstr "" -#: documents/models.py:101 documents/models.py:133 +#: documents/models.py:85 documents/models.py:115 msgid "document type" msgstr "" -#: documents/models.py:102 +#: documents/models.py:86 msgid "document types" msgstr "" -#: documents/models.py:110 +#: documents/models.py:94 msgid "Unencrypted" msgstr "" -#: documents/models.py:111 +#: documents/models.py:95 msgid "Encrypted with GNU Privacy Guard" msgstr "" -#: documents/models.py:124 +#: documents/models.py:107 msgid "title" msgstr "" -#: documents/models.py:137 +#: documents/models.py:119 msgid "content" msgstr "" -#: documents/models.py:139 -msgid "The raw, text-only data of the document. This field is primarily used for searching." +#: documents/models.py:122 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." msgstr "" -#: documents/models.py:144 +#: documents/models.py:127 msgid "mime type" msgstr "" -#: documents/models.py:155 +#: documents/models.py:134 msgid "checksum" msgstr "" -#: documents/models.py:159 +#: documents/models.py:138 msgid "The checksum of the original document." msgstr "" -#: documents/models.py:163 +#: documents/models.py:142 msgid "archive checksum" msgstr "" -#: documents/models.py:168 +#: documents/models.py:147 msgid "The checksum of the archived document." msgstr "" -#: documents/models.py:172 documents/models.py:328 +#: documents/models.py:150 documents/models.py:295 msgid "created" msgstr "" -#: documents/models.py:176 +#: documents/models.py:153 msgid "modified" msgstr "" -#: documents/models.py:180 +#: documents/models.py:157 msgid "storage type" msgstr "" -#: documents/models.py:188 +#: documents/models.py:165 msgid "added" msgstr "" -#: documents/models.py:192 +#: documents/models.py:169 msgid "filename" msgstr "" -#: documents/models.py:198 +#: documents/models.py:175 msgid "Current filename in storage" msgstr "" -#: documents/models.py:202 +#: documents/models.py:179 msgid "archive filename" msgstr "" -#: documents/models.py:208 +#: documents/models.py:185 msgid "Current archive filename in storage" msgstr "" -#: documents/models.py:212 +#: documents/models.py:189 msgid "archive serial number" msgstr "" -#: documents/models.py:217 +#: documents/models.py:195 msgid "The position of this document in your physical document archive." msgstr "" -#: documents/models.py:223 +#: documents/models.py:201 msgid "document" msgstr "" -#: documents/models.py:224 +#: documents/models.py:202 msgid "documents" msgstr "" -#: documents/models.py:311 +#: documents/models.py:280 msgid "debug" msgstr "" -#: documents/models.py:312 +#: documents/models.py:281 msgid "information" msgstr "" -#: documents/models.py:313 +#: documents/models.py:282 msgid "warning" msgstr "" -#: documents/models.py:314 +#: documents/models.py:283 msgid "error" msgstr "" -#: documents/models.py:315 +#: documents/models.py:284 msgid "critical" msgstr "" -#: documents/models.py:319 +#: documents/models.py:287 msgid "group" msgstr "" -#: documents/models.py:322 +#: documents/models.py:289 msgid "message" msgstr "" -#: documents/models.py:325 +#: documents/models.py:292 msgid "level" msgstr "" -#: documents/models.py:332 +#: documents/models.py:299 msgid "log" msgstr "" -#: documents/models.py:333 +#: documents/models.py:300 msgid "logs" msgstr "" -#: documents/models.py:344 documents/models.py:401 +#: documents/models.py:310 documents/models.py:360 msgid "saved view" msgstr "" -#: documents/models.py:345 +#: documents/models.py:311 msgid "saved views" msgstr "" -#: documents/models.py:348 +#: documents/models.py:313 msgid "user" msgstr "" -#: documents/models.py:354 +#: documents/models.py:317 msgid "show on dashboard" msgstr "" -#: documents/models.py:357 +#: documents/models.py:320 msgid "show in sidebar" msgstr "" -#: documents/models.py:361 +#: documents/models.py:324 msgid "sort field" msgstr "" -#: documents/models.py:367 +#: documents/models.py:326 msgid "sort reverse" msgstr "" -#: documents/models.py:373 +#: documents/models.py:331 msgid "title contains" msgstr "" -#: documents/models.py:374 +#: documents/models.py:332 msgid "content contains" msgstr "" -#: documents/models.py:375 +#: documents/models.py:333 msgid "ASN is" msgstr "" -#: documents/models.py:376 +#: documents/models.py:334 msgid "correspondent is" msgstr "" -#: documents/models.py:377 +#: documents/models.py:335 msgid "document type is" msgstr "" -#: documents/models.py:378 +#: documents/models.py:336 msgid "is in inbox" msgstr "" -#: documents/models.py:379 +#: documents/models.py:337 msgid "has tag" msgstr "" -#: documents/models.py:380 +#: documents/models.py:338 msgid "has any tag" msgstr "" -#: documents/models.py:381 +#: documents/models.py:339 msgid "created before" msgstr "" -#: documents/models.py:382 +#: documents/models.py:340 msgid "created after" msgstr "" -#: documents/models.py:383 +#: documents/models.py:341 msgid "created year is" msgstr "" -#: documents/models.py:384 +#: documents/models.py:342 msgid "created month is" msgstr "" -#: documents/models.py:385 +#: documents/models.py:343 msgid "created day is" msgstr "" -#: documents/models.py:386 +#: documents/models.py:344 msgid "added before" msgstr "" -#: documents/models.py:387 +#: documents/models.py:345 msgid "added after" msgstr "" -#: documents/models.py:388 +#: documents/models.py:346 msgid "modified before" msgstr "" -#: documents/models.py:389 +#: documents/models.py:347 msgid "modified after" msgstr "" -#: documents/models.py:390 +#: documents/models.py:348 msgid "does not have tag" msgstr "" -#: documents/models.py:391 +#: documents/models.py:349 msgid "does not have ASN" msgstr "" -#: documents/models.py:392 +#: documents/models.py:350 msgid "title or content contains" msgstr "" -#: documents/models.py:393 +#: documents/models.py:351 msgid "fulltext query" msgstr "" -#: documents/models.py:394 +#: documents/models.py:352 msgid "more like this" msgstr "" -#: documents/models.py:405 +#: documents/models.py:353 +msgid "has tags in" +msgstr "" + +#: documents/models.py:363 msgid "rule type" msgstr "" -#: documents/models.py:409 +#: documents/models.py:365 msgid "value" msgstr "" -#: documents/models.py:415 +#: documents/models.py:368 msgid "filter rule" msgstr "" -#: documents/models.py:416 +#: documents/models.py:369 msgid "filter rules" msgstr "" -#: documents/serialisers.py:53 +#: documents/serialisers.py:64 #, python-format msgid "Invalid regular expression: %(error)s" msgstr "" -#: documents/serialisers.py:177 +#: documents/serialisers.py:185 msgid "Invalid color." msgstr "" -#: documents/serialisers.py:451 +#: documents/serialisers.py:459 #, python-format msgid "File type %(type)s not supported" msgstr "" #: documents/templates/index.html:22 -msgid "Paperless-ng is loading..." +msgid "Paperless-ngx is loading..." msgstr "" #: documents/templates/registration/logged_out.html:14 -msgid "Paperless-ng signed out" +msgid "Paperless-ngx signed out" msgstr "" -#: documents/templates/registration/logged_out.html:45 +#: documents/templates/registration/logged_out.html:59 msgid "You have been successfully logged out. Bye!" msgstr "" -#: documents/templates/registration/logged_out.html:46 +#: documents/templates/registration/logged_out.html:60 msgid "Sign in again" msgstr "" #: documents/templates/registration/login.html:15 -msgid "Paperless-ng sign in" +msgid "Paperless-ngx sign in" msgstr "" -#: documents/templates/registration/login.html:47 +#: documents/templates/registration/login.html:61 msgid "Please sign in." msgstr "" -#: documents/templates/registration/login.html:50 +#: documents/templates/registration/login.html:64 msgid "Your username and password didn't match. Please try again." msgstr "" -#: documents/templates/registration/login.html:53 +#: documents/templates/registration/login.html:67 msgid "Username" msgstr "" -#: documents/templates/registration/login.html:54 +#: documents/templates/registration/login.html:68 msgid "Password" msgstr "" -#: documents/templates/registration/login.html:59 +#: documents/templates/registration/login.html:73 msgid "Sign in" msgstr "" -#: paperless/settings.py:303 +#: paperless/settings.py:299 msgid "English (US)" msgstr "" -#: paperless/settings.py:304 -msgid "English (GB)" +#: paperless/settings.py:300 +msgid "Czech" msgstr "" -#: paperless/settings.py:305 +#: paperless/settings.py:301 +msgid "Danish" +msgstr "" + +#: paperless/settings.py:302 msgid "German" msgstr "" -#: paperless/settings.py:306 -msgid "Dutch" +#: paperless/settings.py:303 +msgid "English (GB)" msgstr "" -#: paperless/settings.py:307 -msgid "French" -msgstr "" - -#: paperless/settings.py:308 -msgid "Portuguese (Brazil)" -msgstr "" - -#: paperless/settings.py:309 -msgid "Portuguese" -msgstr "" - -#: paperless/settings.py:310 -msgid "Italian" -msgstr "" - -#: paperless/settings.py:311 -msgid "Romanian" -msgstr "" - -#: paperless/settings.py:312 -msgid "Russian" -msgstr "" - -#: paperless/settings.py:313 +#: paperless/settings.py:304 msgid "Spanish" msgstr "" -#: paperless/settings.py:314 +#: paperless/settings.py:305 +msgid "French" +msgstr "" + +#: paperless/settings.py:306 +msgid "Italian" +msgstr "" + +#: paperless/settings.py:307 +msgid "Luxembourgish" +msgstr "" + +#: paperless/settings.py:308 +msgid "Dutch" +msgstr "" + +#: paperless/settings.py:309 msgid "Polish" msgstr "" -#: paperless/settings.py:315 +#: paperless/settings.py:310 +msgid "Portuguese (Brazil)" +msgstr "" + +#: paperless/settings.py:311 +msgid "Portuguese" +msgstr "" + +#: paperless/settings.py:312 +msgid "Romanian" +msgstr "" + +#: paperless/settings.py:313 +msgid "Russian" +msgstr "" + +#: paperless/settings.py:314 msgid "Swedish" msgstr "" -#: paperless/urls.py:120 -msgid "Paperless-ng administration" +#: paperless/urls.py:139 +msgid "Paperless-ngx administration" msgstr "" -#: paperless_mail/admin.py:15 +#: paperless_mail/admin.py:29 msgid "Authentication" msgstr "" -#: paperless_mail/admin.py:18 +#: paperless_mail/admin.py:30 msgid "Advanced settings" msgstr "" -#: paperless_mail/admin.py:37 +#: paperless_mail/admin.py:47 msgid "Filter" msgstr "" -#: paperless_mail/admin.py:39 -msgid "Paperless will only process mails that match ALL of the filters given below." +#: paperless_mail/admin.py:50 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." msgstr "" -#: paperless_mail/admin.py:49 +#: paperless_mail/admin.py:64 msgid "Actions" msgstr "" -#: paperless_mail/admin.py:51 -msgid "The action applied to the mail. This action is only performed when documents were consumed from the mail. Mails without attachments will remain entirely untouched." +#: paperless_mail/admin.py:67 +msgid "" +"The action applied to the mail. This action is only performed when documents " +"were consumed from the mail. Mails without attachments will remain entirely " +"untouched." msgstr "" -#: paperless_mail/admin.py:58 +#: paperless_mail/admin.py:75 msgid "Metadata" msgstr "" -#: paperless_mail/admin.py:60 -msgid "Assign metadata to documents consumed from this rule automatically. If you do not assign tags, types or correspondents here, paperless will still process all matching rules that you have defined." +#: paperless_mail/admin.py:78 +msgid "" +"Assign metadata to documents consumed from this rule automatically. If you " +"do not assign tags, types or correspondents here, paperless will still " +"process all matching rules that you have defined." msgstr "" #: paperless_mail/apps.py:9 msgid "Paperless mail" msgstr "" -#: paperless_mail/models.py:11 +#: paperless_mail/models.py:10 msgid "mail account" msgstr "" -#: paperless_mail/models.py:12 +#: paperless_mail/models.py:11 msgid "mail accounts" msgstr "" -#: paperless_mail/models.py:19 +#: paperless_mail/models.py:18 msgid "No encryption" msgstr "" -#: paperless_mail/models.py:20 +#: paperless_mail/models.py:19 msgid "Use SSL" msgstr "" -#: paperless_mail/models.py:21 +#: paperless_mail/models.py:20 msgid "Use STARTTLS" msgstr "" -#: paperless_mail/models.py:29 +#: paperless_mail/models.py:25 msgid "IMAP server" msgstr "" -#: paperless_mail/models.py:33 +#: paperless_mail/models.py:28 msgid "IMAP port" msgstr "" -#: paperless_mail/models.py:36 -msgid "This is usually 143 for unencrypted and STARTTLS connections, and 993 for SSL connections." +#: paperless_mail/models.py:32 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." msgstr "" -#: paperless_mail/models.py:40 +#: paperless_mail/models.py:38 msgid "IMAP security" msgstr "" -#: paperless_mail/models.py:46 +#: paperless_mail/models.py:41 msgid "username" msgstr "" -#: paperless_mail/models.py:50 +#: paperless_mail/models.py:43 msgid "password" msgstr "" -#: paperless_mail/models.py:54 +#: paperless_mail/models.py:46 msgid "character set" msgstr "" -#: paperless_mail/models.py:57 -msgid "The character set to use when communicating with the mail server, such as 'UTF-8' or 'US-ASCII'." +#: paperless_mail/models.py:50 +msgid "" +"The character set to use when communicating with the mail server, such as " +"'UTF-8' or 'US-ASCII'." msgstr "" -#: paperless_mail/models.py:68 +#: paperless_mail/models.py:61 msgid "mail rule" msgstr "" -#: paperless_mail/models.py:69 +#: paperless_mail/models.py:62 msgid "mail rules" msgstr "" -#: paperless_mail/models.py:75 +#: paperless_mail/models.py:68 msgid "Only process attachments." msgstr "" -#: paperless_mail/models.py:76 +#: paperless_mail/models.py:71 msgid "Process all files, including 'inline' attachments." msgstr "" -#: paperless_mail/models.py:86 +#: paperless_mail/models.py:81 msgid "Mark as read, don't process read mails" msgstr "" -#: paperless_mail/models.py:87 +#: paperless_mail/models.py:82 msgid "Flag the mail, don't process flagged mails" msgstr "" -#: paperless_mail/models.py:88 +#: paperless_mail/models.py:83 msgid "Move to specified folder" msgstr "" -#: paperless_mail/models.py:89 +#: paperless_mail/models.py:84 msgid "Delete" msgstr "" -#: paperless_mail/models.py:96 +#: paperless_mail/models.py:91 msgid "Use subject as title" msgstr "" -#: paperless_mail/models.py:97 +#: paperless_mail/models.py:92 msgid "Use attachment filename as title" msgstr "" -#: paperless_mail/models.py:107 +#: paperless_mail/models.py:101 msgid "Do not assign a correspondent" msgstr "" -#: paperless_mail/models.py:109 +#: paperless_mail/models.py:102 msgid "Use mail address" msgstr "" -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "" -#: paperless_mail/models.py:113 +#: paperless_mail/models.py:104 msgid "Use correspondent selected below" msgstr "" -#: paperless_mail/models.py:121 +#: paperless_mail/models.py:109 msgid "order" msgstr "" -#: paperless_mail/models.py:128 +#: paperless_mail/models.py:115 msgid "account" msgstr "" -#: paperless_mail/models.py:132 +#: paperless_mail/models.py:119 msgid "folder" msgstr "" -#: paperless_mail/models.py:134 +#: paperless_mail/models.py:122 msgid "Subfolders must be separated by dots." msgstr "" -#: paperless_mail/models.py:138 +#: paperless_mail/models.py:126 msgid "filter from" msgstr "" -#: paperless_mail/models.py:141 +#: paperless_mail/models.py:129 msgid "filter subject" msgstr "" -#: paperless_mail/models.py:144 +#: paperless_mail/models.py:132 msgid "filter body" msgstr "" -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:136 msgid "filter attachment filename" msgstr "" -#: paperless_mail/models.py:150 -msgid "Only consume documents which entirely match this filename if specified. Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." +#: paperless_mail/models.py:141 +msgid "" +"Only consume documents which entirely match this filename if specified. " +"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." msgstr "" -#: paperless_mail/models.py:156 +#: paperless_mail/models.py:148 msgid "maximum age" msgstr "" -#: paperless_mail/models.py:158 +#: paperless_mail/models.py:148 msgid "Specified in days." msgstr "" -#: paperless_mail/models.py:161 +#: paperless_mail/models.py:152 msgid "attachment type" msgstr "" -#: paperless_mail/models.py:164 -msgid "Inline attachments include embedded images, so it's best to combine this option with a filename filter." +#: paperless_mail/models.py:156 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." msgstr "" -#: paperless_mail/models.py:169 +#: paperless_mail/models.py:162 msgid "action" msgstr "" -#: paperless_mail/models.py:175 +#: paperless_mail/models.py:168 msgid "action parameter" msgstr "" -#: paperless_mail/models.py:177 -msgid "Additional parameter for the action selected above, i.e., the target folder of the move to folder action. Subfolders must be separated by dots." +#: paperless_mail/models.py:173 +msgid "" +"Additional parameter for the action selected above, i.e., the target folder " +"of the move to folder action. Subfolders must be separated by dots." msgstr "" -#: paperless_mail/models.py:184 +#: paperless_mail/models.py:181 msgid "assign title from" msgstr "" -#: paperless_mail/models.py:194 +#: paperless_mail/models.py:189 msgid "assign this tag" msgstr "" -#: paperless_mail/models.py:202 +#: paperless_mail/models.py:197 msgid "assign this document type" msgstr "" -#: paperless_mail/models.py:206 +#: paperless_mail/models.py:201 msgid "assign correspondent from" msgstr "" -#: paperless_mail/models.py:216 +#: paperless_mail/models.py:211 msgid "assign this correspondent" msgstr "" -