resolve conflicts

Author: salty-ivy

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
         args:
         - --trailing-comma=es5
 -   repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.8.0
+    rev: v9.9.0
     hooks:
     -   id: eslint
         additional_dependencies:
@@ -44,7 +44,7 @@ repos:
         args:
         - --fix
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.5.6'
+    rev: 'v0.5.7'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

.tx/config

@@ -1,8 +1,10 @@
 [main]
-host = https://www.transifex.com
-lang_map = sr@latin:sr_Latn
+host     = https://www.transifex.com
+lang_map = sr@latin: sr_Latn
 
-[django-debug-toolbar.main]
-file_filter = debug_toolbar/locale/<lang>/LC_MESSAGES/django.po
-source_file = debug_toolbar/locale/en/LC_MESSAGES/django.po
-source_lang = en
+[o:django-debug-toolbar:p:django-debug-toolbar:r:main]
+file_filter            = debug_toolbar/locale/<lang>/LC_MESSAGES/django.po
+source_file            = debug_toolbar/locale/en/LC_MESSAGES/django.po
+source_lang            = en
+replace_edited_strings = false
+keep_translations      = false

CODE_OF_CONDUCT.md

@@ -1,46 +1,3 @@
-# Code of Conduct
+# Django Debug Toolbar Code of Conduct
 
-As contributors and maintainers of the Jazzband projects, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating documentation,
-submitting pull requests or patches, and other activities.
-
-We are committed to making participation in the Jazzband a harassment-free experience
-for everyone, regardless of the level of experience, gender, gender identity and
-expression, sexual orientation, disability, personal appearance, body size, race,
-ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-- The use of sexualized language or imagery
-- Personal attacks
-- Trolling or insulting/derogatory comments
-- Public or private harassment
-- Publishing other's private information, such as physical or electronic addresses,
-  without explicit permission
-- Other unethical or unprofessional conduct
-
-The Jazzband roadies have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are not
-aligned to this Code of Conduct, or to ban temporarily or permanently any contributor
-for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, the roadies commit themselves to fairly and
-consistently applying these principles to every aspect of managing the jazzband
-projects. Roadies who do not follow or enforce the Code of Conduct may be permanently
-removed from the Jazzband roadies.
-
-This code of conduct applies both within project spaces and in public spaces when an
-individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
-contacting the roadies at `roadies@jazzband.co`. All complaints will be reviewed and
-investigated and will result in a response that is deemed necessary and appropriate to
-the circumstances. Roadies are obligated to maintain confidentiality with regard to the
-reporter of an incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version
-1.3.0, available at [https://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/3/0/
+The django-debug-toolbar project utilizes the [Django Commons Code of Conduct](https://github.com/django-commons/membership/blob/main/CODE_OF_CONDUCT.md).