From: Simon Cozens Date: Fri, 7 Feb 2025 14:13:09 +0000 (+0000) Subject: Merge commit 'be73322f88b711baef9b35ee123a04d0fb054aeb' into lang-v0.7.3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9054%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit 'be73322f88b711baef9b35ee123a04d0fb054aeb' into lang-v0.7.3 --- 7b1503b2be2cc45aa679b84b07b5b74e99d4e66c diff --cc lang/.gitignore index 6b839dc78d,0000000000..01a0e2cd1b mode 100644,000000..100644 --- a/lang/.gitignore +++ b/lang/.gitignore @@@ -1,6 -1,0 +1,186 @@@ - .eggs/* - *.egg-info - *__pycache__ - Lib/gflanguages/_version.py ++# Byte-compiled / optimized / DLL files ++__pycache__/ ++*.py[cod] ++*$py.class + ++# C extensions ++*.so ++ ++# Distribution / packaging ++.Python +build/ ++develop-eggs/ ++dist/ ++downloads/ ++eggs/ ++.eggs/ ++lib64/ ++parts/ ++sdist/ ++var/ ++wheels/ ++share/python-wheels/ ++*.egg-info/ ++.installed.cfg ++*.egg ++MANIFEST ++ ++# PyInstaller ++# Usually these files are written by a python script from a template ++# before PyInstaller builds the exe, so as to inject date/other infos into it. ++*.manifest ++*.spec ++ ++# Installer logs ++pip-log.txt ++pip-delete-this-directory.txt ++ ++# Unit test / coverage reports ++htmlcov/ ++.tox/ ++.nox/ ++.coverage ++.coverage.* ++.cache ++nosetests.xml ++coverage.xml ++*.cover ++*.py,cover ++.hypothesis/ ++.pytest_cache/ ++cover/ ++ ++# Translations ++*.mo ++*.pot ++ ++# Django stuff: ++*.log ++local_settings.py ++db.sqlite3 ++db.sqlite3-journal ++ ++# Flask stuff: ++instance/ ++.webassets-cache ++ ++# Scrapy stuff: ++.scrapy ++ ++# Sphinx documentation ++docs/_build/ ++ ++# PyBuilder ++.pybuilder/ ++target/ ++ ++# Jupyter Notebook ++.ipynb_checkpoints ++ ++# IPython ++profile_default/ ++ipython_config.py ++ ++# pyenv ++# For a library or package, you might want to ignore these files since the code is ++# intended to run in multiple environments; otherwise, check them in: ++# .python-version ++ ++# pipenv ++# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. ++# However, in case of collaboration, if having platform-specific dependencies or dependencies ++# having no cross-platform support, pipenv may install dependencies that don't work, or not ++# install all needed dependencies. ++#Pipfile.lock ++ ++# poetry ++# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. ++# This is especially recommended for binary packages to ensure reproducibility, and is more ++# commonly ignored for libraries. ++# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control ++#poetry.lock ++ ++# pdm ++# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. ++#pdm.lock ++# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it ++# in version control. ++# https://pdm.fming.dev/latest/usage/project/#working-with-version-control ++.pdm.toml ++.pdm-python ++.pdm-build/ ++ ++# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm ++__pypackages__/ ++ ++# Celery stuff ++celerybeat-schedule ++celerybeat.pid ++ ++# SageMath parsed files ++*.sage.py ++ ++# Environments ++.env ++.venv ++env/ ++venv/ ++ENV/ ++env.bak/ ++venv.bak/ ++ ++# Spyder project settings ++.spyderproject ++.spyproject ++ ++# Rope project settings ++.ropeproject ++ ++# mkdocs documentation ++/site ++ ++# mypy ++.mypy_cache/ ++.dmypy.json ++dmypy.json ++ ++# Pyre type checker ++.pyre/ ++ ++# pytype static type analyzer ++.pytype/ ++ ++# Cython debug symbols ++cython_debug/ ++ ++# setuptools_scm version output ++_version.py ++ ++# PyCharm ++# JetBrains specific template is maintained in a separate JetBrains.gitignore that can ++# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore ++# and can be added to the global gitignore or merged into this file. For a more nuclear ++# option (not recommended) you can uncomment the following to ignore the entire idea folder. ++#.idea/ ++ ++# Generated by Cargo ++# will have compiled files and executables ++debug/ ++target/ ++ ++# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries ++# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html ++Cargo.lock ++ ++# These are backup files generated by rustfmt ++**/*.rs.bk ++ ++# MSVC Windows builds of rustc generate these, which store debugging information ++*.pdb ++ ++# RustRover ++# JetBrains specific template is maintained in a separate JetBrains.gitignore that can ++# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore ++# and can be added to the global gitignore or merged into this file. For a more nuclear ++# option (not recommended) you can uncomment the following to ignore the entire idea folder. ++#.idea/ diff --cc lang/Lib/gflanguages/data/languages/djc_Latn.textproto index 0000000000,668a9212a0..668a9212a0 mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/djc_Latn.textproto +++ b/lang/Lib/gflanguages/data/languages/djc_Latn.textproto diff --cc lang/Lib/gflanguages/data/languages/dv_Diak.textproto index 0000000000,80aefe3f06..80aefe3f06 mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/dv_Diak.textproto +++ b/lang/Lib/gflanguages/data/languages/dv_Diak.textproto diff --cc lang/Lib/gflanguages/data/languages/nmn_Latn.textproto index 0000000000,55bf27768d..55bf27768d mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/nmn_Latn.textproto +++ b/lang/Lib/gflanguages/data/languages/nmn_Latn.textproto diff --cc lang/Lib/gflanguages/data/languages/tda_Latn.textproto index 0000000000,2540f6511e..2540f6511e mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/tda_Latn.textproto +++ b/lang/Lib/gflanguages/data/languages/tda_Latn.textproto diff --cc lang/Lib/gflanguages/data/scripts/Diak.textproto index 0000000000,d319ec2e5d..d319ec2e5d mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/scripts/Diak.textproto +++ b/lang/Lib/gflanguages/data/scripts/Diak.textproto